diff options
| author | Mike Blumenkrantz <michael.blumenkrantz@gmail.com> | 2023-01-10 11:04:01 -0500 |
|---|---|---|
| committer | Marge Bot <emma+marge@anholt.net> | 2023-01-23 21:04:53 +0000 |
| commit | c26306f7d9c72f53da219f487f4551422b3b100e (patch) | |
| tree | ff77f0f2507075d47746b228adcaa381b0a9d5b8 /src/amd/vulkan | |
| parent | 5039acfd9df6f4d3fc7cc655717b1c5389120260 (diff) | |
radv: stop using radv_pipeline_has_stage() in BindPipeline
this incurs a small amount of unnecessary cpu overhead as compared to just
checking bitflags
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20615>
Diffstat (limited to 'src/amd/vulkan')
| -rw-r--r-- | src/amd/vulkan/radv_cmd_buffer.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/amd/vulkan/radv_cmd_buffer.c b/src/amd/vulkan/radv_cmd_buffer.c index 4ad7b7e30e9..21c2ba71fbe 100644 --- a/src/amd/vulkan/radv_cmd_buffer.c +++ b/src/amd/vulkan/radv_cmd_buffer.c @@ -6275,7 +6275,7 @@ radv_CmdBindPipeline(VkCommandBuffer commandBuffer, VkPipelineBindPoint pipeline cmd_buffer->state.graphics_pipeline->vtx_base_sgpr != graphics_pipeline->vtx_base_sgpr; cmd_buffer->state.graphics_pipeline = graphics_pipeline; - bool mesh_shading = radv_pipeline_has_stage(graphics_pipeline, MESA_SHADER_MESH); + bool mesh_shading = (graphics_pipeline->active_stages & VK_SHADER_STAGE_MESH_BIT_EXT) > 0; if (mesh_shading != cmd_buffer->state.mesh_shading) { /* Re-emit VRS state because the combiner is different (vertex vs primitive). * Re-emit primitive topology because the mesh shading pipeline clobbered it. @@ -6310,7 +6310,7 @@ radv_CmdBindPipeline(VkCommandBuffer commandBuffer, VkPipelineBindPoint pipeline cmd_buffer->state.flush_bits |= RADV_CMD_FLAG_VGT_FLUSH; } - if (radv_pipeline_has_stage(graphics_pipeline, MESA_SHADER_TESS_CTRL)) { + if (graphics_pipeline->active_stages & VK_SHADER_STAGE_TESSELLATION_CONTROL_BIT) { if (!(graphics_pipeline->dynamic_states & RADV_DYNAMIC_PATCH_CONTROL_POINTS)) { /* Bind the tessellation state from the pipeline when it's not dynamic. */ struct radv_shader *tcs = graphics_pipeline->base.shaders[MESA_SHADER_TESS_CTRL]; @@ -6381,13 +6381,13 @@ radv_CmdBindPipeline(VkCommandBuffer commandBuffer, VkPipelineBindPoint pipeline MAX2(cmd_buffer->scratch_size_per_wave_needed, pipeline->scratch_bytes_per_wave); cmd_buffer->scratch_waves_wanted = MAX2(cmd_buffer->scratch_waves_wanted, pipeline->max_waves); - if (radv_pipeline_has_stage(graphics_pipeline, MESA_SHADER_TESS_CTRL)) + if (graphics_pipeline->active_stages & VK_SHADER_STAGE_TESSELLATION_CONTROL_BIT) cmd_buffer->tess_rings_needed = true; if (mesh_shading) cmd_buffer->mesh_scratch_ring_needed |= pipeline->shaders[MESA_SHADER_MESH]->info.ms.needs_ms_scratch_ring; - if (radv_pipeline_has_stage(graphics_pipeline, MESA_SHADER_TASK)) { + if (graphics_pipeline->active_stages & VK_SHADER_STAGE_TASK_BIT_EXT) { if (!cmd_buffer->ace_internal.cs) { cmd_buffer->ace_internal.cs = radv_ace_internal_create(cmd_buffer); if (!cmd_buffer->ace_internal.cs) |