Mesa (main): radv: Move RADV_RT_STAGE_BITS to radv_private.h

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Wed May 4 14:15:08 UTC 2022


Module: Mesa
Branch: main
Commit: 0fe2ffeb65dbcf06d08e581e52b1047559917ef3
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=0fe2ffeb65dbcf06d08e581e52b1047559917ef3

Author: Konstantin Seurer <konstantin.seurer at gmail.com>
Date:   Wed May  4 14:43:33 2022 +0200

radv: Move RADV_RT_STAGE_BITS to radv_private.h

Signed-off-by: Konstantin Seurer <konstantin.seurer at gmail.com>
Reviewed-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16306>

---

 src/amd/vulkan/radv_cmd_buffer.c | 6 ------
 src/amd/vulkan/radv_private.h    | 6 ++++++
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/amd/vulkan/radv_cmd_buffer.c b/src/amd/vulkan/radv_cmd_buffer.c
index f93b05167d2..e4d613dea77 100644
--- a/src/amd/vulkan/radv_cmd_buffer.c
+++ b/src/amd/vulkan/radv_cmd_buffer.c
@@ -54,12 +54,6 @@ enum {
                             RADV_PREFETCH_GS | RADV_PREFETCH_PS | RADV_PREFETCH_MS)
 };
 
-enum {
-   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)
-};
-
 static void radv_handle_image_transition(struct radv_cmd_buffer *cmd_buffer,
                                          struct radv_image *image, VkImageLayout src_layout,
                                          bool src_render_loop, VkImageLayout dst_layout,
diff --git a/src/amd/vulkan/radv_private.h b/src/amd/vulkan/radv_private.h
index 5133067f5c7..cfbd816d647 100644
--- a/src/amd/vulkan/radv_private.h
+++ b/src/amd/vulkan/radv_private.h
@@ -1770,6 +1770,12 @@ bool radv_enable_rt(const struct radv_physical_device *pdevice);
 
 bool radv_emulate_rt(const struct radv_physical_device *pdevice);
 
+enum {
+   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)
+};
+
 #define RADV_STAGE_MASK ((1 << MESA_VULKAN_SHADER_STAGES) - 1)
 
 #define radv_foreach_stage(stage, stage_bits)                                                      \



More information about the mesa-commit mailing list