r600g: evergreen fixup dsa state for running query.

evergreen is always the same as r700 here.

diff --git a/src/gallium/drivers/r600/eg_hw_states.c b/src/gallium/drivers/r600/eg_hw_states.c
index c9cf328baa37fc43b5c20319224a297a8ca5ed8b..f3f1dc7b0a7da609d3da86720c7b9bcf9fd2713d 100644 (file)
--- a/src/gallium/drivers/r600/eg_hw_states.c
+++ b/src/gallium/drivers/r600/eg_hw_states.c
@@ -429,8 +429,7 @@ static void eg_dsa(struct r600_context *rctx, struct radeon_state *rstate)
 
        if (query_running) {
                db_render_override |= S_028D10_NOOP_CULL_DISABLE(1);
-               if (rscreen->chip_class == R700)
-                       db_render_control |= S_028D0C_R700_PERFECT_ZPASS_COUNTS(1);
+               db_render_control |= S_028D0C_PERFECT_ZPASS_COUNTS(1);
        }
 
        rstate->states[EG_DSA__DB_STENCIL_CLEAR] = 0x00000000;

diff --git a/src/gallium/drivers/r600/evergreend.h b/src/gallium/drivers/r600/evergreend.h
index 6fab22107bd8401b4dacd9ec4b5d248adb054c99..c8e6710605bb63b45b95b6b0777ab9ff6b939e96 100644 (file)
--- a/src/gallium/drivers/r600/evergreend.h
+++ b/src/gallium/drivers/r600/evergreend.h
@@ -665,7 +665,7 @@
 #define R_028D0C_DB_RENDER_CONTROL                   0x028D0C
 #define   S_028D0C_STENCIL_COMPRESS_DISABLE(x)         (((x) & 0x1) << 5)
 #define   S_028D0C_DEPTH_COMPRESS_DISABLE(x)           (((x) & 0x1) << 6)
-#define   S_028D0C_R700_PERFECT_ZPASS_COUNTS(x)        (((x) & 0x1) << 15)
+#define   S_028D0C_PERFECT_ZPASS_COUNTS(x)        (((x) & 0x1) << 15)
 #define R_028D10_DB_RENDER_OVERRIDE                  0x028D10
 #define   V_028D10_FORCE_OFF                         0
 #define   V_028D10_FORCE_ENABLE                      1