Raise glsl version to 420 for compute shaders

Components: OpenGL

Affects:
KHR*.pipeline_statistics_query_tests_ARB.*
KHR*.cull_distance.*
KHR*.texture_gather.*

VK-GL-CTS public issue: 257

Change-Id: Ic777e7a821cbab9e6b71e266591352aea2fdd81d

diff --git a/external/openglcts/modules/gl/gl3cCullDistanceTests.cpp b/external/openglcts/modules/gl/gl3cCullDistanceTests.cpp
index 6673b26..8ccdb34 100644 (file)
--- a/external/openglcts/modules/gl/gl3cCullDistanceTests.cpp
+++ b/external/openglcts/modules/gl/gl3cCullDistanceTests.cpp
@@ -674,7 +674,7 @@ tcu::TestNode::IterateResult CullDistance::APICoverageTest::iterate()
                         * compilation & program linking process.
                         */
                        static const glw::GLchar* cs_body_template =
-                               "#version 150\n"
+                               "#version 420 core\n"
                                "\n"
                                "#extension GL_ARB_compute_shader          : require\n"
                                "#extension GL_ARB_cull_distance           : require\n"

diff --git a/external/openglcts/modules/gl/gl4cPipelineStatisticsQueryTests.cpp b/external/openglcts/modules/gl/gl4cPipelineStatisticsQueryTests.cpp
index 99bcc5c..c43f1d2 100644 (file)
--- a/external/openglcts/modules/gl/gl4cPipelineStatisticsQueryTests.cpp
+++ b/external/openglcts/modules/gl/gl4cPipelineStatisticsQueryTests.cpp
@@ -86,7 +86,7 @@ const char* PipelineStatisticsQueryUtilities::dummy_cs_code =
        "    atomicCounterIncrement(test_counter);\n"
        "}\n";
 const char* PipelineStatisticsQueryUtilities::dummy_cs_code_arb =
-       "#version 330\n"
+       "#version 420 core\n"
        "#extension GL_ARB_compute_shader : require\n"
        "#extension GL_ARB_shader_atomic_counters : require\n"
        "\n"

diff --git a/external/openglcts/modules/gl/gl4cTextureGatherTests.cpp b/external/openglcts/modules/gl/gl4cTextureGatherTests.cpp
index 45a32fe..4fe0ef4 100644 (file)
--- a/external/openglcts/modules/gl/gl4cTextureGatherTests.cpp
+++ b/external/openglcts/modules/gl/gl4cTextureGatherTests.cpp
@@ -942,7 +942,7 @@ public:
 
        virtual std::string ComputeShader()
        {
-               return "#version 400 core                                           \n"
+               return "#version 420 core                                           \n"
                           "#extension GL_ARB_shader_storage_buffer_object : require    \n"
                           "#extension GL_ARB_compute_shader : require            \n"
                           "#extension GL_ARB_texture_cube_map_array : enable     \n"