summaryrefslogtreecommitdiff
path: root/src/sna/gen6_render.c
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2013-01-20 14:55:06 +0000
committerChris Wilson <chris@chris-wilson.co.uk>2013-01-20 14:55:06 +0000
commit492952e0d6362a046a666956afdf8f9bc0f2b7e7 (patch)
treecd708f5ba21093f4e42d4127cc34e709077f2074 /src/sna/gen6_render.c
parentb52c921204df6b2486717fcef05b4a1993aa1071 (diff)
sna/gen3+: Handle flushing vbo for CA glyphs
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'src/sna/gen6_render.c')
-rw-r--r--src/sna/gen6_render.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/sna/gen6_render.c b/src/sna/gen6_render.c
index 7af59ae5..2cd1b841 100644
--- a/src/sna/gen6_render.c
+++ b/src/sna/gen6_render.c
@@ -1145,8 +1145,10 @@ static int gen6_get_rectangles__flush(struct sna *sna,
if (!kgem_check_reloc_and_exec(&sna->kgem, 2))
return 0;
- if (op->need_magic_ca_pass && sna->render.vbo)
- return 0;
+ if (sna->render.vertex_offset) {
+ gen4_vertex_flush(sna);
+ gen6_magic_ca_pass(sna, op);
+ }
return gen4_vertex_finish(sna);
}