Module: Mesa Branch: main Commit: 5f6362470135cbd622bb5e2d07d1992bba443afa URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=5f6362470135cbd622bb5e2d07d1992bba443afa
Author: Samuel Pitoiset <samuel.pitoi...@gmail.com> Date: Tue Nov 28 13:44:00 2023 +0100 radv: rename RADV_GRAPHICS_STAGES to RADV_GRAPHICS_STAGE_BITS For consistency with RADV_RT_STAGE_BITS. Signed-off-by: Samuel Pitoiset <samuel.pitoi...@gmail.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26757> --- src/amd/vulkan/radv_cmd_buffer.c | 9 +++------ src/amd/vulkan/radv_shader.h | 2 ++ 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/amd/vulkan/radv_cmd_buffer.c b/src/amd/vulkan/radv_cmd_buffer.c index dcbab247111..259f3786cfb 100644 --- a/src/amd/vulkan/radv_cmd_buffer.c +++ b/src/amd/vulkan/radv_cmd_buffer.c @@ -6435,9 +6435,6 @@ radv_bind_task_shader(struct radv_cmd_buffer *cmd_buffer, const struct radv_shad cmd_buffer->task_rings_needed = true; } -#define RADV_GRAPHICS_STAGES \ - (VK_SHADER_STAGE_ALL_GRAPHICS | VK_SHADER_STAGE_MESH_BIT_EXT | VK_SHADER_STAGE_TASK_BIT_EXT) - /* This function binds/unbinds a shader to the cmdbuffer state. */ static void radv_bind_shader(struct radv_cmd_buffer *cmd_buffer, struct radv_shader *shader, gl_shader_stage stage) @@ -6501,7 +6498,7 @@ radv_bind_shader(struct radv_cmd_buffer *cmd_buffer, struct radv_shader *shader, cmd_buffer->state.shaders[stage] = shader; cmd_buffer->state.active_stages |= mesa_to_vk_shader_stage(stage); - if (mesa_to_vk_shader_stage(stage) & RADV_GRAPHICS_STAGES) { + if (mesa_to_vk_shader_stage(stage) & RADV_GRAPHICS_STAGE_BITS) { cmd_buffer->scratch_size_per_wave_needed = MAX2(cmd_buffer->scratch_size_per_wave_needed, shader->config.scratch_bytes_per_wave); @@ -6563,8 +6560,8 @@ radv_CmdBindPipeline(VkCommandBuffer commandBuffer, VkPipelineBindPoint pipeline return; radv_mark_descriptor_sets_dirty(cmd_buffer, pipelineBindPoint); - radv_foreach_stage(stage, - (cmd_buffer->state.active_stages | graphics_pipeline->active_stages) & RADV_GRAPHICS_STAGES) + radv_foreach_stage( + stage, (cmd_buffer->state.active_stages | graphics_pipeline->active_stages) & RADV_GRAPHICS_STAGE_BITS) { radv_bind_shader(cmd_buffer, graphics_pipeline->base.shaders[stage], stage); } diff --git a/src/amd/vulkan/radv_shader.h b/src/amd/vulkan/radv_shader.h index bab97c1e7a4..b209092a260 100644 --- a/src/amd/vulkan/radv_shader.h +++ b/src/amd/vulkan/radv_shader.h @@ -52,6 +52,8 @@ struct radv_shader_args; struct radv_serialized_shader_arena_block; enum { + RADV_GRAPHICS_STAGE_BITS = + (VK_SHADER_STAGE_ALL_GRAPHICS | VK_SHADER_STAGE_MESH_BIT_EXT | VK_SHADER_STAGE_TASK_BIT_EXT), RADV_RT_STAGE_BITS = (VK_SHADER_STAGE_RAYGEN_BIT_KHR | VK_SHADER_STAGE_ANY_HIT_BIT_KHR | VK_SHADER_STAGE_CLOSEST_HIT_BIT_KHR | VK_SHADER_STAGE_MISS_BIT_KHR | VK_SHADER_STAGE_INTERSECTION_BIT_KHR | VK_SHADER_STAGE_CALLABLE_BIT_KHR)
