From: Marek Olšák <marek.ol...@amd.com>
All this cruft was ported from r600g and isn't needed on SI and later
according to hw docs. If we implemented HiS, we would set it to 0.
---
src/gallium/drivers/radeonsi/si_state.c | 50 ++--------------------------
src/gallium/drivers/radeonsi/si_state.h | 2 --
src/gallium/drivers/radeonsi/si_state_draw.c | 1 -
3 files changed, 3 insertions(+), 50 deletions(-)
diff --git a/src/gallium/drivers/radeonsi/si_state.c
b/src/gallium/drivers/radeonsi/si_state.c
index ede8827..8e08804 100644
--- a/src/gallium/drivers/radeonsi/si_state.c
+++ b/src/gallium/drivers/radeonsi/si_state.c
@@ -791,11 +791,6 @@ static void *si_create_db_flush_dsa(struct r600_context
*rctx, bool copy_depth,
si_pm4_set_reg(&state->pm4, R_028000_DB_RENDER_CONTROL,
S_028000_DEPTH_COMPRESS_DISABLE(1) |
S_028000_STENCIL_COMPRESS_DISABLE(1));
- si_pm4_set_reg(&state->pm4, R_02800C_DB_RENDER_OVERRIDE,
-
S_02800C_FORCE_HIZ_ENABLE(V_02800C_FORCE_DISABLE) |
-
S_02800C_FORCE_HIS_ENABLE0(V_02800C_FORCE_DISABLE) |
-
S_02800C_FORCE_HIS_ENABLE1(V_02800C_FORCE_DISABLE) |
- S_02800C_DISABLE_TILE_RATE_TILES(1));
}
return state;
@@ -1721,47 +1716,6 @@ static void si_cb(struct r600_context *rctx, struct
si_pm4_state *pm4,
}
}
-/* Update register(s) containing depth buffer and draw state. */
-void si_update_db_draw_state(struct r600_context *rctx, struct r600_surface
*zsbuf)
-{
- struct si_pm4_state *pm4;
- uint32_t db_render_override;
- boolean hiz_enable = false;
-
- pm4 = si_pm4_alloc_state(rctx);
- if (pm4 == NULL) {
- return;
- }
-
- /* db */
-
- /* TODO HiS aka stencil buffer htile goes here */
- db_render_override = S_02800C_FORCE_HIS_ENABLE0(V_02800C_FORCE_DISABLE)
|
- S_02800C_FORCE_HIS_ENABLE1(V_02800C_FORCE_DISABLE);
-
- /* HiZ aka depth buffer htile */
- if (zsbuf && zsbuf->base.texture) {
- struct r600_texture *rtex = (struct
r600_texture*)zsbuf->base.texture;
- uint level = zsbuf->base.u.tex.level;
- /* use htile only for first level */
- hiz_enable = rtex->htile_buffer && !level;
- }
- if (hiz_enable) {
- db_render_override |=
S_02800C_FORCE_HIZ_ENABLE(V_02800C_FORCE_OFF);
- } else {
- db_render_override |=
S_02800C_FORCE_HIZ_ENABLE(V_02800C_FORCE_DISABLE);
- }
-
- /* draw */
-
- if (rctx->num_cs_dw_nontimer_queries_suspend) {
- db_render_override |= S_02800C_NOOP_CULL_DISABLE(1);
- }
-
- si_pm4_set_reg(pm4, R_02800C_DB_RENDER_OVERRIDE, db_render_override);
- si_pm4_set_state(rctx, db_draw, pm4);
-}
-
static void si_db(struct r600_context *rctx, struct si_pm4_state *pm4,
const struct pipe_framebuffer_state *state)
{
@@ -2158,7 +2112,6 @@ static void si_set_framebuffer_state(struct pipe_context
*ctx,
si_pm4_set_state(rctx, framebuffer, pm4);
si_update_fb_rs_state(rctx);
si_update_fb_blend_state(rctx);
- si_update_db_draw_state(rctx, (struct r600_surface *)state->zsbuf);
}
/*
@@ -3224,6 +3177,9 @@ void si_init_config(struct r600_context *rctx)
si_pm4_set_reg(pm4, R_028AC0_DB_SRESULTS_COMPARE_STATE0, 0x0);
si_pm4_set_reg(pm4, R_028AC4_DB_SRESULTS_COMPARE_STATE1, 0x0);
si_pm4_set_reg(pm4, R_028AC8_DB_PRELOAD_CONTROL, 0x0);
+ si_pm4_set_reg(pm4, R_02800C_DB_RENDER_OVERRIDE,
+ S_02800C_FORCE_HIS_ENABLE0(V_02800C_FORCE_DISABLE) |
+ S_02800C_FORCE_HIS_ENABLE1(V_02800C_FORCE_DISABLE));
si_pm4_set_reg(pm4, R_028400_VGT_MAX_VTX_INDX, ~0);
si_pm4_set_reg(pm4, R_028404_VGT_MIN_VTX_INDX, 0);
diff --git a/src/gallium/drivers/radeonsi/si_state.h
b/src/gallium/drivers/radeonsi/si_state.h
index d44c4f3..6fac4f0 100644
--- a/src/gallium/drivers/radeonsi/si_state.h
+++ b/src/gallium/drivers/radeonsi/si_state.h
@@ -87,7 +87,6 @@ union si_state {
struct si_state_dsa *dsa;
struct si_pm4_state *fb_rs;
struct si_pm4_state *fb_blend;
- struct si_pm4_state *db_draw;
struct si_pm4_state *dsa_stencil_ref;
struct si_pm4_state *vs;
struct si_pm4_state *vs_sampler;
@@ -210,7 +209,6 @@ boolean si_is_format_supported(struct pipe_screen *screen,
enum pipe_texture_target target,
unsigned sample_count,
unsigned usage);
-void si_update_db_draw_state(struct r600_context *rctx, struct r600_surface
*zsbuf);
int si_shader_select(struct pipe_context *ctx,
struct si_pipe_shader_selector *sel,
unsigned *dirty);
diff --git a/src/gallium/drivers/radeonsi/si_state_draw.c
b/src/gallium/drivers/radeonsi/si_state_draw.c
index a3104d0..f64b51a 100644
--- a/src/gallium/drivers/radeonsi/si_state_draw.c
+++ b/src/gallium/drivers/radeonsi/si_state_draw.c
@@ -616,7 +616,6 @@ static void si_state_draw(struct r600_context *rctx,
}
si_pm4_set_state(rctx, draw, pm4);
- si_update_db_draw_state(rctx, (struct r600_surface
*)rctx->framebuffer.zsbuf);
}
void si_emit_cache_flush(struct r600_common_context *rctx, struct r600_atom
*atom)
--
1.8.3.2
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
