From: Marek Olšák <maraeo@gmail.com>
Date: Fri, 18 Jun 2010 00:17:29 +0000 (+0200)
Subject: r300g: fix hardlocks in occlusion queries
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=ff8e1452df5c86e745aea0490e9c6afdf166407b;p=mesa.git

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.
---

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);