Fixes KHR-GL30.gpu_shader5_gl.* tests failures.

According to the ARB_gpu_shader5 specification "OpenGL 3.2 and GLSL 1.50
are required." Changes: 1) used GLSL version 150 2) moved the tests to
GL 3.2 package.

Removes:

KHR-GL30.gpu_shader5_gl.* tests
KHR_GL31.gpu_shader5_gl.* tests

Components: OpenGL
VK-GL-CTS issue: 662

Change-Id: I192ea895f057f762b56710a787e5e80be0268142

diff --git a/external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.0.x/gl30-master.txt b/external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.0.x/gl30-master.txt
index d1d8fcc..90a5bbc 100644 (file)
--- a/external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.0.x/gl30-master.txt
+++ b/external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.0.x/gl30-master.txt
@@ -7,9 +7,6 @@ KHR-GL30.info.render_target
 KHR-GL30.clip_distance.coverage
 KHR-GL30.clip_distance.functional
 KHR-GL30.clip_distance.negative
-KHR-GL30.gpu_shader5_gl.implicit_conversions
-KHR-GL30.gpu_shader5_gl.function_overloading
-KHR-GL30.gpu_shader5_gl.float_encoding
 KHR-GL30.glsl_noperspective.functionaltest
 KHR-GL30.transform_feedback.api_errors_test
 KHR-GL30.transform_feedback.linking_errors_test

diff --git a/external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.0.x/gl31-master.txt b/external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.0.x/gl31-master.txt
index 09f45de..e094f5c 100644 (file)
--- a/external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.0.x/gl31-master.txt
+++ b/external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.0.x/gl31-master.txt
@@ -7,9 +7,6 @@ KHR-GL31.info.render_target
 KHR-GL31.clip_distance.coverage
 KHR-GL31.clip_distance.functional
 KHR-GL31.clip_distance.negative
-KHR-GL31.gpu_shader5_gl.implicit_conversions
-KHR-GL31.gpu_shader5_gl.function_overloading
-KHR-GL31.gpu_shader5_gl.float_encoding
 KHR-GL31.glsl_noperspective.functionaltest
 KHR-GL31.transform_feedback.api_errors_test
 KHR-GL31.transform_feedback.linking_errors_test

diff --git a/external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.0.x/gl32-master.txt b/external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.0.x/gl32-master.txt
index 6ebda09..ba24196 100644 (file)
--- a/external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.0.x/gl32-master.txt
+++ b/external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.0.x/gl32-master.txt
@@ -7,9 +7,6 @@ KHR-GL32.info.render_target
 KHR-GL32.clip_distance.coverage
 KHR-GL32.clip_distance.functional
 KHR-GL32.clip_distance.negative
-KHR-GL32.gpu_shader5_gl.implicit_conversions
-KHR-GL32.gpu_shader5_gl.function_overloading
-KHR-GL32.gpu_shader5_gl.float_encoding
 KHR-GL32.glsl_noperspective.functionaltest
 KHR-GL32.transform_feedback.api_errors_test
 KHR-GL32.transform_feedback.linking_errors_test
@@ -202,6 +199,9 @@ KHR-GL32.CommonBugs.CommonBug_PerVertexValidation
 KHR-GL32.CommonBugs.CommonBug_ReservedNames
 KHR-GL32.CommonBugs.CommonBug_SparseBuffersWithCopyOps
 KHR-GL32.texture_size_promotion.functional
+KHR-GL32.gpu_shader5_gl.implicit_conversions
+KHR-GL32.gpu_shader5_gl.function_overloading
+KHR-GL32.gpu_shader5_gl.float_encoding
 KHR-GL32.transform_feedback_overflow_query_ARB.implementation-dependent-state
 KHR-GL32.transform_feedback_overflow_query_ARB.default-context-state
 KHR-GL32.transform_feedback_overflow_query_ARB.context-state-update

diff --git a/external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.0.x/gl33-master.txt b/external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.0.x/gl33-master.txt
index 796581c..393fa2a 100644 (file)
--- a/external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.0.x/gl33-master.txt
+++ b/external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.0.x/gl33-master.txt
@@ -7,9 +7,6 @@ KHR-GL33.info.render_target
 KHR-GL33.clip_distance.coverage
 KHR-GL33.clip_distance.functional
 KHR-GL33.clip_distance.negative
