diff options
| author | Bas Nieuwenhuizen <[email protected]> | 2018-01-14 23:25:46 +0100 |
|---|---|---|
| committer | Bas Nieuwenhuizen <[email protected]> | 2018-01-30 22:01:13 +0100 |
| commit | 5dce47ae6de4bc5c19eafdb49675fc062fb30360 (patch) | |
| tree | 6df221390b2f80f682535972414273c87e5ec9ce | |
| parent | df2e7ab0dbc41df00df9714aac713ac9ba6309c5 (diff) | |
radv: Compute shader_z_format when emitting it.
Reviewed-by: Dave Airlie <[email protected]>
Reviewed-by: Samuel Pitoiset <[email protected]>
| -rw-r--r-- | src/amd/vulkan/radv_pipeline.c | 10 | ||||
| -rw-r--r-- | src/amd/vulkan/radv_private.h | 1 |
2 files changed, 3 insertions, 8 deletions
diff --git a/src/amd/vulkan/radv_pipeline.c b/src/amd/vulkan/radv_pipeline.c index 75137c86299..84d889a7c48 100644 --- a/src/amd/vulkan/radv_pipeline.c +++ b/src/amd/vulkan/radv_pipeline.c @@ -2830,7 +2830,9 @@ radv_pipeline_generate_fragment_shader(struct radeon_winsys_cs *cs, radeon_set_context_reg(cs, R_0286E0_SPI_BARYC_CNTL, pipeline->graphics.spi_baryc_cntl); radeon_set_context_reg(cs, R_028710_SPI_SHADER_Z_FORMAT, - pipeline->graphics.shader_z_format); + ac_get_spi_shader_z_format(ps->info.fs.writes_z, + ps->info.fs.writes_stencil, + ps->info.fs.writes_sample_mask)); radeon_set_context_reg(cs, R_028714_SPI_SHADER_COL_FORMAT, blend->spi_shader_col_format); @@ -2994,12 +2996,6 @@ radv_pipeline_init(struct radv_pipeline *pipeline, if (pipeline->device->physical_device->has_rbplus) pipeline->graphics.db_shader_control |= S_02880C_DUAL_QUAD_DISABLE(1); - unsigned shader_z_format = - ac_get_spi_shader_z_format(ps->info.fs.writes_z, - ps->info.fs.writes_stencil, - ps->info.fs.writes_sample_mask); - pipeline->graphics.shader_z_format = shader_z_format; - calculate_vgt_gs_mode(pipeline); for (unsigned i = 0; i < MESA_SHADER_STAGES; i++) { diff --git a/src/amd/vulkan/radv_private.h b/src/amd/vulkan/radv_private.h index b7f1f86dbfd..8acf91c4ffd 100644 --- a/src/amd/vulkan/radv_private.h +++ b/src/amd/vulkan/radv_private.h @@ -1218,7 +1218,6 @@ struct radv_pipeline { struct radv_tessellation_state tess; struct radv_gs_state gs; uint32_t db_shader_control; - uint32_t shader_z_format; uint32_t spi_baryc_cntl; unsigned prim; unsigned gs_out; |