From 20463da42edf31f4783f5c5db3d478aee412eb03 Mon Sep 17 00:00:00 2001 From: "HuYingzhuo(hugo/hyzboy)" Date: Wed, 31 May 2023 14:36:33 +0800 Subject: [PATCH] added vulkan_version/spv_version --- glsl2spv.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/glsl2spv.cpp b/glsl2spv.cpp index 6db0bb8..d694629 100644 --- a/glsl2spv.cpp +++ b/glsl2spv.cpp @@ -199,6 +199,9 @@ struct CompileInfo uint32_t includes_count; const char ** includes; const char * preamble; + + const uint32_t vulkan_version; + const uint32_t spv_version; }; enum class VertexAttribBaseType @@ -545,7 +548,9 @@ extern "C" // shader.setEnvInput(source,stage,glslang::EShClientVulkan,); // shader.setEnvClient(glslang::EShClientVulkan, glslang::EShTargetVulkan_1_0); -// shader.setEnvTarget(glslang::EShTargetSpv, glslang::EShTargetSpv_1_0); + + shader.setEnvInput(source,stage,glslang::EShClientVulkan,compile_info->vulkan_version); + shader.setEnvTarget(glslang::EShTargetSpv, (glslang::EShTargetLanguageVersion)(compile_info->spv_version)); if (!shader.parse(&Resources, 110, // use 100 for ES environment, 110 for desktop; this is the GLSL version, not SPIR-V or Vulkan