-KHR-GL33.gpu_shader5_gl.implicit_conversions
-KHR-GL33.gpu_shader5_gl.function_overloading
-KHR-GL33.gpu_shader5_gl.float_encoding
 KHR-GL33.glsl_noperspective.functionaltest
 KHR-GL33.transform_feedback.api_errors_test
 KHR-GL33.transform_feedback.linking_errors_test
@@ -202,6 +199,9 @@ KHR-GL33.CommonBugs.CommonBug_PerVertexValidation
 KHR-GL33.CommonBugs.CommonBug_ReservedNames
 KHR-GL33.CommonBugs.CommonBug_SparseBuffersWithCopyOps
 KHR-GL33.texture_size_promotion.functional
+KHR-GL33.gpu_shader5_gl.implicit_conversions
+KHR-GL33.gpu_shader5_gl.function_overloading
+KHR-GL33.gpu_shader5_gl.float_encoding
 KHR-GL33.transform_feedback_overflow_query_ARB.implementation-dependent-state
 KHR-GL33.transform_feedback_overflow_query_ARB.default-context-state
 KHR-GL33.transform_feedback_overflow_query_ARB.context-state-update

diff --git a/external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.0.x/gl40-master.txt b/external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.0.x/gl40-master.txt
index cbc61ff..f312f70 100644 (file)
--- a/external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.0.x/gl40-master.txt
+++ b/external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.0.x/gl40-master.txt
@@ -7,9 +7,6 @@ KHR-GL40.info.render_target
 KHR-GL40.clip_distance.coverage
 KHR-GL40.clip_distance.functional
 KHR-GL40.clip_distance.negative
-KHR-GL40.gpu_shader5_gl.implicit_conversions
-KHR-GL40.gpu_shader5_gl.function_overloading
-KHR-GL40.gpu_shader5_gl.float_encoding
 KHR-GL40.glsl_noperspective.functionaltest
 KHR-GL40.transform_feedback.api_errors_test
 KHR-GL40.transform_feedback.linking_errors_test
@@ -202,6 +199,9 @@ KHR-GL40.CommonBugs.CommonBug_PerVertexValidation
 KHR-GL40.CommonBugs.CommonBug_ReservedNames
 KHR-GL40.CommonBugs.CommonBug_SparseBuffersWithCopyOps
 KHR-GL40.texture_size_promotion.functional
+KHR-GL40.gpu_shader5_gl.implicit_conversions
+KHR-GL40.gpu_shader5_gl.function_overloading
+KHR-GL40.gpu_shader5_gl.float_encoding
 KHR-GL40.transform_feedback_overflow_query_ARB.implementation-dependent-state
 KHR-GL40.transform_feedback_overflow_query_ARB.default-context-state
 KHR-GL40.transform_feedback_overflow_query_ARB.context-state-update

diff --git a/external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.0.x/gl41-master.txt b/external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.0.x/gl41-master.txt
index 9e499b6..9ce88d8 100644 (file)
--- a/external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.0.x/gl41-master.txt
+++ b/external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.0.x/gl41-master.txt
@@ -7,9 +7,6 @@ KHR-GL41.info.render_target
 KHR-GL41.clip_distance.coverage
 KHR-GL41.clip_distance.functional
 KHR-GL41.clip_distance.negative
-KHR-GL41.gpu_shader5_gl.implicit_conversions
-KHR-GL41.gpu_shader5_gl.function_overloading
-KHR-GL41.gpu_shader5_gl.float_encoding
 KHR-GL41.glsl_noperspective.functionaltest
 KHR-GL41.transform_feedback.api_errors_test
 KHR-GL41.transform_feedback.linking_errors_test
@@ -202,6 +199,9 @@ KHR-GL41.CommonBugs.CommonBug_PerVertexValidation
 KHR-GL41.CommonBugs.CommonBug_ReservedNames
 KHR-GL41.CommonBugs.CommonBug_SparseBuffersWithCopyOps
 KHR-GL41.texture_size_promotion.functional
