From: Marek Olšák <marek.ol...@amd.com>
use fewer local variables, re-order the assignments, so that the GFX9 diff
is smaller here.
---
src/gallium/drivers/radeonsi/si_state.c | 86 ++++++++++++---------------------
1 file changed, 32 insertions(+), 54 deletions(-)
diff --git a/src/gallium/drivers/radeonsi/si_state.c
b/src/gallium/drivers/radeonsi/si_state.c
index 6948a74..a56da79 100644
--- a/src/gallium/drivers/radeonsi/si_state.c
+++ b/src/gallium/drivers/radeonsi/si_state.c
@@ -2210,75 +2210,79 @@ static void si_initialize_color_surface(struct
si_context *sctx,
surf->color_initialized = true;
}
static void si_init_depth_surface(struct si_context *sctx,
struct r600_surface *surf)
{
struct r600_texture *rtex = (struct r600_texture*)surf->base.texture;
unsigned level = surf->base.u.tex.level;
struct radeon_surf_level *levelinfo = &rtex->surface.level[level];
- unsigned format;
- uint32_t z_info, s_info, db_depth_info;
- uint64_t z_offs, s_offs;
- uint32_t db_htile_data_base, db_htile_surface;
+ unsigned format, stencil_format;
+ uint32_t z_info, s_info;
format = si_translate_dbformat(rtex->db_render_format);
+ stencil_format = rtex->surface.flags & RADEON_SURF_SBUFFER ?
+ V_028044_STENCIL_8 : V_028044_STENCIL_INVALID;
- if (format == V_028040_Z_INVALID) {
- R600_ERR("Invalid DB format: %d, disabling DB.\n",
rtex->resource.b.b.format);
- }
assert(format != V_028040_Z_INVALID);
+ if (format == V_028040_Z_INVALID)
+ R600_ERR("Invalid DB format: %d, disabling DB.\n",
rtex->resource.b.b.format);
- s_offs = z_offs = rtex->resource.gpu_address;
- z_offs += rtex->surface.level[level].offset;
- s_offs += rtex->surface.stencil_level[level].offset;
+ surf->db_depth_view =
S_028008_SLICE_START(surf->base.u.tex.first_layer) |
+ S_028008_SLICE_MAX(surf->base.u.tex.last_layer);
+ surf->db_htile_data_base = 0;
+ surf->db_htile_surface = 0;
- db_depth_info = S_02803C_ADDR5_SWIZZLE_MASK(!rtex->tc_compatible_htile);
+ assert(levelinfo->nblk_x % 8 == 0 && levelinfo->nblk_y % 8 == 0);
- z_info = S_028040_FORMAT(format);
- if (rtex->resource.b.b.nr_samples > 1) {
- z_info |=
S_028040_NUM_SAMPLES(util_logbase2(rtex->resource.b.b.nr_samples));
- }
+ surf->db_depth_base = (rtex->resource.gpu_address +
+ rtex->surface.level[level].offset) >> 8;
+ surf->db_stencil_base = (rtex->resource.gpu_address +
+ rtex->surface.stencil_level[level].offset) >>
8;
- if (rtex->surface.flags & RADEON_SURF_SBUFFER)
- s_info = S_028044_FORMAT(V_028044_STENCIL_8);
- else
- s_info = S_028044_FORMAT(V_028044_STENCIL_INVALID);
+ z_info = S_028040_FORMAT(format) |
+
S_028040_NUM_SAMPLES(util_logbase2(rtex->resource.b.b.nr_samples));
+ s_info = S_028044_FORMAT(stencil_format);
+ surf->db_depth_info =
S_02803C_ADDR5_SWIZZLE_MASK(!rtex->tc_compatible_htile);
if (sctx->b.chip_class >= CIK) {
struct radeon_info *info = &sctx->screen->b.info;
unsigned index = rtex->surface.tiling_index[level];
unsigned stencil_index =
rtex->surface.stencil_tiling_index[level];
unsigned macro_index = rtex->surface.macro_tile_index;
unsigned tile_mode = info->si_tile_mode_array[index];
unsigned stencil_tile_mode =
info->si_tile_mode_array[stencil_index];
unsigned macro_mode =
info->cik_macrotile_mode_array[macro_index];
- db_depth_info |=
+ surf->db_depth_info |=
S_02803C_ARRAY_MODE(G_009910_ARRAY_MODE(tile_mode)) |
S_02803C_PIPE_CONFIG(G_009910_PIPE_CONFIG(tile_mode)) |
S_02803C_BANK_WIDTH(G_009990_BANK_WIDTH(macro_mode)) |
S_02803C_BANK_HEIGHT(G_009990_BANK_HEIGHT(macro_mode)) |
S_02803C_MACRO_TILE_ASPECT(G_009990_MACRO_TILE_ASPECT(macro_mode)) |
S_02803C_NUM_BANKS(G_009990_NUM_BANKS(macro_mode));
z_info |= S_028040_TILE_SPLIT(G_009910_TILE_SPLIT(tile_mode));
s_info |=
S_028044_TILE_SPLIT(G_009910_TILE_SPLIT(stencil_tile_mode));
} else {
unsigned tile_mode_index = si_tile_mode_index(rtex, level,
false);
z_info |= S_028040_TILE_MODE_INDEX(tile_mode_index);
tile_mode_index = si_tile_mode_index(rtex, level, true);
s_info |= S_028044_TILE_MODE_INDEX(tile_mode_index);
}
- /* HiZ aka depth buffer htile */
- /* use htile only for first level */
+ surf->db_depth_size = S_028058_PITCH_TILE_MAX((levelinfo->nblk_x / 8) -
1) |
+ S_028058_HEIGHT_TILE_MAX((levelinfo->nblk_y / 8)
- 1);
+ surf->db_depth_slice = S_02805C_SLICE_TILE_MAX((levelinfo->nblk_x *
+ levelinfo->nblk_y) / 64
- 1);
+
+ /* Only use HTILE for the first level. */
if (rtex->htile_buffer && !level) {
z_info |= S_028040_TILE_SURFACE_ENABLE(1) |
S_028040_ALLOW_EXPCLEAR(1);
if (rtex->surface.flags & RADEON_SURF_SBUFFER) {
/* Workaround: For a not yet understood reason, the
* combination of MSAA, fast stencil clear and stencil
* decompress messes with subsequent stencil buffer
* uses. Problem was reproduced on Verde, Bonaire,
* Tonga, and Carrizo.
@@ -2291,63 +2295,37 @@ static void si_init_depth_surface(struct si_context
*sctx,
if (rtex->resource.b.b.nr_samples <= 1)
s_info |= S_028044_ALLOW_EXPCLEAR(1);
} else if (!rtex->tc_compatible_htile) {
/* Use all of the htile_buffer for depth if there's no
stencil.
* This must not be set when TC-compatible HTILE is
enabled
* due to a hw bug.
*/
s_info |= S_028044_TILE_STENCIL_DISABLE(1);
}
- uint64_t va = rtex->htile_buffer->gpu_address;
- db_htile_data_base = va >> 8;
- db_htile_surface = S_028ABC_FULL_CACHE(1);
+ surf->db_htile_data_base = rtex->htile_buffer->gpu_address >> 8;
+ surf->db_htile_surface = S_028ABC_FULL_CACHE(1);
if (rtex->tc_compatible_htile) {
- db_htile_surface |= S_028ABC_TC_COMPATIBLE(1);
+ surf->db_htile_surface |= S_028ABC_TC_COMPATIBLE(1);
- switch (rtex->resource.b.b.nr_samples) {
- case 0:
- case 1:
+ if (rtex->resource.b.b.nr_samples <= 1)
z_info |= S_028040_DECOMPRESS_ON_N_ZPLANES(5);
- break;
- case 2:
- case 4:
+ else if (rtex->resource.b.b.nr_samples <= 4)
z_info |= S_028040_DECOMPRESS_ON_N_ZPLANES(3);
- break;
- case 8:
+ else
z_info |= S_028040_DECOMPRESS_ON_N_ZPLANES(2);
- break;
- default:
- assert(0);
- }
}
- } else {
- db_htile_data_base = 0;
- db_htile_surface = 0;
}
- assert(levelinfo->nblk_x % 8 == 0 && levelinfo->nblk_y % 8 == 0);
-
- surf->db_depth_view =
S_028008_SLICE_START(surf->base.u.tex.first_layer) |
- S_028008_SLICE_MAX(surf->base.u.tex.last_layer);
- surf->db_htile_data_base = db_htile_data_base;
- surf->db_depth_info = db_depth_info;
surf->db_z_info = z_info;
surf->db_stencil_info = s_info;
- surf->db_depth_base = z_offs >> 8;
- surf->db_stencil_base = s_offs >> 8;
- surf->db_depth_size = S_028058_PITCH_TILE_MAX((levelinfo->nblk_x / 8) -
1) |
- S_028058_HEIGHT_TILE_MAX((levelinfo->nblk_y / 8)
- 1);
- surf->db_depth_slice = S_02805C_SLICE_TILE_MAX((levelinfo->nblk_x *
- levelinfo->nblk_y) / 64
- 1);
- surf->db_htile_surface = db_htile_surface;
surf->depth_initialized = true;
}
static void si_dec_framebuffer_counters(const struct pipe_framebuffer_state
*state)
{
for (int i = 0; i < state->nr_cbufs; ++i) {
struct r600_surface *surf = NULL;
struct r600_texture *rtex;
--
2.7.4
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
