diff --git a/src/amd/vulkan/radv_cmd_buffer.c b/src/amd/vulkan/radv_cmd_buffer.c index eec6f8f44c2..d514352c0a8 100644 --- a/src/amd/vulkan/radv_cmd_buffer.c +++ b/src/amd/vulkan/radv_cmd_buffer.c @@ -3998,9 +3998,6 @@ radv_emit_graphics_pipeline(struct radv_cmd_buffer *cmd_buffer) struct radv_device *device = radv_cmd_buffer_device(cmd_buffer); struct radv_cmd_stream *cs = cmd_buffer->cs; - if (cmd_buffer->state.emitted_graphics_pipeline == pipeline) - return; - radv_emit_graphics_shaders(cmd_buffer); if (pipeline->sqtt_shaders_reloc) { @@ -4012,8 +4009,6 @@ radv_emit_graphics_pipeline(struct radv_cmd_buffer *cmd_buffer) if (radv_device_fault_detection_enabled(device)) radv_save_pipeline(cmd_buffer, &pipeline->base); - - cmd_buffer->state.emitted_graphics_pipeline = pipeline; } static bool @@ -6061,8 +6056,6 @@ emit_prolog_regs(struct radv_cmd_buffer *cmd_buffer, const struct radv_shader *v enum amd_gfx_level chip = pdev->info.gfx_level; - assert(cmd_buffer->state.emitted_graphics_pipeline == cmd_buffer->state.graphics_pipeline); - if (vs_shader->info.merged_shader_compiled_separately) { if (vs_shader->info.next_stage == MESA_SHADER_GEOMETRY) { radv_shader_combine_cfg_vs_gs(device, vs_shader, cmd_buffer->state.shaders[MESA_SHADER_GEOMETRY], &rsrc1, @@ -10049,7 +10042,6 @@ radv_CmdExecuteCommands(VkCommandBuffer commandBuffer, uint32_t commandBufferCou device->ws->cs_execute_secondary(primary_cs->b, secondary_cs->b, allow_ib2); - primary->state.emitted_graphics_pipeline = secondary->state.emitted_graphics_pipeline; primary->state.emitted_compute_pipeline = secondary->state.emitted_compute_pipeline; primary->state.emitted_rt_pipeline = secondary->state.emitted_rt_pipeline; @@ -16263,7 +16255,6 @@ radv_reset_pipeline_state(struct radv_cmd_buffer *cmd_buffer, VkPipelineBindPoin cmd_buffer->state.dirty |= RADV_CMD_DIRTY_FRAGMENT_OUTPUT; } } - cmd_buffer->state.emitted_graphics_pipeline = NULL; cmd_buffer->state.dirty &= ~RADV_CMD_DIRTY_GRAPHICS_PIPELINE; break; default: diff --git a/src/amd/vulkan/radv_cmd_buffer.h b/src/amd/vulkan/radv_cmd_buffer.h index 2c6e5cbc518..5656d4f2f9d 100644 --- a/src/amd/vulkan/radv_cmd_buffer.h +++ b/src/amd/vulkan/radv_cmd_buffer.h @@ -340,7 +340,6 @@ struct radv_cmd_state { uint32_t prefetch_L2_mask; struct radv_graphics_pipeline *graphics_pipeline; - struct radv_graphics_pipeline *emitted_graphics_pipeline; struct radv_compute_pipeline *compute_pipeline; struct radv_compute_pipeline *emitted_compute_pipeline; struct radv_ray_tracing_pipeline *rt_pipeline;