+KHR-GL41.gpu_shader5_gl.implicit_conversions
+KHR-GL41.gpu_shader5_gl.function_overloading
+KHR-GL41.gpu_shader5_gl.float_encoding
 KHR-GL41.transform_feedback_overflow_query_ARB.implementation-dependent-state
 KHR-GL41.transform_feedback_overflow_query_ARB.default-context-state
 KHR-GL41.transform_feedback_overflow_query_ARB.context-state-update

diff --git a/external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.0.x/gl42-master.txt b/external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.0.x/gl42-master.txt
index 5ebf814..e96b8b8 100644 (file)
--- a/external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.0.x/gl42-master.txt
+++ b/external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.0.x/gl42-master.txt
@@ -7,9 +7,6 @@ KHR-GL42.info.render_target
 KHR-GL42.clip_distance.coverage
 KHR-GL42.clip_distance.functional
 KHR-GL42.clip_distance.negative
-KHR-GL42.gpu_shader5_gl.implicit_conversions
-KHR-GL42.gpu_shader5_gl.function_overloading
-KHR-GL42.gpu_shader5_gl.float_encoding
 KHR-GL42.glsl_noperspective.functionaltest
 KHR-GL42.transform_feedback.api_errors_test
 KHR-GL42.transform_feedback.linking_errors_test
@@ -202,6 +199,9 @@ KHR-GL42.CommonBugs.CommonBug_PerVertexValidation
 KHR-GL42.CommonBugs.CommonBug_ReservedNames
 KHR-GL42.CommonBugs.CommonBug_SparseBuffersWithCopyOps
 KHR-GL42.texture_size_promotion.functional
+KHR-GL42.gpu_shader5_gl.implicit_conversions
+KHR-GL42.gpu_shader5_gl.function_overloading
+KHR-GL42.gpu_shader5_gl.float_encoding
 KHR-GL42.transform_feedback_overflow_query_ARB.implementation-dependent-state
 KHR-GL42.transform_feedback_overflow_query_ARB.default-context-state
 KHR-GL42.transform_feedback_overflow_query_ARB.context-state-update

diff --git a/external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.0.x/gl43-master.txt b/external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.0.x/gl43-master.txt
index 2e916ee..ef9c468 100644 (file)
--- a/external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.0.x/gl43-master.txt
+++ b/external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.0.x/gl43-master.txt
@@ -7,9 +7,6 @@ KHR-GL43.info.render_target
 KHR-GL43.clip_distance.coverage
 KHR-GL43.clip_distance.functional
 KHR-GL43.clip_distance.negative
-KHR-GL43.gpu_shader5_gl.implicit_conversions
-KHR-GL43.gpu_shader5_gl.function_overloading
-KHR-GL43.gpu_shader5_gl.float_encoding
 KHR-GL43.glsl_noperspective.functionaltest
 KHR-GL43.transform_feedback.api_errors_test
 KHR-GL43.transform_feedback.linking_errors_test
@@ -202,6 +199,9 @@ KHR-GL43.CommonBugs.CommonBug_PerVertexValidation
 KHR-GL43.CommonBugs.CommonBug_ReservedNames
 KHR-GL43.CommonBugs.CommonBug_SparseBuffersWithCopyOps
 KHR-GL43.texture_size_promotion.functional
+KHR-GL43.gpu_shader5_gl.implicit_conversions
+KHR-GL43.gpu_shader5_gl.function_overloading
+KHR-GL43.gpu_shader5_gl.float_encoding
 KHR-GL43.transform_feedback_overflow_query_ARB.implementation-dependent-state
 KHR-GL43.transform_feedback_overflow_query_ARB.default-context-state
 KHR-GL43.transform_feedback_overflow_query_ARB.context-state-update

diff --git a/external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.0.x/gl44-master.txt b/external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.0.x/gl44-master.txt
index 036e398..9058da9 100644 (file)
--- a/external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.0.x/gl44-master.txt
+++ b/external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.0.x/gl44-master.txt
@@ -7,9 +7,6 @@ KHR-GL44.info.render_target
 KHR-GL44.clip_distance.coverage
 KHR-GL44.clip_distance.functional
 KHR-GL44.clip_distance.negative
-KHR-GL44.gpu_shader5_gl.implicit_conversions
-KHR-GL44.gpu_shader5_gl.function_overloading
-KHR-GL44.gpu_shader5_gl.float_encoding
 KHR-GL44.glsl_noperspective.functionaltest
 KHR-GL44.transform_feedback.api_errors_test
 KHR-GL44.transform_feedback.linking_errors_test
