From ce8bb293429142aeb89e424ba7879934def74637 Mon Sep 17 00:00:00 2001 From: Lionel Landwerlin Date: Thu, 28 Apr 2022 09:15:02 +0300 Subject: [PATCH] anv: never emit 3DSTATE_CPS in the pipeline batch MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Lionel Landwerlin Reviewed-by: Tapani Pälli Part-of: --- src/intel/vulkan/genX_pipeline.c | 15 --------------- src/intel/vulkan/gfx8_cmd_buffer.c | 3 ++- 2 files changed, 2 insertions(+), 16 deletions(-) diff --git a/src/intel/vulkan/genX_pipeline.c b/src/intel/vulkan/genX_pipeline.c index 8685b98..f5f7dd9 100644 --- a/src/intel/vulkan/genX_pipeline.c +++ b/src/intel/vulkan/genX_pipeline.c @@ -949,19 +949,6 @@ emit_ms_state(struct anv_graphics_pipeline *pipeline, } } -static void -emit_3dstate_cps(struct anv_graphics_pipeline *pipeline, uint32_t dynamic_states) -{ -#if GFX_VER >= 11 - if (!(dynamic_states & ANV_CMD_DIRTY_DYNAMIC_SHADING_RATE) && - pipeline->base.device->vk.enabled_extensions.KHR_fragment_shading_rate) { - genX(emit_shading_rate)(&pipeline->base.batch, - pipeline, - &pipeline->dynamic_state); - } -#endif -} - const uint32_t genX(vk_to_intel_logic_op)[] = { [VK_LOGIC_OP_COPY] = LOGICOP_COPY, [VK_LOGIC_OP_CLEAR] = LOGICOP_CLEAR, @@ -2901,8 +2888,6 @@ genX(graphics_pipeline_create)( emit_3dstate_vf_statistics(pipeline); - emit_3dstate_cps(pipeline, dynamic_states); - emit_3dstate_streamout(pipeline, pCreateInfo->pRasterizationState, dynamic_states); #if GFX_VERx10 >= 125 diff --git a/src/intel/vulkan/gfx8_cmd_buffer.c b/src/intel/vulkan/gfx8_cmd_buffer.c index 4f5c118..7d100cf 100644 --- a/src/intel/vulkan/gfx8_cmd_buffer.c +++ b/src/intel/vulkan/gfx8_cmd_buffer.c @@ -323,7 +323,8 @@ genX(cmd_buffer_flush_dynamic_state)(struct anv_cmd_buffer *cmd_buffer) struct anv_dynamic_state *d = &cmd_buffer->state.gfx.dynamic; #if GFX_VER >= 11 - if (cmd_buffer->state.gfx.dirty & ANV_CMD_DIRTY_DYNAMIC_SHADING_RATE) + if (cmd_buffer->device->vk.enabled_extensions.KHR_fragment_shading_rate && + cmd_buffer->state.gfx.dirty & ANV_CMD_DIRTY_DYNAMIC_SHADING_RATE) genX(emit_shading_rate)(&cmd_buffer->batch, pipeline, d); #endif /* GFX_VER >= 11 */ -- 2.7.4