summaryrefslogtreecommitdiff
path: root/src/gallium
diff options
context:
space:
mode:
authorMarek Olšák <maraeo@gmail.com>2010-06-18 02:17:29 +0200
committerMarek Olšák <maraeo@gmail.com>2010-06-18 02:17:29 +0200
commitff8e1452df5c86e745aea0490e9c6afdf166407b (patch)
tree19471534a745921bee42875aa50f6be569e8a470 /src/gallium
parent3c351e2c832e47d75ab0bdefa2fbbc4a1f2118db (diff)
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.
Diffstat (limited to 'src/gallium')
-rw-r--r--src/gallium/drivers/r300/r300_context.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gallium/drivers/r300/r300_context.c b/src/gallium/drivers/r300/r300_context.c
index 113942644c..0fae19dfd7 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);