From 456d691310950d6245e4971bc01f8f55e384ad50 Mon Sep 17 00:00:00 2001 From: Lionel Landwerlin Date: Sun, 12 May 2024 21:40:32 +0300 Subject: [PATCH] anv: move RT stage bits to main header MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Lionel Landwerlin Reviewed-by: Tapani Pälli Part-of: --- src/intel/vulkan/anv_cmd_buffer.c | 22 ++-------------------- src/intel/vulkan/anv_private.h | 7 +++++++ 2 files changed, 9 insertions(+), 20 deletions(-) diff --git a/src/intel/vulkan/anv_cmd_buffer.c b/src/intel/vulkan/anv_cmd_buffer.c index 7d29dddb44f..94e4630ff01 100644 --- a/src/intel/vulkan/anv_cmd_buffer.c +++ b/src/intel/vulkan/anv_cmd_buffer.c @@ -743,12 +743,7 @@ anv_cmd_buffer_get_pipeline_layout_state(struct anv_cmd_buffer *cmd_buffer, return &cmd_buffer->state.compute.base; case VK_PIPELINE_BIND_POINT_RAY_TRACING_KHR: - *out_stages &= 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; + *out_stages &= ANV_RT_STAGE_BITS; return &cmd_buffer->state.rt.base; default: @@ -838,12 +833,7 @@ anv_cmd_buffer_bind_descriptor_set(struct anv_cmd_buffer *cmd_buffer, !cmd_buffer->device->physical->indirect_descriptors || (stages & (VK_SHADER_STAGE_TASK_BIT_EXT | VK_SHADER_STAGE_MESH_BIT_EXT | - 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)); + ANV_RT_STAGE_BITS)); if (update_desc_sets) { struct anv_push_constants *push = &pipe_state->push_constants; @@ -916,14 +906,6 @@ anv_cmd_buffer_bind_descriptor_set(struct anv_cmd_buffer *cmd_buffer, VK_SHADER_STAGE_MESH_BIT_EXT | \ VK_SHADER_STAGE_TASK_BIT_EXT) -#define ANV_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) - void anv_CmdBindDescriptorSets2KHR( VkCommandBuffer commandBuffer, const VkBindDescriptorSetsInfoKHR* pInfo) diff --git a/src/intel/vulkan/anv_private.h b/src/intel/vulkan/anv_private.h index 3237a11cc77..aa552ccebad 100644 --- a/src/intel/vulkan/anv_private.h +++ b/src/intel/vulkan/anv_private.h @@ -146,6 +146,13 @@ struct intel_perf_query_result; #define CLOCK_MONOTONIC_RAW CLOCK_MONOTONIC_FAST #endif +#define ANV_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) + #define NSEC_PER_SEC 1000000000ull #define BINDING_TABLE_POOL_BLOCK_SIZE (65536)