SPV/Vulkan: Add support for Vulkan 1.2, which defaults to SPIR-V 1.5.
diff --git a/StandAlone/StandAlone.cpp b/StandAlone/StandAlone.cpp
index 28c5e15..6e4c8d3 100644
--- a/StandAlone/StandAlone.cpp
+++ b/StandAlone/StandAlone.cpp
@@ -608,6 +608,9 @@
} else if (strcmp(argv[1], "vulkan1.1") == 0) {
setVulkanSpv();
ClientVersion = glslang::EShTargetVulkan_1_1;
+ } else if (strcmp(argv[1], "vulkan1.2") == 0) {
+ setVulkanSpv();
+ ClientVersion = glslang::EShTargetVulkan_1_2;
} else if (strcmp(argv[1], "opengl") == 0) {
setOpenGlSpv();
ClientVersion = glslang::EShTargetOpenGL_450;
@@ -630,7 +633,7 @@
TargetLanguage = glslang::EShTargetSpv;
TargetVersion = glslang::EShTargetSpv_1_5;
} else
- Error("--target-env expected one of: vulkan1.0, vulkan1.1, opengl,\n"
+ Error("--target-env expected one of: vulkan1.0, vulkan1.1, vulkan1.2, opengl,\n"
"spirv1.0, spirv1.1, spirv1.2, spirv1.3, spirv1.4, or spirv1.5");
}
bumpArg();
@@ -825,6 +828,10 @@
TargetLanguage = glslang::EShTargetSpv;
TargetVersion = glslang::EShTargetSpv_1_3;
break;
+ case glslang::EShTargetVulkan_1_2:
+ TargetLanguage = glslang::EShTargetSpv;
+ TargetVersion = glslang::EShTargetSpv_1_5;
+ break;
case glslang::EShTargetOpenGL_450:
TargetLanguage = glslang::EShTargetSpv;
TargetVersion = glslang::EShTargetSpv_1_0;
@@ -1640,16 +1647,17 @@
" --sep synonym for --source-entrypoint\n"
" --stdin read from stdin instead of from a file;\n"
" requires providing the shader stage using -S\n"
- " --target-env {vulkan1.0 | vulkan1.1 | opengl | \n"
+ " --target-env {vulkan1.0 | vulkan1.1 | vulkan1.2 | opengl | \n"
" spirv1.0 | spirv1.1 | spirv1.2 | spirv1.3 | spirv1.4 | spirv1.5}\n"
- " set execution environment that emitted code\n"
- " will execute in (versus source language\n"
- " semantics selected by --client) defaults:\n"
- " * 'vulkan1.0' under '--client vulkan<ver>'\n"
- " * 'opengl' under '--client opengl<ver>'\n"
- " * 'spirv1.0' under --target-env vulkan1.0\n"
- " * 'spirv1.3' under --target-env vulkan1.1\n"
- " multiple --targen-env can be specified.\n"
+ " Set the execution environment that the\n"
+ " generated code will be executed in.\n"
+ " Defaults to:\n"
+ " * vulkan1.0 under --client vulkan<ver>\n"
+ " * opengl under --client opengl<ver>\n"
+ " * spirv1.0 under --target-env vulkan1.0\n"
+ " * spirv1.3 under --target-env vulkan1.1\n"
+ " * spirv1.5 under --target-env vulkan1.2\n"
+ " Multiple --target-env can be specified.\n"
" --variable-name <name>\n"
" --vn <name> creates a C header file that contains a\n"
" uint32_t array named <name>\n"