From de07e66728ad4d93f5c2a2e66fc7b6f5e937c828 Mon Sep 17 00:00:00 2001 From: Cam Mannett Date: Tue, 10 Sep 2024 09:47:42 +0100 Subject: [PATCH] Use GLSL 460 for built-in spirv-cross -> GLSL calls spirv-cross defaults to 450 but will not parse shaders containing the RayQuery capability unless the version is set to 460. This change modifies the built-in GLSL cross tool to set `--version 460`. This change does not affect user-specified spirv-cross configurations. --- qrenderdoc/Code/Interface/PersistantConfig.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qrenderdoc/Code/Interface/PersistantConfig.cpp b/qrenderdoc/Code/Interface/PersistantConfig.cpp index 600a01e41..57bf569b3 100644 --- a/qrenderdoc/Code/Interface/PersistantConfig.cpp +++ b/qrenderdoc/Code/Interface/PersistantConfig.cpp @@ -705,7 +705,7 @@ ShaderProcessingTool::ShaderProcessingTool(const QVariant &var) rdcstr ShaderProcessingTool::DefaultArguments() const { if(tool == KnownShaderTool::SPIRV_Cross) - return "--vulkan-semantics --entry {entry_point} --stage {glsl_stage4}"; + return "--vulkan-semantics --entry {entry_point} --stage {glsl_stage4} --version 460"; else if(tool == KnownShaderTool::SPIRV_Cross_OpenGL) return "--entry {entry_point} --stage {glsl_stage4}"; else if(tool == KnownShaderTool::spirv_dis || tool == KnownShaderTool::spirv_dis_OpenGL)