@@ -202,6 +199,9 @@ KHR-GL44.CommonBugs.CommonBug_PerVertexValidation
 KHR-GL44.CommonBugs.CommonBug_ReservedNames
 KHR-GL44.CommonBugs.CommonBug_SparseBuffersWithCopyOps
 KHR-GL44.texture_size_promotion.functional
+KHR-GL44.gpu_shader5_gl.implicit_conversions
+KHR-GL44.gpu_shader5_gl.function_overloading
+KHR-GL44.gpu_shader5_gl.float_encoding
 KHR-GL44.transform_feedback_overflow_query_ARB.implementation-dependent-state
 KHR-GL44.transform_feedback_overflow_query_ARB.default-context-state
 KHR-GL44.transform_feedback_overflow_query_ARB.context-state-update

diff --git a/external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.0.x/gl45-master.txt b/external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.0.x/gl45-master.txt
index 2bd3b70..a2cd0ec 100644 (file)
--- a/external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.0.x/gl45-master.txt
+++ b/external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.0.x/gl45-master.txt
@@ -7,9 +7,6 @@ KHR-GL45.info.render_target
 KHR-GL45.clip_distance.coverage
 KHR-GL45.clip_distance.functional
 KHR-GL45.clip_distance.negative
-KHR-GL45.gpu_shader5_gl.implicit_conversions
-KHR-GL45.gpu_shader5_gl.function_overloading
-KHR-GL45.gpu_shader5_gl.float_encoding
 KHR-GL45.glsl_noperspective.functionaltest
 KHR-GL45.transform_feedback.api_errors_test
 KHR-GL45.transform_feedback.linking_errors_test
@@ -202,6 +199,9 @@ KHR-GL45.CommonBugs.CommonBug_PerVertexValidation
 KHR-GL45.CommonBugs.CommonBug_ReservedNames
 KHR-GL45.CommonBugs.CommonBug_SparseBuffersWithCopyOps
 KHR-GL45.texture_size_promotion.functional
+KHR-GL45.gpu_shader5_gl.implicit_conversions
+KHR-GL45.gpu_shader5_gl.function_overloading
+KHR-GL45.gpu_shader5_gl.float_encoding
 KHR-GL45.transform_feedback_overflow_query_ARB.implementation-dependent-state
 KHR-GL45.transform_feedback_overflow_query_ARB.default-context-state
 KHR-GL45.transform_feedback_overflow_query_ARB.context-state-update

diff --git a/external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.0.x/gl46-master.txt b/external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.0.x/gl46-master.txt
index 93eda3d..dc2efdf 100644 (file)
--- a/external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.0.x/gl46-master.txt
+++ b/external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.0.x/gl46-master.txt
@@ -7,9 +7,6 @@ KHR-GL46.info.render_target
 KHR-GL46.clip_distance.coverage
 KHR-GL46.clip_distance.functional
 KHR-GL46.clip_distance.negative
-KHR-GL46.gpu_shader5_gl.implicit_conversions
-KHR-GL46.gpu_shader5_gl.function_overloading
-KHR-GL46.gpu_shader5_gl.float_encoding
 KHR-GL46.glsl_noperspective.functionaltest
 KHR-GL46.transform_feedback.api_errors_test
 KHR-GL46.transform_feedback.linking_errors_test
@@ -202,6 +199,9 @@ KHR-GL46.CommonBugs.CommonBug_PerVertexValidation
 KHR-GL46.CommonBugs.CommonBug_ReservedNames
 KHR-GL46.CommonBugs.CommonBug_SparseBuffersWithCopyOps
 KHR-GL46.texture_size_promotion.functional
+KHR-GL46.gpu_shader5_gl.implicit_conversions
+KHR-GL46.gpu_shader5_gl.function_overloading
+KHR-GL46.gpu_shader5_gl.float_encoding
 KHR-GL46.transform_feedback_overflow_query_ARB.implementation-dependent-state
 KHR-GL46.transform_feedback_overflow_query_ARB.default-context-state
 KHR-GL46.transform_feedback_overflow_query_ARB.context-state-update

