From d867fd01cb0060342102a79600daf43e3dc44a07 Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Fri, 14 Dec 2012 13:10:54 +0000 Subject: sna/gen3: Don't combine primitives if beginning a ca 2-pass Signed-off-by: Chris Wilson --- src/sna/gen3_render.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/sna/gen3_render.c') diff --git a/src/sna/gen3_render.c b/src/sna/gen3_render.c index 8f8cef2f..5c17a8f4 100644 --- a/src/sna/gen3_render.c +++ b/src/sna/gen3_render.c @@ -1768,7 +1768,8 @@ static bool gen3_rectangle_begin(struct sna *sna, } } - if (sna->kgem.nbatch == 2 + state->last_vertex_offset) { + if (sna->kgem.nbatch == 2 + state->last_vertex_offset && + !op->need_magic_ca_pass) { state->vertex_offset = state->last_vertex_offset; } else { state->vertex_offset = sna->kgem.nbatch; -- cgit v1.2.3