From 74a27a6ccb32b4c81eff4bcc808401bdb0adba0b Mon Sep 17 00:00:00 2001 From: Lionel Landwerlin Date: Thu, 28 Apr 2022 11:35:35 +0300 Subject: [PATCH] anv: don't emit 3DSTATE_VF_TOPOLOGY in pipeline batch MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit v2: drop primitive_topology = 0xffffffff (Tapani) Signed-off-by: Lionel Landwerlin Reviewed-by: Tapani Pälli Part-of: --- src/intel/vulkan/genX_pipeline.c | 13 ------------- src/intel/vulkan/gfx8_cmd_buffer.c | 3 ++- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/src/intel/vulkan/genX_pipeline.c b/src/intel/vulkan/genX_pipeline.c index 65fec6ad007..3dcd47c8913 100644 --- a/src/intel/vulkan/genX_pipeline.c +++ b/src/intel/vulkan/genX_pipeline.c @@ -2458,14 +2458,6 @@ emit_3dstate_ps_extra(struct anv_graphics_pipeline *pipeline, #endif } } - -static void -emit_3dstate_vf_topology(struct anv_graphics_pipeline *pipeline) -{ - anv_batch_emit(&pipeline->base.batch, GENX(3DSTATE_VF_TOPOLOGY), vft) { - vft.PrimitiveTopologyType = pipeline->topology; - } -} #endif static void @@ -2802,11 +2794,6 @@ genX(graphics_pipeline_create)( emit_3dstate_hs_te_ds(pipeline, pCreateInfo->pTessellationState); emit_3dstate_gs(pipeline); -#if GFX_VER >= 8 - if (!(dynamic_states & ANV_CMD_DIRTY_DYNAMIC_PRIMITIVE_TOPOLOGY)) - emit_3dstate_vf_topology(pipeline); -#endif - emit_3dstate_vf_statistics(pipeline); emit_3dstate_streamout(pipeline, pCreateInfo->pRasterizationState, diff --git a/src/intel/vulkan/gfx8_cmd_buffer.c b/src/intel/vulkan/gfx8_cmd_buffer.c index d229d1f603e..c16893381df 100644 --- a/src/intel/vulkan/gfx8_cmd_buffer.c +++ b/src/intel/vulkan/gfx8_cmd_buffer.c @@ -328,7 +328,8 @@ genX(cmd_buffer_flush_dynamic_state)(struct anv_cmd_buffer *cmd_buffer) genX(emit_shading_rate)(&cmd_buffer->batch, pipeline, d); #endif /* GFX_VER >= 11 */ - if (cmd_buffer->state.gfx.dirty & ANV_CMD_DIRTY_DYNAMIC_PRIMITIVE_TOPOLOGY) { + if (cmd_buffer->state.gfx.dirty & (ANV_CMD_DIRTY_PIPELINE | + ANV_CMD_DIRTY_DYNAMIC_PRIMITIVE_TOPOLOGY)) { uint32_t topology; if (anv_pipeline_has_stage(pipeline, MESA_SHADER_TESS_EVAL)) topology = pipeline->topology;