Module: Mesa Branch: master Commit: 61c2861b4effed6b5e50e4d4089ede9768842b2b URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=61c2861b4effed6b5e50e4d4089ede9768842b2b
Author: Dave Airlie <[email protected]> Date: Mon Sep 13 18:50:12 2010 +1000 r600g: evergreen fixup dsa state for running query. evergreen is always the same as r700 here. --- src/gallium/drivers/r600/eg_hw_states.c | 3 +-- src/gallium/drivers/r600/evergreend.h | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/gallium/drivers/r600/eg_hw_states.c b/src/gallium/drivers/r600/eg_hw_states.c index c9cf328..f3f1dc7 100644 --- 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 6fab221..c8e6710 100644 --- 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 _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
