From ff8e1452df5c86e745aea0490e9c6afdf166407b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Fri, 18 Jun 2010 02:17:29 +0200 Subject: [PATCH] r300g: fix hardlocks in occlusion queries Early Z test (=ZTOP) must be disabled before a query is started, otherwise the GPU is dead. The order of emitted registers matters more than you might think. This fixes hardlocks in sauerbraten. --- src/gallium/drivers/r300/r300_context.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gallium/drivers/r300/r300_context.c b/src/gallium/drivers/r300/r300_context.c index 113942644c1..0fae19dfd78 100644 --- a/src/gallium/drivers/r300/r300_context.c +++ b/src/gallium/drivers/r300/r300_context.c @@ -111,8 +111,8 @@ static void r300_setup_atoms(struct r300_context* r300) * the size of 0 here. */ make_empty_list(&r300->atom_list); R300_INIT_ATOM(invariant_state, 71); - R300_INIT_ATOM(query_start, 4); R300_INIT_ATOM(ztop_state, 2); + R300_INIT_ATOM(query_start, 4); R300_INIT_ATOM(blend_state, 8); R300_INIT_ATOM(blend_color_state, is_r500 ? 3 : 2); R300_INIT_ATOM(clip_state, has_tcl ? 5 + (6 * 4) : 2); -- 2.30.2