Fix SPIR-V version in subgroups tests

Component: Vulkan

VK-GL-CTS issue: 735

Affects:
dEQP-VK.subgroups.*

Change-Id: Ib276fbc736fa130abf98daee412893bc9d83ea8a

diff --git a/external/vulkancts/modules/vulkan/subgroups/vktSubgroupsArithmeticTests.cpp b/external/vulkancts/modules/vulkan/subgroups/vktSubgroupsArithmeticTests.cpp
index b746422..5a3e88d 100644 (file)
--- a/external/vulkancts/modules/vulkan/subgroups/vktSubgroupsArithmeticTests.cpp
+++ b/external/vulkancts/modules/vulkan/subgroups/vktSubgroupsArithmeticTests.cpp
@@ -547,7 +547,7 @@ void initFrameBufferPrograms (SourceCollections& programCollection, CaseDefiniti
                        << "  gl_Position = in_position;\n"
                        << "}\n";
 
-               programCollection.glslSources.add("vert") << glu::VertexSource(src.str());
+               programCollection.glslSources.add("vert") << glu::VertexSource(src.str()) << vk::ShaderBuildOptions(vk::SPIRV_VERSION_1_3, 0u);
 
                fragmentSrc << glu::getGLSLVersionDeclaration(glu::GLSL_VERSION_450)<<"\n"
                        << "layout(location = 0) in float in_color;\n"
@@ -556,7 +556,7 @@ void initFrameBufferPrograms (SourceCollections& programCollection, CaseDefiniti
                        <<"{\n"
                        << "    out_color = uint(in_color);\n"
                        << "}\n";
-               programCollection.glslSources.add("fragment") << glu::FragmentSource(fragmentSrc.str());
+               programCollection.glslSources.add("fragment") << glu::FragmentSource(fragmentSrc.str()) << vk::ShaderBuildOptions(vk::SPIRV_VERSION_1_3, 0u);
        }
        else
        {
@@ -656,12 +656,12 @@ void initPrograms(SourceCollections& programCollection, CaseDefinition caseDef)
                        << "}\n";
 
                programCollection.glslSources.add("comp")
-                               << glu::ComputeSource(src.str()) << vk::ShaderBuildOptions(vk::SPIRV_VERSION_1_3, 0u);;
+                               << glu::ComputeSource(src.str()) << vk::ShaderBuildOptions(vk::SPIRV_VERSION_1_3, 0u);
        }
        else if (VK_SHADER_STAGE_FRAGMENT_BIT == caseDef.shaderStage)
        {
                programCollection.glslSources.add("vert")
-                               << glu::VertexSource(subgroups::getVertShaderForStage(caseDef.shaderStage));
+                               << glu::VertexSource(subgroups::getVertShaderForStage(caseDef.shaderStage)) << vk::ShaderBuildOptions(vk::SPIRV_VERSION_1_3, 0u);
 
                std::ostringstream frag;
 
@@ -712,7 +712,7 @@ void initPrograms(SourceCollections& programCollection, CaseDefinition caseDef)
        else if (VK_SHADER_STAGE_GEOMETRY_BIT == caseDef.shaderStage)
        {
                programCollection.glslSources.add("vert")
-                               << glu::VertexSource(subgroups::getVertShaderForStage(caseDef.shaderStage));
+                               << glu::VertexSource(subgroups::getVertShaderForStage(caseDef.shaderStage)) << vk::ShaderBuildOptions(vk::SPIRV_VERSION_1_3, 0u);
 
                std::ostringstream src;
 
@@ -743,7 +743,7 @@ void initPrograms(SourceCollections& programCollection, CaseDefinition caseDef)
        else if (VK_SHADER_STAGE_TESSELLATION_CONTROL_BIT == caseDef.shaderStage)
        {
                programCollection.glslSources.add("vert")
-                               << glu::VertexSource(subgroups::getVertShaderForStage(caseDef.shaderStage));
+                               << glu::VertexSource(subgroups::getVertShaderForStage(caseDef.shaderStage)) << vk::ShaderBuildOptions(vk::SPIRV_VERSION_1_3, 0u);
 
                programCollection.glslSources.add("tese")
                                << glu::TessellationEvaluationSource("#version 450\nlayout(isolines) in;\nvoid main (void) {}\n");
@@ -776,7 +776,7 @@ void initPrograms(SourceCollections& programCollection, CaseDefinition caseDef)
        else if (VK_SHADER_STAGE_TESSELLATION_EVALUATION_BIT == caseDef.shaderStage)
        {
                programCollection.glslSources.add("vert")
-                               << glu::VertexSource(subgroups::getVertShaderForStage(caseDef.shaderStage));
+                               << glu::VertexSource(subgroups::getVertShaderForStage(caseDef.shaderStage)) << vk::ShaderBuildOptions(vk::SPIRV_VERSION_1_3, 0u);
 
                programCollection.glslSources.add("tesc")
                                << glu::TessellationControlSource("#version 450\nlayout(vertices=1) out;\nvoid main (void) { for(uint i = 0; i < 4; i++) { gl_TessLevelOuter[i] = 1.0f; } }\n");

diff --git a/external/vulkancts/modules/vulkan/subgroups/vktSubgroupsBallotBroadcastTests.cpp b/external/vulkancts/modules/vulkan/subgroups/vktSubgroupsBallotBroadcastTests.cpp
index 3616c80..6842a72 100644 (file)
--- a/external/vulkancts/modules/vulkan/subgroups/vktSubgroupsBallotBroadcastTests.cpp
+++ b/external/vulkancts/modules/vulkan/subgroups/vktSubgroupsBallotBroadcastTests.cpp
@@ -238,7 +238,7 @@ void initFrameBufferPrograms(SourceCollections& programCollection, CaseDefinitio
                        << "}\n";
 
                programCollection.glslSources.add("vert")
-                               << glu::VertexSource(src.str());
+                               << glu::VertexSource(src.str()) << vk::ShaderBuildOptions(vk::SPIRV_VERSION_1_3, 0u);
 
                fragmentSrc << glu::getGLSLVersionDeclaration(glu::GLSL_VERSION_450)<<"\n"
                        << "layout(location = 0) in float in_color;\n"
@@ -247,7 +247,7 @@ void initFrameBufferPrograms(SourceCollections& programCollection, CaseDefinitio
                        <<"{\n"
                        << "    out_color = uint(in_color);\n"
                        << "}\n";
-               programCollection.glslSources.add("fragment") << glu::FragmentSource(fragmentSrc.str());
+               programCollection.glslSources.add("fragment") << glu::FragmentSource(fragmentSrc.str()) << vk::ShaderBuildOptions(vk::SPIRV_VERSION_1_3, 0u);
        }
        else
        {
@@ -396,7 +396,7 @@ void initPrograms(SourceCollections& programCollection, CaseDefinition caseDef)
        else if (VK_SHADER_STAGE_GEOMETRY_BIT == caseDef.shaderStage)
        {
                programCollection.glslSources.add("vert")
-                               << glu::VertexSource(subgroups::getVertShaderForStage(caseDef.shaderStage));
+                               << glu::VertexSource(subgroups::getVertShaderForStage(caseDef.shaderStage)) << vk::ShaderBuildOptions(vk::SPIRV_VERSION_1_3, 0u);
 
                std::ostringstream src;
 
@@ -426,7 +426,7 @@ void initPrograms(SourceCollections& programCollection, CaseDefinition caseDef)
        else if (VK_SHADER_STAGE_TESSELLATION_CONTROL_BIT == caseDef.shaderStage)
        {
                programCollection.glslSources.add("vert")
-                               << glu::VertexSource(subgroups::getVertShaderForStage(caseDef.shaderStage));
+                               << glu::VertexSource(subgroups::getVertShaderForStage(caseDef.shaderStage)) << vk::ShaderBuildOptions(vk::SPIRV_VERSION_1_3, 0u);
 
                programCollection.glslSources.add("tese")
                                << glu::TessellationEvaluationSource("#version 450\nlayout(isolines) in;\nvoid main (void) {}\n");
@@ -458,7 +458,7 @@ void initPrograms(SourceCollections& programCollection, CaseDefinition caseDef)
        else if (VK_SHADER_STAGE_TESSELLATION_EVALUATION_BIT == caseDef.shaderStage)
        {
                programCollection.glslSources.add("vert")
-                               << glu::VertexSource(subgroups::getVertShaderForStage(caseDef.shaderStage));
+                               << glu::VertexSource(subgroups::getVertShaderForStage(caseDef.shaderStage)) << vk::ShaderBuildOptions(vk::SPIRV_VERSION_1_3, 0u);
 
                programCollection.glslSources.add("tesc")
                                << glu::TessellationControlSource("#version 450\nlayout(vertices=1) out;\nvoid main (void) { for(uint i = 0; i < 4; i++) { gl_TessLevelOuter[i] = 1.0f; } }\n");

diff --git a/external/vulkancts/modules/vulkan/subgroups/vktSubgroupsBallotOtherTests.cpp b/external/vulkancts/modules/vulkan/subgroups/vktSubgroupsBallotOtherTests.cpp
index 2438828..27bcd5b 100644 (file)
--- a/external/vulkancts/modules/vulkan/subgroups/vktSubgroupsBallotOtherTests.cpp
+++ b/external/vulkancts/modules/vulkan/subgroups/vktSubgroupsBallotOtherTests.cpp
@@ -327,7 +327,7 @@ void initFrameBufferPrograms (SourceCollections& programCollection, CaseDefiniti
                        << "  gl_Position = in_position;\n"
                        << "}\n";
 
-               programCollection.glslSources.add("vert") << glu::VertexSource(src.str());
+               programCollection.glslSources.add("vert") << glu::VertexSource(src.str()) << vk::ShaderBuildOptions(vk::SPIRV_VERSION_1_3, 0u);
 
                fragmentSrc << glu::getGLSLVersionDeclaration(glu::GLSL_VERSION_450)<<"\n"
                        << "layout(location = 0) in float in_color;\n"
@@ -336,7 +336,7 @@ void initFrameBufferPrograms (SourceCollections& programCollection, CaseDefiniti
                        <<"{\n"
                        << "    out_color = uint(in_color);\n"
                        << "}\n";
-               programCollection.glslSources.add("fragment") << glu::FragmentSource(fragmentSrc.str());
+               programCollection.glslSources.add("fragment") << glu::FragmentSource(fragmentSrc.str()) << vk::ShaderBuildOptions(vk::SPIRV_VERSION_1_3, 0u);
        }
        else
        {
@@ -514,7 +514,7 @@ void initPrograms (SourceCollections& programCollection, CaseDefinition caseDef)
        else if (VK_SHADER_STAGE_FRAGMENT_BIT == caseDef.shaderStage)
        {
                programCollection.glslSources.add("vert")
-                               << glu::VertexSource(subgroups::getVertShaderForStage(caseDef.shaderStage));
+                               << glu::VertexSource(subgroups::getVertShaderForStage(caseDef.shaderStage)) << vk::ShaderBuildOptions(vk::SPIRV_VERSION_1_3, 0u);
 
                std::ostringstream frag;
 
@@ -578,7 +578,7 @@ void initPrograms (SourceCollections& programCollection, CaseDefinition caseDef)
        else if (VK_SHADER_STAGE_TESSELLATION_CONTROL_BIT == caseDef.shaderStage)
        {
                programCollection.glslSources.add("vert")
-                               << glu::VertexSource(subgroups::getVertShaderForStage(caseDef.shaderStage));
+                               << glu::VertexSource(subgroups::getVertShaderForStage(caseDef.shaderStage)) << vk::ShaderBuildOptions(vk::SPIRV_VERSION_1_3, 0u);
 
                programCollection.glslSources.add("tese")
                                << glu::TessellationEvaluationSource("#version 450\nlayout(isolines) in;\nvoid main (void) {}\n");
@@ -605,7 +605,7 @@ void initPrograms (SourceCollections& programCollection, CaseDefinition caseDef)
        else if (VK_SHADER_STAGE_TESSELLATION_EVALUATION_BIT == caseDef.shaderStage)
        {
                programCollection.glslSources.add("vert")
-                               << glu::VertexSource(subgroups::getVertShaderForStage(caseDef.shaderStage));
+                               << glu::VertexSource(subgroups::getVertShaderForStage(caseDef.shaderStage)) << vk::ShaderBuildOptions(vk::SPIRV_VERSION_1_3, 0u);
 
                programCollection.glslSources.add("tesc")
                                << glu::TessellationControlSource("#version 450\nlayout(vertices=1) out;\nvoid main (void) { for(uint i = 0; i < 4; i++) { gl_TessLevelOuter[i] = 1.0f; } }\n");

diff --git a/external/vulkancts/modules/vulkan/subgroups/vktSubgroupsBallotTests.cpp b/external/vulkancts/modules/vulkan/subgroups/vktSubgroupsBallotTests.cpp
index 9906e0c..595c8d8 100644 (file)
--- a/external/vulkancts/modules/vulkan/subgroups/vktSubgroupsBallotTests.cpp
+++ b/external/vulkancts/modules/vulkan/subgroups/vktSubgroupsBallotTests.cpp
@@ -161,7 +161,7 @@ void initFrameBufferPrograms(SourceCollections& programCollection, CaseDefinitio
                        << "  gl_Position = in_position;\n"
                        << "}\n";
 
-               programCollection.glslSources.add("vert") << glu::VertexSource(vertexSrc.str());
+               programCollection.glslSources.add("vert") << glu::VertexSource(vertexSrc.str()) << vk::ShaderBuildOptions(vk::SPIRV_VERSION_1_3, 0u);
 
                fragmentSrc << glu::getGLSLVersionDeclaration(glu::GLSL_VERSION_450)<<"\n"
                        << "layout(location = 0) in float in_color;\n"
@@ -170,7 +170,7 @@ void initFrameBufferPrograms(SourceCollections& programCollection, CaseDefinitio
                        <<"{\n"
                        << "    out_color = uint(in_color);\n"
                        << "}\n";
-               programCollection.glslSources.add("fragment") << glu::FragmentSource(fragmentSrc.str());
+               programCollection.glslSources.add("fragment") << glu::FragmentSource(fragmentSrc.str()) << vk::ShaderBuildOptions(vk::SPIRV_VERSION_1_3, 0u);
        }
        else
        {
@@ -218,7 +218,7 @@ void initPrograms(SourceCollections& programCollection, CaseDefinition caseDef)
        else if (VK_SHADER_STAGE_FRAGMENT_BIT == caseDef.shaderStage)
        {
                programCollection.glslSources.add("vert")
-                               << glu::VertexSource(subgroups::getVertShaderForStage(caseDef.shaderStage));
+                               << glu::VertexSource(subgroups::getVertShaderForStage(caseDef.shaderStage)) << vk::ShaderBuildOptions(vk::SPIRV_VERSION_1_3, 0u);
 
                std::ostringstream frag;
 
@@ -273,7 +273,7 @@ void initPrograms(SourceCollections& programCollection, CaseDefinition caseDef)
        else if (VK_SHADER_STAGE_GEOMETRY_BIT == caseDef.shaderStage)
        {
                programCollection.glslSources.add("vert")
-                               << glu::VertexSource(subgroups::getVertShaderForStage(caseDef.shaderStage));
+                               << glu::VertexSource(subgroups::getVertShaderForStage(caseDef.shaderStage)) << vk::ShaderBuildOptions(vk::SPIRV_VERSION_1_3, 0u);
 
                std::ostringstream src;
 
@@ -306,7 +306,7 @@ void initPrograms(SourceCollections& programCollection, CaseDefinition caseDef)
        else if (VK_SHADER_STAGE_TESSELLATION_CONTROL_BIT == caseDef.shaderStage)
        {
                programCollection.glslSources.add("vert")
-                               << glu::VertexSource(subgroups::getVertShaderForStage(caseDef.shaderStage));
+                               << glu::VertexSource(subgroups::getVertShaderForStage(caseDef.shaderStage)) << vk::ShaderBuildOptions(vk::SPIRV_VERSION_1_3, 0u);
 
                programCollection.glslSources.add("tese")
                                << glu::TessellationEvaluationSource("#version 450\nlayout(isolines) in;\nvoid main (void) {}\n");
@@ -341,7 +341,7 @@ void initPrograms(SourceCollections& programCollection, CaseDefinition caseDef)
        else if (VK_SHADER_STAGE_TESSELLATION_EVALUATION_BIT == caseDef.shaderStage)
        {
                programCollection.glslSources.add("vert")
-                               << glu::VertexSource(subgroups::getVertShaderForStage(caseDef.shaderStage));
+                               << glu::VertexSource(subgroups::getVertShaderForStage(caseDef.shaderStage)) << vk::ShaderBuildOptions(vk::SPIRV_VERSION_1_3, 0u);
 
                programCollection.glslSources.add("tesc")
                                << glu::TessellationControlSource("#version 450\nlayout(vertices=1) out;\nvoid main (void) { for(uint i = 0; i < 4; i++) { gl_TessLevelOuter[i] = 1.0f; } }\n");

diff --git a/external/vulkancts/modules/vulkan/subgroups/vktSubgroupsBasicTests.cpp b/external/vulkancts/modules/vulkan/subgroups/vktSubgroupsBasicTests.cpp
index bc93a46..4fbda76 100644 (file)
--- a/external/vulkancts/modules/vulkan/subgroups/vktSubgroupsBasicTests.cpp
+++ b/external/vulkancts/modules/vulkan/subgroups/vktSubgroupsBasicTests.cpp
@@ -386,11 +386,11 @@ void initFrameBufferPrograms(SourceCollections& programCollection, CaseDefinitio
                        <<"{\n"
                        << "    out_color = in_color;\n"
                        << "}\n";
-               programCollection.glslSources.add("fragment") << glu::FragmentSource(fragmentSrc.str());
+               programCollection.glslSources.add("fragment") << glu::FragmentSource(fragmentSrc.str()) << vk::ShaderBuildOptions(vk::SPIRV_VERSION_1_3, 0u);
        }
        else if (VK_SHADER_STAGE_FRAGMENT_BIT == caseDef.shaderStage)
        {
-               programCollection.glslSources.add("vert") << glu::VertexSource(subgroups::getVertShaderForStage(caseDef.shaderStage));
+               programCollection.glslSources.add("vert") << glu::VertexSource(subgroups::getVertShaderForStage(caseDef.shaderStage)) << vk::ShaderBuildOptions(vk::SPIRV_VERSION_1_3, 0u);
        }
 
        if (OPTYPE_ELECT == caseDef.opType)
@@ -417,7 +417,7 @@ void initFrameBufferPrograms(SourceCollections& programCollection, CaseDefinitio
                                << "  gl_Position = in_position;\n"
                                << "}\n";
                        programCollection.glslSources.add("vert")
-                                       << glu::VertexSource(vertexSrc.str());
+                                       << glu::VertexSource(vertexSrc.str()) << vk::ShaderBuildOptions(vk::SPIRV_VERSION_1_3, 0u);
                }
                else
                {
@@ -498,7 +498,7 @@ void initFrameBufferPrograms(SourceCollections& programCollection, CaseDefinitio
                                << "  out_color.a = float(tempResult2);\n"
                                << "}\n";
 
-                       programCollection.glslSources.add("fragment") << glu::FragmentSource(fragmentSrc.str());
+                       programCollection.glslSources.add("fragment") << glu::FragmentSource(fragmentSrc.str()) << vk::ShaderBuildOptions(vk::SPIRV_VERSION_1_3, 0u);
                }
                else if (VK_SHADER_STAGE_VERTEX_BIT == caseDef.shaderStage)
                {
@@ -537,7 +537,7 @@ void initFrameBufferPrograms(SourceCollections& programCollection, CaseDefinitio
                                << "  gl_Position = in_position;\n"
                                << "}\n";
 
-                       programCollection.glslSources.add("vert") << glu::VertexSource(vertexSrc.str());
+                       programCollection.glslSources.add("vert") << glu::VertexSource(vertexSrc.str()) << vk::ShaderBuildOptions(vk::SPIRV_VERSION_1_3, 0u);
                }
                else
                {
@@ -585,7 +585,7 @@ void initPrograms(SourceCollections& programCollection, CaseDefinition caseDef)
                else if (VK_SHADER_STAGE_FRAGMENT_BIT == caseDef.shaderStage)
                {
                        programCollection.glslSources.add("vert")
-                                       << glu::VertexSource(subgroups::getVertShaderForStage(caseDef.shaderStage));
+                                       << glu::VertexSource(subgroups::getVertShaderForStage(caseDef.shaderStage)) << vk::ShaderBuildOptions(vk::SPIRV_VERSION_1_3, 0u);
 
                        std::ostringstream frag;
 
@@ -647,7 +647,7 @@ void initPrograms(SourceCollections& programCollection, CaseDefinition caseDef)
                else if (VK_SHADER_STAGE_GEOMETRY_BIT == caseDef.shaderStage)
                {
                        programCollection.glslSources.add("vert")
-                                       << glu::VertexSource(subgroups::getVertShaderForStage(caseDef.shaderStage));
+                                       << glu::VertexSource(subgroups::getVertShaderForStage(caseDef.shaderStage)) << vk::ShaderBuildOptions(vk::SPIRV_VERSION_1_3, 0u);
 
                        std::ostringstream src;
 
@@ -683,7 +683,7 @@ void initPrograms(SourceCollections& programCollection, CaseDefinition caseDef)
                else if (VK_SHADER_STAGE_TESSELLATION_CONTROL_BIT == caseDef.shaderStage)
                {
                        programCollection.glslSources.add("vert")
-                                       << glu::VertexSource(subgroups::getVertShaderForStage(caseDef.shaderStage));
+                                       << glu::VertexSource(subgroups::getVertShaderForStage(caseDef.shaderStage)) << vk::ShaderBuildOptions(vk::SPIRV_VERSION_1_3, 0u);
 
                        programCollection.glslSources.add("tese")
                                        << glu::TessellationEvaluationSource("#version 450\nlayout(isolines) in;\nvoid main (void) {}\n");
@@ -721,7 +721,7 @@ void initPrograms(SourceCollections& programCollection, CaseDefinition caseDef)
                else if (VK_SHADER_STAGE_TESSELLATION_EVALUATION_BIT == caseDef.shaderStage)
                {
                        programCollection.glslSources.add("vert")
-                                       << glu::VertexSource(subgroups::getVertShaderForStage(caseDef.shaderStage));
+                                       << glu::VertexSource(subgroups::getVertShaderForStage(caseDef.shaderStage)) << vk::ShaderBuildOptions(vk::SPIRV_VERSION_1_3, 0u);
 
                        programCollection.glslSources.add("tesc")
                                        << glu::TessellationControlSource("#version 450\nlayout(vertices=1) out;\nvoid main (void) { for(uint i = 0; i < 4; i++) { gl_TessLevelOuter[i] = 1.0f; } }\n");
@@ -841,7 +841,7 @@ void initPrograms(SourceCollections& programCollection, CaseDefinition caseDef)
                else if (VK_SHADER_STAGE_FRAGMENT_BIT == caseDef.shaderStage)
                {
                        programCollection.glslSources.add("vert")
-                                       << glu::VertexSource(subgroups::getVertShaderForStage(caseDef.shaderStage));
+                                       << glu::VertexSource(subgroups::getVertShaderForStage(caseDef.shaderStage)) << vk::ShaderBuildOptions(vk::SPIRV_VERSION_1_3, 0u);
 
                        std::ostringstream frag;
 
@@ -924,7 +924,7 @@ void initPrograms(SourceCollections& programCollection, CaseDefinition caseDef)
                else if (VK_SHADER_STAGE_GEOMETRY_BIT == caseDef.shaderStage)
                {
                        programCollection.glslSources.add("vert")
-                                       << glu::VertexSource(subgroups::getVertShaderForStage(caseDef.shaderStage));
+                                       << glu::VertexSource(subgroups::getVertShaderForStage(caseDef.shaderStage)) << vk::ShaderBuildOptions(vk::SPIRV_VERSION_1_3, 0u);
 
                        std::ostringstream src;
 
@@ -970,7 +970,7 @@ void initPrograms(SourceCollections& programCollection, CaseDefinition caseDef)
                else if (VK_SHADER_STAGE_TESSELLATION_CONTROL_BIT == caseDef.shaderStage)
                {
                        programCollection.glslSources.add("vert")
-                                       << glu::VertexSource(subgroups::getVertShaderForStage(caseDef.shaderStage));
+                                       << glu::VertexSource(subgroups::getVertShaderForStage(caseDef.shaderStage)) << vk::ShaderBuildOptions(vk::SPIRV_VERSION_1_3, 0u);
 
                        programCollection.glslSources.add("tese")
                                        << glu::TessellationEvaluationSource("#version 450\nlayout(isolines) in;\nvoid main (void) {}\n");
@@ -1018,7 +1018,7 @@ void initPrograms(SourceCollections& programCollection, CaseDefinition caseDef)
                else if (VK_SHADER_STAGE_TESSELLATION_EVALUATION_BIT == caseDef.shaderStage)
                {
                        programCollection.glslSources.add("vert")
-                                       << glu::VertexSource(subgroups::getVertShaderForStage(caseDef.shaderStage));
+                                       << glu::VertexSource(subgroups::getVertShaderForStage(caseDef.shaderStage)) << vk::ShaderBuildOptions(vk::SPIRV_VERSION_1_3, 0u);
 
                        programCollection.glslSources.add("tesc")
                                        << glu::TessellationControlSource("#version 450\nlayout(vertices=1) out;\nvoid main (void) { for(uint i = 0; i < 4; i++) { gl_TessLevelOuter[i] = 1.0f; } }\n");

diff --git a/external/vulkancts/modules/vulkan/subgroups/vktSubgroupsBuiltinMaskVarTests.cpp b/external/vulkancts/modules/vulkan/subgroups/vktSubgroupsBuiltinMaskVarTests.cpp
index adec91e..bec6b2d 100644 (file)
--- a/external/vulkancts/modules/vulkan/subgroups/vktSubgroupsBuiltinMaskVarTests.cpp
+++ b/external/vulkancts/modules/vulkan/subgroups/vktSubgroupsBuiltinMaskVarTests.cpp
@@ -208,7 +208,7 @@ void initFrameBufferPrograms(SourceCollections& programCollection, CaseDefinitio
                                        << "  out_color = float(tempResult);\n"
                                        << "  gl_Position = in_position;\n"
                                        << "}\n";
-               programCollection.glslSources.add("vert") << glu::VertexSource(vertexSrc.str());
+               programCollection.glslSources.add("vert") << glu::VertexSource(vertexSrc.str()) << vk::ShaderBuildOptions(vk::SPIRV_VERSION_1_3, 0u);
 
                fragmentSrc     << glu::getGLSLVersionDeclaration(glu::GLSL_VERSION_450)<<"\n"
                                        << "layout(location = 0) in highp float in_color;\n"
@@ -217,7 +217,7 @@ void initFrameBufferPrograms(SourceCollections& programCollection, CaseDefinitio
                                        <<"{\n"
                                        << "    out_color = uint(in_color);\n"
                                        << "}\n";
-               programCollection.glslSources.add("fragment") << glu::FragmentSource(fragmentSrc.str());
+               programCollection.glslSources.add("fragment") << glu::FragmentSource(fragmentSrc.str()) << vk::ShaderBuildOptions(vk::SPIRV_VERSION_1_3, 0u);
        }
        else
        {
@@ -259,7 +259,7 @@ void initPrograms(SourceCollections& programCollection, CaseDefinition caseDef)
        else if (VK_SHADER_STAGE_FRAGMENT_BIT == caseDef.shaderStage)
        {
                programCollection.glslSources.add("vert")
-                               << glu::VertexSource(subgroups::getVertShaderForStage(caseDef.shaderStage));
+                               << glu::VertexSource(subgroups::getVertShaderForStage(caseDef.shaderStage)) << vk::ShaderBuildOptions(vk::SPIRV_VERSION_1_3, 0u);
 
                std::ostringstream frag;
 
@@ -298,7 +298,7 @@ void initPrograms(SourceCollections& programCollection, CaseDefinition caseDef)
        else if (VK_SHADER_STAGE_GEOMETRY_BIT == caseDef.shaderStage)
        {
                programCollection.glslSources.add("vert")
-                               << glu::VertexSource(subgroups::getVertShaderForStage(caseDef.shaderStage));
+                               << glu::VertexSource(subgroups::getVertShaderForStage(caseDef.shaderStage)) << vk::ShaderBuildOptions(vk::SPIRV_VERSION_1_3, 0u);
 
                std::ostringstream src;
 
@@ -323,7 +323,7 @@ void initPrograms(SourceCollections& programCollection, CaseDefinition caseDef)
        else if (VK_SHADER_STAGE_TESSELLATION_CONTROL_BIT == caseDef.shaderStage)
        {
                programCollection.glslSources.add("vert")
-                               << glu::VertexSource(subgroups::getVertShaderForStage(caseDef.shaderStage));
+                               << glu::VertexSource(subgroups::getVertShaderForStage(caseDef.shaderStage)) << vk::ShaderBuildOptions(vk::SPIRV_VERSION_1_3, 0u);
 
                programCollection.glslSources.add("tese")
                                << glu::TessellationEvaluationSource("#version 450\nlayout(isolines) in;\nvoid main (void) {}\n");
@@ -350,7 +350,7 @@ void initPrograms(SourceCollections& programCollection, CaseDefinition caseDef)
        else if (VK_SHADER_STAGE_TESSELLATION_EVALUATION_BIT == caseDef.shaderStage)
        {
                programCollection.glslSources.add("vert")
-                               << glu::VertexSource(subgroups::getVertShaderForStage(caseDef.shaderStage));
+                               << glu::VertexSource(subgroups::getVertShaderForStage(caseDef.shaderStage)) << vk::ShaderBuildOptions(vk::SPIRV_VERSION_1_3, 0u);
 
                programCollection.glslSources.add("tesc")
                                << glu::TessellationControlSource("#version 450\nlayout(vertices=1) out;\nvoid main (void) { for(uint i = 0; i < 4; i++) { gl_TessLevelOuter[i] = 1.0f; } }\n");

diff --git a/external/vulkancts/modules/vulkan/subgroups/vktSubgroupsBuiltinVarTests.cpp b/external/vulkancts/modules/vulkan/subgroups/vktSubgroupsBuiltinVarTests.cpp
index 1608724..e3a2481 100644 (file)
--- a/external/vulkancts/modules/vulkan/subgroups/vktSubgroupsBuiltinVarTests.cpp
+++ b/external/vulkancts/modules/vulkan/subgroups/vktSubgroupsBuiltinVarTests.cpp
@@ -411,7 +411,7 @@ void initFrameBufferPrograms(SourceCollections& programCollection, CaseDefinitio
                        << "  gl_Position = in_position;\n"
                        << "}\n";
 
-               programCollection.glslSources.add("vert") << glu::VertexSource(src.str());
+               programCollection.glslSources.add("vert") << glu::VertexSource(src.str()) << vk::ShaderBuildOptions(vk::SPIRV_VERSION_1_3, 0u);
 
                std::ostringstream source;
                source  << glu::getGLSLVersionDeclaration(glu::GLSL_VERSION_450)<<"\n"
@@ -421,7 +421,7 @@ void initFrameBufferPrograms(SourceCollections& programCollection, CaseDefinitio
                                <<"{\n"
                                << "    out_color = uvec4(in_color);\n"
                                << "}\n";
-               programCollection.glslSources.add("fragment") << glu::FragmentSource(source.str());
+               programCollection.glslSources.add("fragment") << glu::FragmentSource(source.str()) << vk::ShaderBuildOptions(vk::SPIRV_VERSION_1_3, 0u);
        }
        else
        {
@@ -459,7 +459,7 @@ void initPrograms(SourceCollections& programCollection, CaseDefinition caseDef)
        else if (VK_SHADER_STAGE_FRAGMENT_BIT == caseDef.shaderStage)
        {
                programCollection.glslSources.add("vert")
-                               << glu::VertexSource(subgroups::getVertShaderForStage(caseDef.shaderStage));
+                               << glu::VertexSource(subgroups::getVertShaderForStage(caseDef.shaderStage)) << vk::ShaderBuildOptions(vk::SPIRV_VERSION_1_3, 0u);
 
                std::ostringstream frag;
 
@@ -496,7 +496,7 @@ void initPrograms(SourceCollections& programCollection, CaseDefinition caseDef)
        else if (VK_SHADER_STAGE_GEOMETRY_BIT == caseDef.shaderStage)
        {
                programCollection.glslSources.add("vert")
-                               << glu::VertexSource(subgroups::getVertShaderForStage(caseDef.shaderStage));
+                               << glu::VertexSource(subgroups::getVertShaderForStage(caseDef.shaderStage)) << vk::ShaderBuildOptions(vk::SPIRV_VERSION_1_3, 0u);
 
                std::ostringstream src;
 
@@ -520,7 +520,7 @@ void initPrograms(SourceCollections& programCollection, CaseDefinition caseDef)
        else if (VK_SHADER_STAGE_TESSELLATION_CONTROL_BIT == caseDef.shaderStage)
        {
                programCollection.glslSources.add("vert")
-                               << glu::VertexSource(subgroups::getVertShaderForStage(caseDef.shaderStage));
+                               << glu::VertexSource(subgroups::getVertShaderForStage(caseDef.shaderStage)) << vk::ShaderBuildOptions(vk::SPIRV_VERSION_1_3, 0u);
 
                programCollection.glslSources.add("tese")
                                << glu::TessellationEvaluationSource("#version 450\nlayout(isolines) in;\nvoid main (void) {}\n");

diff --git a/external/vulkancts/modules/vulkan/subgroups/vktSubgroupsClusteredTests.cpp b/external/vulkancts/modules/vulkan/subgroups/vktSubgroupsClusteredTests.cpp
index 72bb5c6..37f37af 100644 (file)
--- a/external/vulkancts/modules/vulkan/subgroups/vktSubgroupsClusteredTests.cpp
+++ b/external/vulkancts/modules/vulkan/subgroups/vktSubgroupsClusteredTests.cpp
@@ -446,7 +446,7 @@ void initFrameBufferPrograms (SourceCollections& programCollection, CaseDefiniti
                        << "  gl_Position = in_position;\n"
                        << "}\n";
 
-               programCollection.glslSources.add("vert") << glu::VertexSource(src.str());
+               programCollection.glslSources.add("vert") << glu::VertexSource(src.str()) << vk::ShaderBuildOptions(vk::SPIRV_VERSION_1_3, 0u);
 
                fragmentSrc << glu::getGLSLVersionDeclaration(glu::GLSL_VERSION_450)<<"\n"
                        << "layout(location = 0) in float in_color;\n"
@@ -455,7 +455,7 @@ void initFrameBufferPrograms (SourceCollections& programCollection, CaseDefiniti
                        <<"{\n"
                        << "    out_color = uint(in_color);\n"
                        << "}\n";
-               programCollection.glslSources.add("fragment") << glu::FragmentSource(fragmentSrc.str());
+               programCollection.glslSources.add("fragment") << glu::FragmentSource(fragmentSrc.str()) << vk::ShaderBuildOptions(vk::SPIRV_VERSION_1_3, 0u);
        }
        else
        {
@@ -535,7 +535,7 @@ void initPrograms(SourceCollections& programCollection, CaseDefinition caseDef)
        else if (VK_SHADER_STAGE_FRAGMENT_BIT == caseDef.shaderStage)
        {
                programCollection.glslSources.add("vert")
-                               << glu::VertexSource(subgroups::getVertShaderForStage(caseDef.shaderStage));
+                               << glu::VertexSource(subgroups::getVertShaderForStage(caseDef.shaderStage)) << vk::ShaderBuildOptions(vk::SPIRV_VERSION_1_3, 0u);
 
                std::ostringstream frag;
 
@@ -586,7 +586,7 @@ void initPrograms(SourceCollections& programCollection, CaseDefinition caseDef)
        else if (VK_SHADER_STAGE_GEOMETRY_BIT == caseDef.shaderStage)
        {
                programCollection.glslSources.add("vert")
-                               << glu::VertexSource(subgroups::getVertShaderForStage(caseDef.shaderStage));
+                               << glu::VertexSource(subgroups::getVertShaderForStage(caseDef.shaderStage)) << vk::ShaderBuildOptions(vk::SPIRV_VERSION_1_3, 0u);
 
                std::ostringstream src;
 
@@ -617,7 +617,7 @@ void initPrograms(SourceCollections& programCollection, CaseDefinition caseDef)
        else if (VK_SHADER_STAGE_TESSELLATION_CONTROL_BIT == caseDef.shaderStage)
        {
                programCollection.glslSources.add("vert")
-                               << glu::VertexSource(subgroups::getVertShaderForStage(caseDef.shaderStage));
+                               << glu::VertexSource(subgroups::getVertShaderForStage(caseDef.shaderStage)) << vk::ShaderBuildOptions(vk::SPIRV_VERSION_1_3, 0u);
 
                programCollection.glslSources.add("tese")
                                << glu::TessellationEvaluationSource("#version 450\nlayout(isolines) in;\nvoid main (void) {}\n");
@@ -650,7 +650,7 @@ void initPrograms(SourceCollections& programCollection, CaseDefinition caseDef)
        else if (VK_SHADER_STAGE_TESSELLATION_EVALUATION_BIT == caseDef.shaderStage)
        {
                programCollection.glslSources.add("vert")
-                               << glu::VertexSource(subgroups::getVertShaderForStage(caseDef.shaderStage));
+                               << glu::VertexSource(subgroups::getVertShaderForStage(caseDef.shaderStage)) << vk::ShaderBuildOptions(vk::SPIRV_VERSION_1_3, 0u);
 
                programCollection.glslSources.add("tesc")
                                << glu::TessellationControlSource("#version 450\nlayout(vertices=1) out;\nvoid main (void) { for(uint i = 0; i < 4; i++) { gl_TessLevelOuter[i] = 1.0f; } }\n");

diff --git a/external/vulkancts/modules/vulkan/subgroups/vktSubgroupsQuadTests.cpp b/external/vulkancts/modules/vulkan/subgroups/vktSubgroupsQuadTests.cpp
index 9e1bbd0..2df51cc 100644 (file)
--- a/external/vulkancts/modules/vulkan/subgroups/vktSubgroupsQuadTests.cpp
+++ b/external/vulkancts/modules/vulkan/subgroups/vktSubgroupsQuadTests.cpp
@@ -214,7 +214,7 @@ void initFrameBufferPrograms (SourceCollections& programCollection, CaseDefiniti
                        << "  gl_Position = in_position;\n"
                        << "}\n";
 
-               programCollection.glslSources.add("vert") << glu::VertexSource(src.str());
+               programCollection.glslSources.add("vert") << glu::VertexSource(src.str()) << vk::ShaderBuildOptions(vk::SPIRV_VERSION_1_3, 0u);
 
                fragmentSrc << glu::getGLSLVersionDeclaration(glu::GLSL_VERSION_450)<<"\n"
                        << "layout(location = 0) in float result;\n"
@@ -224,7 +224,7 @@ void initFrameBufferPrograms (SourceCollections& programCollection, CaseDefiniti
                        << "    out_color = uint(result);\n"
                        << "}\n";
 
-               programCollection.glslSources.add("fragment") << glu::FragmentSource(fragmentSrc.str());
+               programCollection.glslSources.add("fragment") << glu::FragmentSource(fragmentSrc.str()) << vk::ShaderBuildOptions(vk::SPIRV_VERSION_1_3, 0u);
        }
        else
        {
@@ -297,7 +297,7 @@ void initPrograms(SourceCollections& programCollection, CaseDefinition caseDef)
        else if (VK_SHADER_STAGE_FRAGMENT_BIT == caseDef.shaderStage)
        {
                programCollection.glslSources.add("vert")
-                               << glu::VertexSource(subgroups::getVertShaderForStage(caseDef.shaderStage));
+                               << glu::VertexSource(subgroups::getVertShaderForStage(caseDef.shaderStage)) << vk::ShaderBuildOptions(vk::SPIRV_VERSION_1_3, 0u);
 
                std::ostringstream frag;
 
@@ -391,7 +391,7 @@ void initPrograms(SourceCollections& programCollection, CaseDefinition caseDef)
        else if (VK_SHADER_STAGE_GEOMETRY_BIT == caseDef.shaderStage)
        {
                programCollection.glslSources.add("vert")
-                               << glu::VertexSource(subgroups::getVertShaderForStage(caseDef.shaderStage));
+                               << glu::VertexSource(subgroups::getVertShaderForStage(caseDef.shaderStage)) << vk::ShaderBuildOptions(vk::SPIRV_VERSION_1_3, 0u);
 
                std::ostringstream src;
 
@@ -443,7 +443,7 @@ void initPrograms(SourceCollections& programCollection, CaseDefinition caseDef)
        else if (VK_SHADER_STAGE_TESSELLATION_CONTROL_BIT == caseDef.shaderStage)
        {
                programCollection.glslSources.add("vert")
-                               << glu::VertexSource(subgroups::getVertShaderForStage(caseDef.shaderStage));
+                               << glu::VertexSource(subgroups::getVertShaderForStage(caseDef.shaderStage)) << vk::ShaderBuildOptions(vk::SPIRV_VERSION_1_3, 0u);
 
                programCollection.glslSources.add("tese")
                                << glu::TessellationEvaluationSource("#version 450\nlayout(isolines) in;\nvoid main (void) {}\n");
@@ -497,7 +497,7 @@ void initPrograms(SourceCollections& programCollection, CaseDefinition caseDef)
        else if (VK_SHADER_STAGE_TESSELLATION_EVALUATION_BIT == caseDef.shaderStage)
        {
                programCollection.glslSources.add("vert")
-                               << glu::VertexSource(subgroups::getVertShaderForStage(caseDef.shaderStage));
+                               << glu::VertexSource(subgroups::getVertShaderForStage(caseDef.shaderStage)) << vk::ShaderBuildOptions(vk::SPIRV_VERSION_1_3, 0u);
 
                programCollection.glslSources.add("tesc")
                                << glu::TessellationControlSource("#version 450\nlayout(vertices=1) out;\nvoid main (void) { for(uint i = 0; i < 4; i++) { gl_TessLevelOuter[i] = 1.0f; } }\n");

diff --git a/external/vulkancts/modules/vulkan/subgroups/vktSubgroupsShapeTests.cpp b/external/vulkancts/modules/vulkan/subgroups/vktSubgroupsShapeTests.cpp
index afbbd99..ae14014 100644 (file)
--- a/external/vulkancts/modules/vulkan/subgroups/vktSubgroupsShapeTests.cpp
+++ b/external/vulkancts/modules/vulkan/subgroups/vktSubgroupsShapeTests.cpp
@@ -231,7 +231,7 @@ void initFrameBufferPrograms (SourceCollections& programCollection, CaseDefiniti
                        << "  gl_Position = in_position;\n"
                        << "}\n";
 
-               programCollection.glslSources.add("vert") << glu::VertexSource(src.str());
+               programCollection.glslSources.add("vert") << glu::VertexSource(src.str()) << vk::ShaderBuildOptions(vk::SPIRV_VERSION_1_3, 0u);
 
                fragmentSrc << glu::getGLSLVersionDeclaration(glu::GLSL_VERSION_450)<<"\n"
                        << "layout(location = 0) in float result;\n"
@@ -241,7 +241,7 @@ void initFrameBufferPrograms (SourceCollections& programCollection, CaseDefiniti
                        << "    out_color = uint(result);\n"
                        << "}\n";
 
-               programCollection.glslSources.add("fragment") << glu::FragmentSource(fragmentSrc.str());
+               programCollection.glslSources.add("fragment") << glu::FragmentSource(fragmentSrc.str()) << vk::ShaderBuildOptions(vk::SPIRV_VERSION_1_3, 0u);
        }
        else
        {
@@ -339,7 +339,7 @@ void initPrograms(SourceCollections& programCollection, CaseDefinition caseDef)
        else if (VK_SHADER_STAGE_FRAGMENT_BIT == caseDef.shaderStage)
        {
                programCollection.glslSources.add("vert")
-                               << glu::VertexSource(subgroups::getVertShaderForStage(caseDef.shaderStage));
+                               << glu::VertexSource(subgroups::getVertShaderForStage(caseDef.shaderStage)) << vk::ShaderBuildOptions(vk::SPIRV_VERSION_1_3, 0u);
 
                std::ostringstream frag;
 
@@ -378,7 +378,7 @@ void initPrograms(SourceCollections& programCollection, CaseDefinition caseDef)
        else if (VK_SHADER_STAGE_GEOMETRY_BIT == caseDef.shaderStage)
        {
                programCollection.glslSources.add("vert")
-                               << glu::VertexSource(subgroups::getVertShaderForStage(caseDef.shaderStage));
+                               << glu::VertexSource(subgroups::getVertShaderForStage(caseDef.shaderStage)) << vk::ShaderBuildOptions(vk::SPIRV_VERSION_1_3, 0u);
 
                std::ostringstream src;
 
@@ -403,7 +403,7 @@ void initPrograms(SourceCollections& programCollection, CaseDefinition caseDef)
        else if (VK_SHADER_STAGE_TESSELLATION_CONTROL_BIT == caseDef.shaderStage)
        {
                programCollection.glslSources.add("vert")
-                               << glu::VertexSource(subgroups::getVertShaderForStage(caseDef.shaderStage));
+                               << glu::VertexSource(subgroups::getVertShaderForStage(caseDef.shaderStage)) << vk::ShaderBuildOptions(vk::SPIRV_VERSION_1_3, 0u);
 
                programCollection.glslSources.add("tese")
                                << glu::TessellationEvaluationSource("#version 450\nlayout(isolines) in;\nvoid main (void) {}\n");
@@ -430,7 +430,7 @@ void initPrograms(SourceCollections& programCollection, CaseDefinition caseDef)
        else if (VK_SHADER_STAGE_TESSELLATION_EVALUATION_BIT == caseDef.shaderStage)
        {
                programCollection.glslSources.add("vert")
-                               << glu::VertexSource(subgroups::getVertShaderForStage(caseDef.shaderStage));
+                               << glu::VertexSource(subgroups::getVertShaderForStage(caseDef.shaderStage)) << vk::ShaderBuildOptions(vk::SPIRV_VERSION_1_3, 0u);
 
                programCollection.glslSources.add("tesc")
                                << glu::TessellationControlSource("#version 450\nlayout(vertices=1) out;\nvoid main (void) { for(uint i = 0; i < 4; i++) { gl_TessLevelOuter[i] = 1.0f; } }\n");

diff --git a/external/vulkancts/modules/vulkan/subgroups/vktSubgroupsShuffleTests.cpp b/external/vulkancts/modules/vulkan/subgroups/vktSubgroupsShuffleTests.cpp
index 37ab400..119a7d9 100644 (file)
--- a/external/vulkancts/modules/vulkan/subgroups/vktSubgroupsShuffleTests.cpp
+++ b/external/vulkancts/modules/vulkan/subgroups/vktSubgroupsShuffleTests.cpp
@@ -216,7 +216,7 @@ void initFrameBufferPrograms (SourceCollections& programCollection, CaseDefiniti
                        << "  gl_Position = in_position;\n"
                        << "}\n";
 
-               programCollection.glslSources.add("vert") << glu::VertexSource(src.str());
+               programCollection.glslSources.add("vert") << glu::VertexSource(src.str()) << vk::ShaderBuildOptions(vk::SPIRV_VERSION_1_3, 0u);
 
                fragmentSrc << glu::getGLSLVersionDeclaration(glu::GLSL_VERSION_450)<<"\n"
                        << "layout(location = 0) in float result;\n"
@@ -225,7 +225,7 @@ void initFrameBufferPrograms (SourceCollections& programCollection, CaseDefiniti
                        <<"{\n"
                        << "    out_color = uint(result);\n"
                        << "}\n";
-               programCollection.glslSources.add("fragment") << glu::FragmentSource(fragmentSrc.str());
+               programCollection.glslSources.add("fragment") << glu::FragmentSource(fragmentSrc.str()) << vk::ShaderBuildOptions(vk::SPIRV_VERSION_1_3, 0u);
        }
        else
        {
@@ -300,7 +300,7 @@ void initPrograms(SourceCollections& programCollection, CaseDefinition caseDef)
        else if (VK_SHADER_STAGE_FRAGMENT_BIT == caseDef.shaderStage)
        {
                programCollection.glslSources.add("vert")
-                               << glu::VertexSource(subgroups::getVertShaderForStage(caseDef.shaderStage));
+                               << glu::VertexSource(subgroups::getVertShaderForStage(caseDef.shaderStage)) << vk::ShaderBuildOptions(vk::SPIRV_VERSION_1_3, 0u);
 
                std::ostringstream frag;
 
@@ -399,7 +399,7 @@ void initPrograms(SourceCollections& programCollection, CaseDefinition caseDef)
        else if (VK_SHADER_STAGE_GEOMETRY_BIT == caseDef.shaderStage)
        {
                programCollection.glslSources.add("vert")
-                               << glu::VertexSource(subgroups::getVertShaderForStage(caseDef.shaderStage));
+                               << glu::VertexSource(subgroups::getVertShaderForStage(caseDef.shaderStage)) << vk::ShaderBuildOptions(vk::SPIRV_VERSION_1_3, 0u);
 
                std::ostringstream src;
 
@@ -454,7 +454,7 @@ void initPrograms(SourceCollections& programCollection, CaseDefinition caseDef)
        else if (VK_SHADER_STAGE_TESSELLATION_CONTROL_BIT == caseDef.shaderStage)
        {
                programCollection.glslSources.add("vert")
-                               << glu::VertexSource(subgroups::getVertShaderForStage(caseDef.shaderStage));
+                               << glu::VertexSource(subgroups::getVertShaderForStage(caseDef.shaderStage)) << vk::ShaderBuildOptions(vk::SPIRV_VERSION_1_3, 0u);
 
                programCollection.glslSources.add("tese")
                                << glu::TessellationEvaluationSource("#version 450\nlayout(isolines) in;\nvoid main (void) {}\n");
@@ -511,7 +511,7 @@ void initPrograms(SourceCollections& programCollection, CaseDefinition caseDef)
        else if (VK_SHADER_STAGE_TESSELLATION_EVALUATION_BIT == caseDef.shaderStage)
        {
                programCollection.glslSources.add("vert")
-                               << glu::VertexSource(subgroups::getVertShaderForStage(caseDef.shaderStage));
+                               << glu::VertexSource(subgroups::getVertShaderForStage(caseDef.shaderStage)) << vk::ShaderBuildOptions(vk::SPIRV_VERSION_1_3, 0u);
 
                programCollection.glslSources.add("tesc")
                                << glu::TessellationControlSource("#version 450\nlayout(vertices=1) out;\nvoid main (void) { for(uint i = 0; i < 4; i++) { gl_TessLevelOuter[i] = 1.0f; } }\n");

diff --git a/external/vulkancts/modules/vulkan/subgroups/vktSubgroupsVoteTests.cpp b/external/vulkancts/modules/vulkan/subgroups/vktSubgroupsVoteTests.cpp
index f0f5732..baa5348 100644 (file)
--- a/external/vulkancts/modules/vulkan/subgroups/vktSubgroupsVoteTests.cpp
+++ b/external/vulkancts/modules/vulkan/subgroups/vktSubgroupsVoteTests.cpp
@@ -281,7 +281,7 @@ void initFrameBufferPrograms(SourceCollections& programCollection, CaseDefinitio
                vertexSrc << "  gl_Position = in_position;\n"
                        << "}\n";
 
-               programCollection.glslSources.add("vert") << glu::VertexSource(vertexSrc.str());
+               programCollection.glslSources.add("vert") << glu::VertexSource(vertexSrc.str()) << vk::ShaderBuildOptions(vk::SPIRV_VERSION_1_3, 0u);
 
                fragmentSrc << glu::getGLSLVersionDeclaration(glu::GLSL_VERSION_450)<<"\n"
                        << "layout(location = 0) in vec4 in_color;\n"
@@ -290,7 +290,7 @@ void initFrameBufferPrograms(SourceCollections& programCollection, CaseDefinitio
                        <<"{\n"
                        << "    out_color = in_color;\n"
                        << "}\n";
-               programCollection.glslSources.add("fragment") << glu::FragmentSource(fragmentSrc.str());
+               programCollection.glslSources.add("fragment") << glu::FragmentSource(fragmentSrc.str()) << vk::ShaderBuildOptions(vk::SPIRV_VERSION_1_3, 0u);
        }
        else
        {
@@ -360,7 +360,7 @@ void initPrograms(SourceCollections& programCollection, CaseDefinition caseDef)
        else if (VK_SHADER_STAGE_FRAGMENT_BIT == caseDef.shaderStage)
        {
                programCollection.glslSources.add("vert")
-                               << glu::VertexSource(subgroups::getVertShaderForStage(caseDef.shaderStage));
+                               << glu::VertexSource(subgroups::getVertShaderForStage(caseDef.shaderStage)) << vk::ShaderBuildOptions(vk::SPIRV_VERSION_1_3, 0u);
 
                std::ostringstream frag;
 
@@ -459,7 +459,7 @@ void initPrograms(SourceCollections& programCollection, CaseDefinition caseDef)
        else if (VK_SHADER_STAGE_GEOMETRY_BIT == caseDef.shaderStage)
        {
                programCollection.glslSources.add("vert")
-                               << glu::VertexSource(subgroups::getVertShaderForStage(caseDef.shaderStage));
+                               << glu::VertexSource(subgroups::getVertShaderForStage(caseDef.shaderStage)) << vk::ShaderBuildOptions(vk::SPIRV_VERSION_1_3, 0u);
 
                std::ostringstream src;
 
@@ -514,7 +514,7 @@ void initPrograms(SourceCollections& programCollection, CaseDefinition caseDef)
        else if (VK_SHADER_STAGE_TESSELLATION_CONTROL_BIT == caseDef.shaderStage)
        {
                programCollection.glslSources.add("vert")
-                               << glu::VertexSource(subgroups::getVertShaderForStage(caseDef.shaderStage));
+                               << glu::VertexSource(subgroups::getVertShaderForStage(caseDef.shaderStage)) << vk::ShaderBuildOptions(vk::SPIRV_VERSION_1_3, 0u);
 
                programCollection.glslSources.add("tese")
                                << glu::TessellationEvaluationSource("#version 450\nlayout(isolines) in;\nvoid main (void) {}\n");
@@ -571,7 +571,7 @@ void initPrograms(SourceCollections& programCollection, CaseDefinition caseDef)
        else if (VK_SHADER_STAGE_TESSELLATION_EVALUATION_BIT == caseDef.shaderStage)
        {
                programCollection.glslSources.add("vert")
-                               << glu::VertexSource(subgroups::getVertShaderForStage(caseDef.shaderStage));
+                               << glu::VertexSource(subgroups::getVertShaderForStage(caseDef.shaderStage)) << vk::ShaderBuildOptions(vk::SPIRV_VERSION_1_3, 0u);
 
                programCollection.glslSources.add("tesc")
                                << glu::TessellationControlSource("#version 450\nlayout(vertices=1) out;\nvoid main (void) { for(uint i = 0; i < 4; i++) { gl_TessLevelOuter[i] = 1.0f; } }\n");