KHR-GLES31.core.constant_expressions.* add T&G tests to the test tree

KHR-GLES31.core.shader_macros* add T&G tests to the test tree

Even if geometry and tessellation shaders are not surpported the tests
need to be added to the test tree for the tests to be run and be marked
as not supported if necessary.

Components: Vulkan

VK-GL-CTS Issue: 1859

Affects:
KHR-GLES31.core.constant_expressions.*
KHR-GLES31.core.shader_macros*

Change-Id: I38960349d7e52b546f8e02af3d5190a8f7225588

diff --git a/external/openglcts/modules/common/glcShaderConstExprTests.cpp b/external/openglcts/modules/common/glcShaderConstExprTests.cpp
index 6071c6b..c04cb2d 100644 (file)
--- a/external/openglcts/modules/common/glcShaderConstExprTests.cpp
+++ b/external/openglcts/modules/common/glcShaderConstExprTests.cpp
@@ -210,19 +210,9 @@ void createTestCasesForAllShaderTypes(const ShaderExecutorParams& params, std::v
        {
                shaderSpec.version = glu::GLSL_VERSION_310_ES;
                shaderTypes.push_back(glu::SHADERTYPE_COMPUTE);
-
-               if (context.getContextInfo().isExtensionSupported("GL_EXT_geometry_shader") ||
-                       context.getContextInfo().isExtensionSupported("GL_OES_geometry_shader"))
-               {
-                       shaderTypes.push_back(glu::SHADERTYPE_GEOMETRY);
-               }
-
-               if (context.getContextInfo().isExtensionSupported("GL_EXT_tessellation_shader") ||
-                       context.getContextInfo().isExtensionSupported("GL_OES_tessellation_shader"))
-               {
-                       shaderTypes.push_back(glu::SHADERTYPE_TESSELLATION_CONTROL);
-                       shaderTypes.push_back(glu::SHADERTYPE_TESSELLATION_EVALUATION);
-               }
+               shaderTypes.push_back(glu::SHADERTYPE_GEOMETRY);
+               shaderTypes.push_back(glu::SHADERTYPE_TESSELLATION_CONTROL);
+               shaderTypes.push_back(glu::SHADERTYPE_TESSELLATION_EVALUATION);
        }
        else
        {

diff --git a/external/openglcts/modules/common/glcShaderMacroTests.cpp b/external/openglcts/modules/common/glcShaderMacroTests.cpp
index 30b1cce..9f29cbe 100644 (file)
--- a/external/openglcts/modules/common/glcShaderMacroTests.cpp
+++ b/external/openglcts/modules/common/glcShaderMacroTests.cpp
@@ -127,18 +127,9 @@ void ShaderMacroTests::init(void)
        else if (glu::contextSupports(contextType, glu::ApiType::es(3, 1)))
        {
                shaderSpec.version = glu::GLSL_VERSION_310_ES;
-               if (m_context.getContextInfo().isExtensionSupported("GL_EXT_geometry_shader") ||
-                       m_context.getContextInfo().isExtensionSupported("GL_OES_geometry_shader"))
-               {
-                       shaderTypes.push_back(glu::SHADERTYPE_GEOMETRY);
-               }
-
-               if (m_context.getContextInfo().isExtensionSupported("GL_EXT_tessellation_shader") ||
-                       m_context.getContextInfo().isExtensionSupported("GL_OES_tessellation_shader"))
-               {
-                       shaderTypes.push_back(glu::SHADERTYPE_TESSELLATION_CONTROL);
-                       shaderTypes.push_back(glu::SHADERTYPE_TESSELLATION_EVALUATION);
-               }
+               shaderTypes.push_back(glu::SHADERTYPE_GEOMETRY);
+               shaderTypes.push_back(glu::SHADERTYPE_TESSELLATION_CONTROL);
+               shaderTypes.push_back(glu::SHADERTYPE_TESSELLATION_EVALUATION);
        }
 
        for (std::size_t typeIndex = 0; typeIndex < shaderTypes.size(); ++typeIndex)