diff --git a/external/openglcts/modules/gl/gl3cGPUShader5Tests.cpp b/external/openglcts/modules/gl/gl3cGPUShader5Tests.cpp
index f4b22f1..2b90bc0 100644 (file)
--- a/external/openglcts/modules/gl/gl3cGPUShader5Tests.cpp
+++ b/external/openglcts/modules/gl/gl3cGPUShader5Tests.cpp
@@ -581,7 +581,7 @@ std::string GPUShader5ImplicitConversionsTest::getVertexShader(const glw::GLchar
                                                                                                                           const glw::GLchar* source_type)
 {
        /* Vertex shader template */
-       const char* vs_body_template = "#version 130\n"
+       const char* vs_body_template = "#version 150\n"
                                                                   "#extension GL_ARB_gpu_shader5 : require\n"
                                                                   "\n"
                                                                   "uniform SOURCE_TYPE u1;\n"
@@ -689,7 +689,7 @@ std::string GPUShader5ImplicitConversionsTest::getVertexShader(const glw::GLchar
  */
 std::string GPUShader5ImplicitConversionsTest::getFragmentShader()
 {
-       const char* fs_body_template = "#version 130\n"
+       const char* fs_body_template = "#version 150\n"
                                                                   "\n"
                                                                   "in  vec4 result;\n"
                                                                   "out vec4 color;\n"
@@ -759,7 +759,7 @@ void GPUShader5FunctionOverloadingTest::execute(const glw::GLint* u1_data, const
        /* Run test case */
        {
                /* Shaders */
-               const char* fs = "#version 130\n"
+               const char* fs = "#version 150\n"
                                                 "\n"
                                                 "in  vec4 result;\n"
                                                 "out vec4 color;\n"
@@ -770,7 +770,7 @@ void GPUShader5FunctionOverloadingTest::execute(const glw::GLint* u1_data, const
                                                 "}\n"
                                                 "\n";
 
-               const char* vs = "#version 130\n"
+               const char* vs = "#version 150\n"
                                                 "#extension GL_ARB_gpu_shader5 : require\n"
                                                 "\n"
                                                 "uniform ivec4 u1;\n"
@@ -1050,7 +1050,7 @@ void GPUShader5FloatEncodingTest::execute(const testCase& test_case)
        /* Run test case */
        {
                /* Shaders */
-               const char* fs = "#version 130\n"
+               const char* fs = "#version 150\n"
                                                 "\n"
                                                 "in  vec4 result;\n"
                                                 "out vec4 color;\n"
@@ -1099,7 +1099,7 @@ void GPUShader5FloatEncodingTest::execute(const testCase& test_case)
 std::string GPUShader5FloatEncodingTest::getVertexShader(const testCase& test_case) const
 {
        /* Vertex shader template */
-       const char* vs_body_template = "#version 130\n"
+       const char* vs_body_template = "#version 150\n"
                                                                   "#extension GL_ARB_gpu_shader5 : require\n"
                                                                   "\n"
                                                                   "uniform EXPECTED_VALUE_TYPE expected_value;\n"

diff --git a/external/openglcts/modules/gl/gl3cTestPackages.cpp b/external/openglcts/modules/gl/gl3cTestPackages.cpp
index d5fe321..c3b5a14 100644 (file)
--- a/external/openglcts/modules/gl/gl3cTestPackages.cpp
+++ b/external/openglcts/modules/gl/gl3cTestPackages.cpp
@@ -141,7 +141,6 @@ void GL30TestPackage::init(void)
        {
                addChild(new deqp::InfoTests(getContext()));
                addChild(new gl3cts::ClipDistance::Tests(getContext()));
-               addChild(new gl3cts::GPUShader5Tests(getContext()));
                addChild(new gl3cts::GLSLnoperspectiveTests(getContext()));
                addChild(new gl3cts::TransformFeedback::Tests(getContext()));
                addChild(new glcts::TextureRepeatModeTests(getContext()));
@@ -210,6 +209,7 @@ void GL32TestPackage::init(void)
 
        try
        {
+               addChild(new gl3cts::GPUShader5Tests(getContext()));
                addChild(new gl3cts::TransformFeedbackOverflowQueryTests(
                        getContext(), gl3cts::TransformFeedbackOverflowQueryTests::API_GL_ARB_transform_feedback_overflow_query));
        }