fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-06-07 01:48:20 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

vulkan: adjust MESA_VK_PIPELINE_RAY_TRACING_FLAGS with beta extensions disabled

Browse source 
This prevent a build failure in the next commit.

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/40385>
This commit is contained in:
Samuel Pitoiset 2026-03-13 08:07:12 +01:00 • committed by Marge Bot
parent 1746837a71
commit 6d0fc30e7a
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/vulkan/runtime/vk_shader.h
View file

@ -52,6 +52,13 @@ bool vk_validate_shader_binaries(void);
int vk_shader_cmp_graphics_stages(mesa_shader_stage a, mesa_shader_stage b);
int vk_shader_cmp_rt_stages(mesa_shader_stage a, mesa_shader_stage b);
#ifdef VK_ENABLE_BETA_EXTENSIONS
#define MESA_VK_PIPELINE_RAY_TRACING_FLAGS_BETA ( \
VK_PIPELINE_CREATE_2_RAY_TRACING_DISPLACEMENT_MICROMAP_BIT_NV)
#else
#define MESA_VK_PIPELINE_RAY_TRACING_FLAGS_BETA (0)
#endif
#define MESA_VK_PIPELINE_RAY_TRACING_FLAGS ( \
VK_PIPELINE_CREATE_2_RAY_TRACING_SKIP_BUILT_IN_PRIMITIVES_BIT_KHR | \
VK_PIPELINE_CREATE_2_RAY_TRACING_ALLOW_SPHERES_AND_LINEAR_SWEPT_SPHERES_BIT_NV | \
@ -63,9 +70,8 @@ int vk_shader_cmp_rt_stages(mesa_shader_stage a, mesa_shader_stage b);
VK_PIPELINE_CREATE_2_RAY_TRACING_NO_NULL_INTERSECTION_SHADERS_BIT_KHR | \
VK_PIPELINE_CREATE_2_RAY_TRACING_SHADER_GROUP_HANDLE_CAPTURE_REPLAY_BIT_KHR | \
VK_PIPELINE_CREATE_2_RAY_TRACING_ALLOW_MOTION_BIT_NV | \
VK_PIPELINE_CREATE_2_RAY_TRACING_OPACITY_MICROMAP_BIT_EXT | \
VK_PIPELINE_CREATE_2_RAY_TRACING_DISPLACEMENT_MICROMAP_BIT_NV | \
VK_PIPELINE_CREATE_2_DISALLOW_OPACITY_MICROMAP_BIT_ARM)
VK_PIPELINE_CREATE_2_DISALLOW_OPACITY_MICROMAP_BIT_ARM | \
MESA_VK_PIPELINE_RAY_TRACING_FLAGS_BETA)
struct vk_shader_compile_info {
mesa_shader_stage stage;