Max compiler threads only specifies a suggestion

In this test, it is expected that calling MaxShaderCompilerThreadsKHR()
with a count of 0 will compile non-parallel. However, the extension
purposefully says this is only a  "request" for non-parallel compiling
or linking.

This change will remove this specific test.

Affects:

parallel_shader_compile.compilation_completion_non_parallel

Components: OpenGL

VK-GL-CTS issue: 1226

Change-Id: I49214b3b32b4991ee7b96aad3853e24075c0f137

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 c51b731..ed4b8d9 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
@@ -7003,7 +7003,6 @@ KHR-GL45.sync.flush_commands
 KHR-GL45.incomplete_texture_access.sampler
 KHR-GL45.parallel_shader_compile.simple_queries
 KHR-GL45.parallel_shader_compile.max_shader_compile_threads
-KHR-GL45.parallel_shader_compile.compilation_completion_non_parallel
 KHR-GL45.parallel_shader_compile.compilation_completion_parallel
 KHR-GL45.post_depth_coverage_tests.PostDepthShader
 KHR-GL45.post_depth_coverage_tests.PostDepthSampleMask

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 575ef63..40ef7f6 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
@@ -7003,7 +7003,6 @@ KHR-GL46.sync.flush_commands
 KHR-GL46.incomplete_texture_access.sampler
 KHR-GL46.parallel_shader_compile.simple_queries
 KHR-GL46.parallel_shader_compile.max_shader_compile_threads
-KHR-GL46.parallel_shader_compile.compilation_completion_non_parallel
 KHR-GL46.parallel_shader_compile.compilation_completion_parallel
 KHR-GL46.post_depth_coverage_tests.PostDepthShader
 KHR-GL46.post_depth_coverage_tests.PostDepthSampleMask

diff --git a/external/openglcts/data/mustpass/gles/khronos_mustpass/3.2.4.x/gles3-khr-master.txt b/external/openglcts/data/mustpass/gles/khronos_mustpass/3.2.4.x/gles3-khr-master.txt
index b24abce..3757d6d 100644 (file)
--- a/external/openglcts/data/mustpass/gles/khronos_mustpass/3.2.4.x/gles3-khr-master.txt
+++ b/external/openglcts/data/mustpass/gles/khronos_mustpass/3.2.4.x/gles3-khr-master.txt
@@ -3040,5 +3040,4 @@ KHR-GLES3.core.constant_expressions.array_normalize_vec4_vertex
 KHR-GLES3.core.constant_expressions.array_normalize_vec4_fragment
 KHR-GLES3.parallel_shader_compile.simple_queries
 KHR-GLES3.parallel_shader_compile.max_shader_compile_threads
-KHR-GLES3.parallel_shader_compile.compilation_completion_non_parallel
 KHR-GLES3.parallel_shader_compile.compilation_completion_parallel

diff --git a/external/openglcts/data/mustpass/gles/khronos_mustpass/master/gles3-khr-master.txt b/external/openglcts/data/mustpass/gles/khronos_mustpass/master/gles3-khr-master.txt
index b24abce..3757d6d 100644 (file)
--- a/external/openglcts/data/mustpass/gles/khronos_mustpass/master/gles3-khr-master.txt
+++ b/external/openglcts/data/mustpass/gles/khronos_mustpass/master/gles3-khr-master.txt
@@ -3040,5 +3040,4 @@ KHR-GLES3.core.constant_expressions.array_normalize_vec4_vertex
 KHR-GLES3.core.constant_expressions.array_normalize_vec4_fragment
 KHR-GLES3.parallel_shader_compile.simple_queries
 KHR-GLES3.parallel_shader_compile.max_shader_compile_threads
-KHR-GLES3.parallel_shader_compile.compilation_completion_non_parallel
 KHR-GLES3.parallel_shader_compile.compilation_completion_parallel

diff --git a/external/openglcts/modules/common/glcParallelShaderCompileTests.cpp b/external/openglcts/modules/common/glcParallelShaderCompileTests.cpp
index 1079122..ddb7791 100644 (file)
--- a/external/openglcts/modules/common/glcParallelShaderCompileTests.cpp
+++ b/external/openglcts/modules/common/glcParallelShaderCompileTests.cpp
@@ -217,92 +217,6 @@ tcu::TestNode::IterateResult MaxShaderCompileThreadsTest::iterate()
  *  @param name        Test name
  *  @param description Test description
  */
