Skip to content

G
glslang
Commit f6cfb82f by John Kessenich
Options

SPV: Add support for testing against Vulkan 1.1.

parent 7e74a12b
Showing with 4 additions and 0 deletions
StandAlone/StandAlone.cpp
...@@ -466,6 +466,9 @@ void ProcessArguments(std::vector<std::unique_ptr<glslang::TWorkItem>>& workItem ...@@ -466,6 +466,9 @@ void ProcessArguments(std::vector<std::unique_ptr<glslang::TWorkItem>>& workItem
if (strcmp(argv[1], "vulkan1.0") == 0) { if (strcmp(argv[1], "vulkan1.0") == 0) {
setVulkanSpv(); setVulkanSpv();
VulkanClientVersion = 100; VulkanClientVersion = 100;
} else if (strcmp(argv[1], "vulkan1.1") == 0) {
setVulkanSpv();
VulkanClientVersion = 110;
} else if (strcmp(argv[1], "opengl") == 0) { } else if (strcmp(argv[1], "opengl") == 0) {
setOpenGlSpv(); setOpenGlSpv();
OpenGLClientVersion = 450; OpenGLClientVersion = 450;
......
Test/runtests
...@@ -133,6 +133,7 @@ diff -b $BASEDIR/hlsl.-D-U.frag.out $TARGETDIR/hlsl.-D-U.frag.out || HASERROR=1 ...@@ -133,6 +133,7 @@ diff -b $BASEDIR/hlsl.-D-U.frag.out $TARGETDIR/hlsl.-D-U.frag.out || HASERROR=1
$EXE --client vulkan100 spv.targetVulkan.vert || HASERROR=1 $EXE --client vulkan100 spv.targetVulkan.vert || HASERROR=1
$EXE --client opengl100 spv.targetOpenGL.vert || HASERROR=1 $EXE --client opengl100 spv.targetOpenGL.vert || HASERROR=1
$EXE --target-env vulkan1.0 spv.targetVulkan.vert || HASERROR=1 $EXE --target-env vulkan1.0 spv.targetVulkan.vert || HASERROR=1
$EXE --target-env vulkan1.1 spv.targetVulkan.vert || HASERROR=1
$EXE --target-env opengl spv.targetOpenGL.vert || HASERROR=1 $EXE --target-env opengl spv.targetOpenGL.vert || HASERROR=1
$EXE -V100 spv.targetVulkan.vert || HASERROR=1 $EXE -V100 spv.targetVulkan.vert || HASERROR=1
$EXE -G100 spv.targetOpenGL.vert || HASERROR=1 $EXE -G100 spv.targetOpenGL.vert || HASERROR=1
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment