Use version 310 es in ShaderRenderCase based tests.

diff --git a/external/vulkancts/modules/vulkan/shaderrender/vktShaderRenderDiscardTests.cpp b/external/vulkancts/modules/vulkan/shaderrender/vktShaderRenderDiscardTests.cpp
index 30e382f07b504cf00b57b18b0510255711510e3a..fb983ab8395f3b2d5e85dda6cbf6d7bb76b938d9 100644 (file)
--- a/external/vulkancts/modules/vulkan/shaderrender/vktShaderRenderDiscardTests.cpp
+++ b/external/vulkancts/modules/vulkan/shaderrender/vktShaderRenderDiscardTests.cpp
@@ -136,7 +136,7 @@ ShaderDiscardCase::ShaderDiscardCase (tcu::TestContext&             testCtx,
 {
        m_fragShaderSource      = shaderSource;
        m_vertShaderSource      =
-               "#version 140\n"
+               "#version 310 es\n"
                "#extension GL_ARB_separate_shader_objects : enable\n"
                "#extension GL_ARB_shading_language_420pack : enable\n"
                "layout(location=0) in  highp   vec4 a_position;\n"
@@ -204,7 +204,7 @@ static ShaderEvalFunc getEvalFunc (DiscardMode mode)
 static const char* getTemplate (DiscardTemplate variant)
 {
        #define GLSL_SHADER_TEMPLATE_HEADER \
-                               "#version 140\n"        \
+                               "#version 310 es\n"     \
                                "#extension GL_ARB_separate_shader_objects : enable\n"  \
                                "#extension GL_ARB_shading_language_420pack : enable\n"  \
                                "layout(location = 0) in mediump vec4 v_color;\n"       \

diff --git a/external/vulkancts/modules/vulkan/shaderrender/vktShaderRenderIndexingTests.cpp b/external/vulkancts/modules/vulkan/shaderrender/vktShaderRenderIndexingTests.cpp
index 17e4b8cec9d4062c1cdcc55286daba47d47ce128..f2c633ad9e9b8e19ac22d17d16fc0cf679cc4f60 100644 (file)
--- a/external/vulkancts/modules/vulkan/shaderrender/vktShaderRenderIndexingTests.cpp
+++ b/external/vulkancts/modules/vulkan/shaderrender/vktShaderRenderIndexingTests.cpp
@@ -269,7 +269,7 @@ static de::MovePtr<ShaderIndexingCase> createVaryingArrayCase (tcu::TestContext&
                                                                                                                        IndexAccessType                 fragAccess)
 {
        std::ostringstream vtx;
-       vtx << "#version 140\n";
+       vtx << "#version 310 es\n";
        vtx << "#extension GL_ARB_separate_shader_objects : enable\n";
        vtx << "#extension GL_ARB_shading_language_420pack : enable\n";
        vtx << "layout(location = 0) in highp vec4 a_position;\n";
@@ -324,7 +324,7 @@ static de::MovePtr<ShaderIndexingCase> createVaryingArrayCase (tcu::TestContext&
        vtx << "}\n";
 
        std::ostringstream frag;
-       frag << "#version 140\n";
+       frag << "#version 310 es\n";
        frag << "#extension GL_ARB_separate_shader_objects : enable\n";
        frag << "#extension GL_ARB_shading_language_420pack : enable\n";
        frag << "precision mediump int;\n";
@@ -406,10 +406,10 @@ static de::MovePtr<ShaderIndexingCase> createUniformArrayCase (tcu::TestContext&
        std::ostringstream frag;
        std::ostringstream& op = isVertexCase ? vtx : frag;
 
-       vtx << "#version 140\n";
+       vtx << "#version 310 es\n";
        vtx << "#extension GL_ARB_separate_shader_objects : enable\n";
        vtx << "#extension GL_ARB_shading_language_420pack : enable\n";
-       frag << "#version 140\n";
+       frag << "#version 310 es\n";
        frag << "#extension GL_ARB_separate_shader_objects : enable\n";
        frag << "#extension GL_ARB_shading_language_420pack : enable\n";
 
@@ -527,10 +527,10 @@ static de::MovePtr<ShaderIndexingCase> createTmpArrayCase (tcu::TestContext&      con
        std::ostringstream frag;
        std::ostringstream& op = isVertexCase ? vtx : frag;
 
-       vtx << "#version 140\n";
+       vtx << "#version 310 es\n";
        vtx << "#extension GL_ARB_separate_shader_objects : enable\n";
        vtx << "#extension GL_ARB_shading_language_420pack : enable\n";
-       frag << "#version 140\n";
+       frag << "#version 310 es\n";
        frag << "#extension GL_ARB_separate_shader_objects : enable\n";
        frag << "#extension GL_ARB_shading_language_420pack : enable\n";
 
@@ -705,10 +705,10 @@ static de::MovePtr<ShaderIndexingCase> createVectorSubscriptCase (tcu::TestConte
        int                     vecLen          = getDataTypeScalarSize(varType);
        const char*     vecLenName      = getIntUniformName(vecLen);
 
-       vtx << "#version 140\n";
+       vtx << "#version 310 es\n";
        vtx << "#extension GL_ARB_separate_shader_objects : enable\n";
        vtx << "#extension GL_ARB_shading_language_420pack : enable\n";
-       frag << "#version 140\n";
+       frag << "#version 310 es\n";
        frag << "#extension GL_ARB_separate_shader_objects : enable\n";
        frag << "#extension GL_ARB_shading_language_420pack : enable\n";
 
@@ -916,10 +916,10 @@ static de::MovePtr<ShaderIndexingCase> createMatrixSubscriptCase (tcu::TestConte
        const char*     matSizeName     = getIntUniformName(numCols);
        DataType        vecType         = getDataTypeFloatVec(numRows);
 
-       vtx << "#version 140\n";
+       vtx << "#version 310 es\n";
        vtx << "#extension GL_ARB_separate_shader_objects : enable\n";
        vtx << "#extension GL_ARB_shading_language_420pack : enable\n";
-       frag << "#version 140\n";
+       frag << "#version 310 es\n";
        frag << "#extension GL_ARB_separate_shader_objects : enable\n";
        frag << "#extension GL_ARB_shading_language_420pack : enable\n";
 

diff --git a/external/vulkancts/modules/vulkan/shaderrender/vktShaderRenderLoopTests.cpp b/external/vulkancts/modules/vulkan/shaderrender/vktShaderRenderLoopTests.cpp
index 025f582e4b91dee07b746a6212b7f174cb5de611..1d331a0c66a04fd4ca237bf96bf0d05ae09e5241 100644 (file)
--- a/external/vulkancts/modules/vulkan/shaderrender/vktShaderRenderLoopTests.cpp
+++ b/external/vulkancts/modules/vulkan/shaderrender/vktShaderRenderLoopTests.cpp
@@ -319,11 +319,11 @@ static de::MovePtr<ShaderLoopCase> createGenericLoopCase (tcu::TestContext&       test
        std::ostringstream frag;
        std::ostringstream& op = isVertexCase ? vtx : frag;
 
-       vtx << "#version 140\n";
+       vtx << "#version 310 es\n";
        vtx << "#extension GL_ARB_separate_shader_objects : enable\n";
        vtx << "#extension GL_ARB_shading_language_420pack : enable\n";
 
-       frag << "#version 140\n";
+       frag << "#version 310 es\n";
        frag << "#extension GL_ARB_separate_shader_objects : enable\n";
        frag << "#extension GL_ARB_shading_language_420pack : enable\n";
 
@@ -549,11 +549,11 @@ static de::MovePtr<ShaderLoopCase> createSpecialLoopCase (tcu::TestContext&       test
        std::vector<BaseUniformType>    uniformInformations;
        deUint32                                                locationCounter = 0;
 
-       vtx << "#version 140\n";
+       vtx << "#version 310 es\n";
        vtx << "#extension GL_ARB_separate_shader_objects : enable\n";
        vtx << "#extension GL_ARB_shading_language_420pack : enable\n";
 
-       frag << "#version 140\n";
+       frag << "#version 310 es\n";
        frag << "#extension GL_ARB_separate_shader_objects : enable\n";
        frag << "#extension GL_ARB_shading_language_420pack : enable\n";
 

diff --git a/external/vulkancts/modules/vulkan/shaderrender/vktShaderRenderOperatorTests.cpp b/external/vulkancts/modules/vulkan/shaderrender/vktShaderRenderOperatorTests.cpp
index c47b6d4c5f7ec3f9ad350b54adee6e599967e484..64301998b3fa202d8b8598b272db829c344854d0 100644 (file)
--- a/external/vulkancts/modules/vulkan/shaderrender/vktShaderRenderOperatorTests.cpp
+++ b/external/vulkancts/modules/vulkan/shaderrender/vktShaderRenderOperatorTests.cpp
@@ -690,7 +690,7 @@ void ShaderOperatorCase::setupShaderData (void)
        std::ostringstream&     op                      = m_isVertexCase ? vtx : frag;
 
        std::string                     header          =
-               "#version 140\n"
+               "#version 310 es\n"
                "#extension GL_ARB_separate_shader_objects : enable\n"
                "#extension GL_ARB_shading_language_420pack : enable\n";
 

diff --git a/external/vulkancts/modules/vulkan/shaderrender/vktShaderRenderReturnTests.cpp b/external/vulkancts/modules/vulkan/shaderrender/vktShaderRenderReturnTests.cpp
index 9174e0362950ad541423d3b846e372c872e437fe..43330b96e321ba8b98b1f3165c83a2310e643ebe 100644 (file)
--- a/external/vulkancts/modules/vulkan/shaderrender/vktShaderRenderReturnTests.cpp
+++ b/external/vulkancts/modules/vulkan/shaderrender/vktShaderRenderReturnTests.cpp
@@ -100,7 +100,7 @@ ShaderReturnCase::ShaderReturnCase (tcu::TestContext&                       testCtx,
        {
                m_vertShaderSource = shaderSource;
                m_fragShaderSource =
-                       "#version 140\n"
+                       "#version 310 es\n"
                        "#extension GL_ARB_separate_shader_objects : enable\n"
                        "#extension GL_ARB_shading_language_420pack : enable\n"
                        "layout(location = 0) in mediump vec4 v_color;\n"
@@ -114,7 +114,7 @@ ShaderReturnCase::ShaderReturnCase (tcu::TestContext&                       testCtx,
        {
                m_fragShaderSource = shaderSource;
                m_vertShaderSource =
-                       "#version 140\n"
+                       "#version 310 es\n"
                        "#extension GL_ARB_separate_shader_objects : enable\n"
                        "#extension GL_ARB_shading_language_420pack : enable\n"
                        "layout(location = 0) in  highp   vec4 a_position;\n"
@@ -152,7 +152,7 @@ private:
 de::MovePtr<ShaderReturnCase> makeConditionalReturnInFuncCase (tcu::TestContext& context, const std::string& name, const std::string& description, ReturnMode returnMode, bool isVertex)
 {
        tcu::StringTemplate tmpl(
-               "#version 140\n"
+               "#version 310 es\n"
                "#extension GL_ARB_separate_shader_objects : enable\n"
                "#extension GL_ARB_shading_language_420pack : enable\n"
                "layout(location = ${COORDLOC}) in ${COORDPREC} vec4 ${COORDS};\n"
@@ -196,7 +196,7 @@ de::MovePtr<ShaderReturnCase> makeOutputWriteReturnCase (tcu::TestContext& conte
        tcu::StringTemplate tmpl(
                inFunction
                ?
-                       "#version 140\n"
+                       "#version 310 es\n"
                        "#extension GL_ARB_separate_shader_objects : enable\n"
                        "#extension GL_ARB_shading_language_420pack : enable\n"
                        "layout(location = ${COORDLOC}) in ${COORDPREC} vec4 ${COORDS};\n"
@@ -214,7 +214,7 @@ de::MovePtr<ShaderReturnCase> makeOutputWriteReturnCase (tcu::TestContext& conte
                        "    myfunc();\n"
                        "}\n"
                :
-                       "#version 140\n"
+                       "#version 310 es\n"
                        "#extension GL_ARB_separate_shader_objects : enable\n"
                        "#extension GL_ARB_shading_language_420pack : enable\n"
                        "layout(location = ${COORDLOC}) in ${COORDPREC} vec4 ${COORDS};\n"
@@ -253,7 +253,7 @@ de::MovePtr<ShaderReturnCase> makeOutputWriteReturnCase (tcu::TestContext& conte
 de::MovePtr<ShaderReturnCase> makeReturnInLoopCase (tcu::TestContext& context, const std::string& name, const std::string& description, bool isDynamicLoop, ReturnMode returnMode, bool isVertex)
 {
        tcu::StringTemplate tmpl(
-               "#version 140\n"
+               "#version 310 es\n"
                "#extension GL_ARB_separate_shader_objects : enable\n"
                "#extension GL_ARB_shading_language_420pack : enable\n"
                "layout(location = ${COORDLOC}) in ${COORDPREC} vec4 ${COORDS};\n"
@@ -349,7 +349,7 @@ ShaderReturnTests::~ShaderReturnTests (void)
 void ShaderReturnTests::init (void)
 {
        addChild(new ShaderReturnCase(m_testCtx, "single_return_vertex", "Single return statement in function", true,
-               "#version 140\n"
+               "#version 310 es\n"
                "#extension GL_ARB_separate_shader_objects : enable\n"
                "#extension GL_ARB_shading_language_420pack : enable\n"
                "layout(location = 0) in highp vec4 a_position;\n"
@@ -365,7 +365,7 @@ void ShaderReturnTests::init (void)
                "    v_color = getColor();\n"
                "}\n", evalReturnAlways, DE_NULL));
        addChild(new ShaderReturnCase(m_testCtx, "single_return_fragment", "Single return statement in function", false,
-               "#version 140\n"
+               "#version 310 es\n"
                "#extension GL_ARB_separate_shader_objects : enable\n"
                "#extension GL_ARB_shading_language_420pack : enable\n"
                "layout(location = 0) in mediump vec4 v_coords;\n"
@@ -393,7 +393,7 @@ void ShaderReturnTests::init (void)
 
        // Unconditional double return in function.
        addChild(new ShaderReturnCase(m_testCtx, "double_return_vertex", "Unconditional double return in function", true,
-               "#version 140\n"
+               "#version 310 es\n"
                "#extension GL_ARB_separate_shader_objects : enable\n"
                "#extension GL_ARB_shading_language_420pack : enable\n"
                "layout(location = 0) in highp vec4 a_position;\n"
@@ -410,7 +410,7 @@ void ShaderReturnTests::init (void)
                "    v_color = getColor();\n"
                "}\n", evalReturnAlways, DE_NULL));
        addChild(new ShaderReturnCase(m_testCtx, "double_return_fragment", "Unconditional double return in function", false,
-               "#version 140\n"
+               "#version 310 es\n"
                "#extension GL_ARB_separate_shader_objects : enable\n"
                "#extension GL_ARB_shading_language_420pack : enable\n"
                "layout(location = 0) in mediump vec4 v_coords;\n"
@@ -427,7 +427,7 @@ void ShaderReturnTests::init (void)
 
        // Last statement in main.
        addChild(new ShaderReturnCase(m_testCtx, "last_statement_in_main_vertex", "Return as a final statement in main()", true,
-               "#version 140\n"
+               "#version 310 es\n"
                "#extension GL_ARB_separate_shader_objects : enable\n"
                "#extension GL_ARB_shading_language_420pack : enable\n"
                "layout(location = 0) in highp vec4 a_position;\n"
@@ -440,7 +440,7 @@ void ShaderReturnTests::init (void)
                "    return;\n"
                "}\n", evalReturnAlways, DE_NULL));
        addChild(new ShaderReturnCase(m_testCtx, "last_statement_in_main_fragment", "Return as a final statement in main()", false,
-               "#version 140\n"
+               "#version 310 es\n"
                "#extension GL_ARB_separate_shader_objects : enable\n"
                "#extension GL_ARB_shading_language_420pack : enable\n"
                "layout(location = 0) in mediump vec4 v_coords;\n"
@@ -483,7 +483,7 @@ void ShaderReturnTests::init (void)
 
        // Unconditional return in infinite loop.
        addChild(new ShaderReturnCase(m_testCtx, "return_in_infinite_loop_vertex", "Return in infinite loop", true,
-               "#version 140\n"
+               "#version 310 es\n"
                "#extension GL_ARB_separate_shader_objects : enable\n"
                "#extension GL_ARB_shading_language_420pack : enable\n"
                "layout(location = 0) in highp vec4 a_position;\n"
@@ -503,7 +503,7 @@ void ShaderReturnTests::init (void)
                "    return;\n"
                "}\n", evalReturnAlways, new ReturnTestUniformSetup(UI_ZERO)));
        addChild(new ShaderReturnCase(m_testCtx, "return_in_infinite_loop_fragment", "Return in infinite loop", false,
-               "#version 140\n"
+               "#version 310 es\n"
                "#extension GL_ARB_separate_shader_objects : enable\n"
                "#extension GL_ARB_shading_language_420pack : enable\n"
                "layout(location = 0) in mediump vec4 v_coords;\n"

diff --git a/external/vulkancts/modules/vulkan/shaderrender/vktShaderRenderStructTests.cpp b/external/vulkancts/modules/vulkan/shaderrender/vktShaderRenderStructTests.cpp
index 9d6b5c962ccc2eb9e675b09251d29646f9957e6b..f02e576853b279f78fc3fac769c03e0a48bd871d 100644 (file)
--- a/external/vulkancts/modules/vulkan/shaderrender/vktShaderRenderStructTests.cpp
+++ b/external/vulkancts/modules/vulkan/shaderrender/vktShaderRenderStructTests.cpp
@@ -84,7 +84,7 @@ ShaderStructCase::~ShaderStructCase (void)
 static de::MovePtr<ShaderStructCase> createStructCase (tcu::TestContext& testCtx, const std::string& name, const std::string& description, bool isVertexCase, ShaderEvalFunc evalFunc, UniformSetupFunc uniformFunc, const LineStream& shaderSrc)
 {
        static std::string defaultVertSrc =
-               "#version 140\n"
+               "#version 310 es\n"
                "#extension GL_ARB_separate_shader_objects : enable\n"
                "#extension GL_ARB_shading_language_420pack : enable\n"
                "layout(location = 0) in highp vec4 a_position;\n"
@@ -96,7 +96,7 @@ static de::MovePtr<ShaderStructCase> createStructCase (tcu::TestContext& testCtx
                "       gl_Position = a_position;\n"
                "}\n";
        static std::string defaultFragSrc =
-               "#version 140\n"
+               "#version 310 es\n"
                "#extension GL_ARB_separate_shader_objects : enable\n"
                "#extension GL_ARB_shading_language_420pack : enable\n"
                "layout(location = 0) in mediump vec4 v_color;\n"
@@ -114,7 +114,7 @@ static de::MovePtr<ShaderStructCase> createStructCase (tcu::TestContext& testCtx
        if (isVertexCase)
        {
                spParams["HEADER"] =
-                       "#version 140\n"
+                       "#version 310 es\n"
                        "#extension GL_ARB_separate_shader_objects : enable\n"
                        "#extension GL_ARB_shading_language_420pack : enable\n"
                        "layout(location = 0) in highp vec4 a_position;\n"
@@ -130,7 +130,7 @@ static de::MovePtr<ShaderStructCase> createStructCase (tcu::TestContext& testCtx
        else
        {
                spParams["HEADER"]      =
-                       "#version 140\n"
+                       "#version 310 es\n"
                        "#extension GL_ARB_separate_shader_objects : enable\n"
                        "#extension GL_ARB_shading_language_420pack : enable\n"
                        "layout(location = 0) in mediump vec4 v_coords;\n"

diff --git a/external/vulkancts/modules/vulkan/shaderrender/vktShaderRenderSwitchTests.cpp b/external/vulkancts/modules/vulkan/shaderrender/vktShaderRenderSwitchTests.cpp
index eb56d424906cacfe0487bad9154c8c1ee0606225..15173753adc47415adf6c78b780dfb418179a3be 100644 (file)
--- a/external/vulkancts/modules/vulkan/shaderrender/vktShaderRenderSwitchTests.cpp
+++ b/external/vulkancts/modules/vulkan/shaderrender/vktShaderRenderSwitchTests.cpp
@@ -119,12 +119,12 @@ static de::MovePtr<ShaderSwitchCase> makeSwitchCase (tcu::TestContext& testCtx,
        std::ostringstream      frag;
        std::ostringstream&     op              = isVertex ? vtx : frag;
 
-       vtx << "#version 140\n"
+       vtx << "#version 310 es\n"
                << "#extension GL_ARB_separate_shader_objects : enable\n"
                << "#extension GL_ARB_shading_language_420pack : enable\n"
                << "layout(location = 0) in highp vec4 a_position;\n"
                << "layout(location = 1) in highp vec4 a_coords;\n\n";
-       frag    << "#version 140\n"
+       frag    << "#version 310 es\n"
                        << "#extension GL_ARB_separate_shader_objects : enable\n"
                        << "#extension GL_ARB_shading_language_420pack : enable\n"
                        << "layout(location = 0) out mediump vec4 o_color;\n";