-CompilationCompletionNonParallelTest::CompilationCompletionNonParallelTest(deqp::Context& context)
-       : TestCase(context, "compilation_completion_non_parallel",
-                          "Tests verifies if shader COMPLETION_STATUS query works as expected for non parallel compilation")
-{
-       /* Left blank intentionally */
-}
-
-/** Executes test iteration.
- *
- *  @return Returns STOP when test has finished executing, CONTINUE if more iterations are needed.
- */
-tcu::TestNode::IterateResult CompilationCompletionNonParallelTest::iterate()
-{
-       const glu::ContextInfo& contextInfo             = m_context.getContextInfo();
-       const glu::ContextType& contextType             = m_context.getRenderContext().getType();
-       const bool                              isGL                    = glu::isContextTypeGLCore(contextType);
-       const bool                              supportParallel = (isGL && contextInfo.isExtensionSupported("GL_ARB_parallel_shader_compile")) ||
-                                                                                               contextInfo.isExtensionSupported("GL_KHR_parallel_shader_compile");
-
-       if (!supportParallel)
-       {
-               m_testCtx.setTestResult(QP_TEST_RESULT_NOT_SUPPORTED, "Not supported");
-               return STOP;
-       }
-
-       const glw::Functions& gl = m_context.getRenderContext().getFunctions();
-
-       GLint completionStatus;
-
-       gl.maxShaderCompilerThreadsKHR(0);
-       GLU_EXPECT_NO_ERROR(gl.getError(), "maxShaderCompilerThreadsKHR");
-
-       {
-               Program program(gl);
-               Shader  vertexShader(gl, SHADERTYPE_VERTEX);
-               Shader  fragmentShader(gl, SHADERTYPE_FRAGMENT);
-
-               bool            isContextES   = (glu::isContextTypeES(m_context.getRenderContext().getType()));
-               const char* shaderVersion = isContextES ? shaderVersionES : shaderVersionGL;
-
-               const char* vSources[] = { shaderVersion, vShader };
-               const int   vLengths[] = { int(strlen(shaderVersion)), int(strlen(vShader)) };
-               vertexShader.setSources(2, vSources, vLengths);
-
-               const char* fSources[] = { shaderVersion, fShader };
-               const int   fLengths[] = { int(strlen(shaderVersion)), int(strlen(fShader)) };
-               fragmentShader.setSources(2, fSources, fLengths);
-
-               gl.compileShader(vertexShader.getShader());
-               GLU_EXPECT_NO_ERROR(gl.getError(), "compileShader");
-               gl.compileShader(fragmentShader.getShader());
-               GLU_EXPECT_NO_ERROR(gl.getError(), "compileShader");
-
-               gl.getShaderiv(fragmentShader.getShader(), GL_COMPLETION_STATUS_KHR, &completionStatus);
-               GLU_EXPECT_NO_ERROR(gl.getError(), "getShaderiv");
-               if (!completionStatus)
-               {
-                       m_testCtx.setTestResult(QP_TEST_RESULT_FAIL,
-                                                                       "Failed reading completion status for non parallel shader compiling");
-                       return STOP;
-               }
-
-               program.attachShader(vertexShader.getShader());
-               program.attachShader(fragmentShader.getShader());
-               gl.linkProgram(program.getProgram());
-
-               gl.getProgramiv(program.getProgram(), GL_COMPLETION_STATUS_KHR, &completionStatus);
-               GLU_EXPECT_NO_ERROR(gl.getError(), "getProgramiv");
-               if (!completionStatus)
-               {
-                       m_testCtx.setTestResult(QP_TEST_RESULT_FAIL,
-                                                                       "Failed reading completion status for non parallel program linking");
-                       return STOP;
-               }
-       }
-
-       m_testCtx.setTestResult(QP_TEST_RESULT_PASS, "Pass");
-       return STOP;
-}
-
-/** Constructor.
- *
- *  @param context     Rendering context
- *  @param name        Test name
- *  @param description Test description
- */
 CompilationCompletionParallelTest::CompilationCompletionParallelTest(deqp::Context& context)
        : TestCase(context, "compilation_completion_parallel",
                           "Tests verifies if shader COMPLETION_STATUS query works as expected for parallel compilation")
@@ -458,7 +372,6 @@ void ParallelShaderCompileTests::init()
 {
        addChild(new SimpleQueriesTest(m_context));
        addChild(new MaxShaderCompileThreadsTest(m_context));
-       addChild(new CompilationCompletionNonParallelTest(m_context));
        addChild(new CompilationCompletionParallelTest(m_context));
 }
 

diff --git a/external/openglcts/modules/common/glcParallelShaderCompileTests.hpp b/external/openglcts/modules/common/glcParallelShaderCompileTests.hpp
index a3e4c98..99a69e7 100644 (file)
--- a/external/openglcts/modules/common/glcParallelShaderCompileTests.hpp
+++ b/external/openglcts/modules/common/glcParallelShaderCompileTests.hpp
@@ -68,22 +68,6 @@ private:
 };
 
 /** Test verifies if GetShaderiv and GetProgramiv queries returns value as expected
- *  for COMPLETION_STATUS <pname> and non parallel compilation.
- **/
-class CompilationCompletionNonParallelTest : public deqp::TestCase
-{
-public:
-       /* Public methods */
-       CompilationCompletionNonParallelTest(deqp::Context& context);
-
-       tcu::TestNode::IterateResult iterate();
-
-private:
-       /* Private methods */
-       /* Private members */
-};
-
-/** Test verifies if GetShaderiv and GetProgramiv queries returns value as expected
  *  for COMPLETION_STATUS <pname> and parallel compilation.
  **/
 class CompilationCompletionParallelTest : public deqp::TestCase