---
src/amd/vulkan/radv_pipeline.c | 43 +++++++++++++++++++++---------------------
src/amd/vulkan/radv_private.h | 1 -
2 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/src/amd/vulkan/radv_pipeline.c b/src/amd/vulkan/radv_pipeline.c
index b39ee4308b..be71abd858 100644
--- a/src/amd/vulkan/radv_pipeline.c
+++ b/src/amd/vulkan/radv_pipeline.c
@@ -2765,6 +2765,27 @@ radv_pipeline_generate_ps_inputs(struct radv_pm4_builder
*builder,
}
}
+static uint32_t
+radv_compute_db_shader_control(const struct radv_device *device,
+ const struct radv_shader_variant *ps)
+{
+ unsigned z_order;
+ if (ps->info.fs.early_fragment_test || !ps->info.fs.writes_memory)
+ z_order = V_02880C_EARLY_Z_THEN_LATE_Z;
+ else
+ z_order = V_02880C_LATE_Z;
+
+ return S_02880C_Z_EXPORT_ENABLE(ps->info.fs.writes_z) |
+
S_02880C_STENCIL_TEST_VAL_EXPORT_ENABLE(ps->info.fs.writes_stencil) |
+ S_02880C_KILL_ENABLE(!!ps->info.fs.can_discard) |
+ S_02880C_MASK_EXPORT_ENABLE(ps->info.fs.writes_sample_mask) |
+ S_02880C_Z_ORDER(z_order) |
+ S_02880C_DEPTH_BEFORE_SHADER(ps->info.fs.early_fragment_test) |
+ S_02880C_EXEC_ON_HIER_FAIL(ps->info.fs.writes_memory) |
+ S_02880C_EXEC_ON_NOOP(ps->info.fs.writes_memory) |
+
S_02880C_DUAL_QUAD_DISABLE(!!device->physical_device->has_rbplus);
+}
+
static void
radv_pipeline_generate_fragment_shader(struct radv_pm4_builder *builder,
struct radv_pipeline *pipeline)
@@ -2785,7 +2806,7 @@ radv_pipeline_generate_fragment_shader(struct
radv_pm4_builder *builder,
radv_pm4_emit(builder, ps->rsrc2);
radv_pm4_set_reg(builder, R_02880C_DB_SHADER_CONTROL,
- pipeline->graphics.db_shader_control);
+ radv_compute_db_shader_control(pipeline->device, ps));
radv_pm4_set_reg(builder, R_0286CC_SPI_PS_INPUT_ENA,
ps->config.spi_ps_input_ena);
@@ -2948,26 +2969,6 @@ radv_pipeline_init(struct radv_pipeline *pipeline,
pipeline->graphics.blend.spi_shader_col_format =
V_028714_SPI_SHADER_32_R;
}
- unsigned z_order;
- pipeline->graphics.db_shader_control = 0;
- if (ps->info.fs.early_fragment_test || !ps->info.fs.writes_memory)
- z_order = V_02880C_EARLY_Z_THEN_LATE_Z;
- else
- z_order = V_02880C_LATE_Z;
-
- pipeline->graphics.db_shader_control =
- S_02880C_Z_EXPORT_ENABLE(ps->info.fs.writes_z) |
-
S_02880C_STENCIL_TEST_VAL_EXPORT_ENABLE(ps->info.fs.writes_stencil) |
- S_02880C_KILL_ENABLE(!!ps->info.fs.can_discard) |
- S_02880C_MASK_EXPORT_ENABLE(ps->info.fs.writes_sample_mask) |
- S_02880C_Z_ORDER(z_order) |
- S_02880C_DEPTH_BEFORE_SHADER(ps->info.fs.early_fragment_test) |
- S_02880C_EXEC_ON_HIER_FAIL(ps->info.fs.writes_memory) |
- S_02880C_EXEC_ON_NOOP(ps->info.fs.writes_memory);
-
- if (pipeline->device->physical_device->has_rbplus)
- pipeline->graphics.db_shader_control |=
S_02880C_DUAL_QUAD_DISABLE(1);
-
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 f8c206dbee..55d9938a21 100644
--- a/src/amd/vulkan/radv_private.h
+++ b/src/amd/vulkan/radv_private.h
@@ -1229,7 +1229,6 @@ struct radv_pipeline {
struct radv_multisample_state ms;
struct radv_tessellation_state tess;
struct radv_gs_state gs;
- uint32_t db_shader_control;
unsigned prim;
unsigned gs_out;
uint32_t vgt_gs_mode;
--
2.15.1
_______________________________________________
mesa-dev mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
