diff options
author | Chris Wilson <chris@chris-wilson.co.uk> | 2012-02-23 10:17:34 +0000 |
---|---|---|
committer | Chris Wilson <chris@chris-wilson.co.uk> | 2012-02-23 10:28:47 +0000 |
commit | a48e6e0db970ad07cd7452ba24c362d0c2fcf1bf (patch) | |
tree | b0f3dcc726fe1e2dbdcb3ad6ee44e45d38153801 /src/sna/gen3_render.c | |
parent | 57c19b10db2b512c52a593fad98b5ac5db4f1497 (diff) |
sna/gen3+: Force a batch flush when run out of CA vbo
As we prematurely end the batch if we bail on extending the vbo for CA
glyphs, we need to force the flush.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'src/sna/gen3_render.c')
-rw-r--r-- | src/sna/gen3_render.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/sna/gen3_render.c b/src/sna/gen3_render.c index 5253a8c4..cb85cb9f 100644 --- a/src/sna/gen3_render.c +++ b/src/sna/gen3_render.c @@ -1761,6 +1761,7 @@ flush: gen3_vertex_flush(sna); gen3_magic_ca_pass(sna, op); } + _kgem_submit(&sna->kgem); return 0; } @@ -3109,7 +3110,7 @@ gen3_render_composite_spans_box(struct sna *sna, box->x2 - box->x1, box->y2 - box->y1)); - if (gen3_get_rectangles(sna, &op->base, 1) == 0) { + if (!gen3_get_rectangles(sna, &op->base, 1)) { gen3_emit_composite_state(sna, &op->base); gen3_get_rectangles(sna, &op->base, 1); } |