projects / platform / upstream / VK-GL-CTS.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 664a751)
Fix for the various multisample tests with GL 4.5
authorTapani Pälli <tapani.palli@intel.com>
Fri, 30 Jul 2021 11:54:09 +0000 (14:54 +0300)
committerAlexander Galazin <galazin@protonmail.com>
Thu, 19 Aug 2021 09:18:22 +0000 (09:18 +0000)
Affects:
dEQP-GLES31.functional.shaders.sample_variables.*
dEQP-GLES31.functional.sample_shading.*
dEQP-GLES31.functional.shaders.multisample_interpolation.*
dEQP-GL45.functional.shaders.sample_variables.*
dEQP-GL45.functional.sample_shading.*
dEQP-GL45.functional.shaders.multisample_interpolation.*

Components: AOSP
VK-GL-CTS issue: 3014

Signed-off-by: Tapani Pälli <tapani.palli@intel.com>
Change-Id: I6e4297a0558a31a1dc2258da7434d3fcc1900b73

modules/gles31/functional/es31fMultisampleShaderRenderCase.cpp patch | blob | history
modules/gles31/functional/es31fSampleShadingTests.cpp patch | blob | history
modules/gles31/functional/es31fSampleVariableTests.cpp patch | blob | history

diff --git a/modules/gles31/functional/es31fMultisampleShaderRenderCase.cpp b/modules/gles31/functional/es31fMultisampleShaderRenderCase.cpp
index 97a0d04..8d0dadd 100644 (file)
--- a/modules/gles31/functional/es31fMultisampleShaderRenderCase.cpp
+++ b/modules/gles31/functional/es31fMultisampleShaderRenderCase.cpp
@@ -668,10 +668,13 @@ void MultisampleRenderCase::drawOneIteration (void)
 
 std::string    MultisampleRenderCase::genVertexSource (int numTargetSamples) const
 {
-       const bool                              supportsES32    = glu::contextSupports(m_context.getRenderContext().getType(), glu::ApiType::es(3, 2));
+       const bool supportsES32orGL45 =
+               glu::contextSupports(m_context.getRenderContext().getType(), glu::ApiType::es(3, 2)) ||
+               glu::contextSupports(m_context.getRenderContext().getType(), glu::ApiType::core(4, 5));
+
        map<string, string>             args;
 
-       args["GLSL_VERSION_DECL"] = supportsES32 ? getGLSLVersionDeclaration(glu::GLSL_VERSION_320_ES) : getGLSLVersionDeclaration(glu::GLSL_VERSION_310_ES);
+       args["GLSL_VERSION_DECL"] = supportsES32orGL45 ? getGLSLVersionDeclaration(glu::GLSL_VERSION_320_ES) : getGLSLVersionDeclaration(glu::GLSL_VERSION_310_ES);
 
        DE_UNREF(numTargetSamples);
        return std::string(tcu::StringTemplate(s_vertexSource).specialize(args));
diff --git a/modules/gles31/functional/es31fSampleShadingTests.cpp b/modules/gles31/functional/es31fSampleShadingTests.cpp
index 313d1bb..14d1a57 100644 (file)
--- a/modules/gles31/functional/es31fSampleShadingTests.cpp
+++ b/modules/gles31/functional/es31fSampleShadingTests.cpp
@@ -412,9 +412,12 @@ bool SampleShadingRenderingCase::verifyImage (const tcu::Surface& resultImage)
 std::string SampleShadingRenderingCase::genFragmentSource (int numSamples) const
 {
        DE_UNREF(numSamples);
-       const glu::GLSLVersion  version = contextSupports(m_context.getRenderContext().getType(), glu::ApiType::es(3, 2))
-                                                                       ? glu::GLSL_VERSION_320_ES
-                                                                       : glu::GLSL_VERSION_310_ES;
+
+        const bool supportsES32orGL45 =
+               glu::contextSupports(m_context.getRenderContext().getType(), glu::ApiType::es(3, 2)) ||
+               glu::contextSupports(m_context.getRenderContext().getType(), glu::ApiType::core(4, 5));
+
+       const glu::GLSLVersion  version = supportsES32orGL45 ? glu::GLSL_VERSION_320_ES : glu::GLSL_VERSION_310_ES;
        std::ostringstream              buf;
 
        buf <<  glu::getGLSLVersionDeclaration(version) << "\n"
diff --git a/modules/gles31/functional/es31fSampleVariableTests.cpp b/modules/gles31/functional/es31fSampleVariableTests.cpp
index c6dc33a..0b041d9 100644 (file)
--- a/modules/gles31/functional/es31fSampleVariableTests.cpp
+++ b/modules/gles31/functional/es31fSampleVariableTests.cpp
@@ -276,8 +276,9 @@ MultisampleRenderCase::~MultisampleRenderCase (void)
 
 void MultisampleRenderCase::init (void)
 {
-       const bool supportsES32orGL45 = glu::contextSupports(m_context.getRenderContext().getType(), glu::ApiType::es(3, 2)) ||
-               contextSupports(m_context.getRenderContext().getType(), glu::ApiType::core(4, 5));
+       const bool supportsES32orGL45 =
+               glu::contextSupports(m_context.getRenderContext().getType(), glu::ApiType::es(3, 2)) ||
+               glu::contextSupports(m_context.getRenderContext().getType(), glu::ApiType::core(4, 5));
        if (!supportsES32orGL45 && !m_context.getContextInfo().isExtensionSupported("GL_OES_sample_variables"))
                TCU_THROW(NotSupportedError, "Test requires GL_OES_sample_variables extension or a context version 3.2 or higher.");
 
@@ -312,10 +313,12 @@ NumSamplesCase::~NumSamplesCase (void)
 std::string NumSamplesCase::genFragmentSource (int numTargetSamples) const
 {
        std::ostringstream      buf;
-       const bool                      supportsES32    = glu::contextSupports(m_context.getRenderContext().getType(), glu::ApiType::es(3, 2));
+       const bool supportsES32orGL45 =
+               glu::contextSupports(m_context.getRenderContext().getType(), glu::ApiType::es(3, 2)) ||
+               glu::contextSupports(m_context.getRenderContext().getType(), glu::ApiType::core(4, 5));
        map<string, string>     args;
-       args["GLSL_VERSION_DECL"]       = supportsES32 ? getGLSLVersionDeclaration(glu::GLSL_VERSION_320_ES) : getGLSLVersionDeclaration(glu::GLSL_VERSION_310_ES);
-       args["GLSL_EXTENSION"]          = supportsES32 ? "" : "#extension GL_OES_sample_variables : require";
+       args["GLSL_VERSION_DECL"]       = (supportsES32orGL45) ? getGLSLVersionDeclaration(glu::GLSL_VERSION_320_ES) : getGLSLVersionDeclaration(glu::GLSL_VERSION_310_ES);
+       args["GLSL_EXTENSION"]          = (supportsES32orGL45) ? "" : "#extension GL_OES_sample_variables : require";
 
        buf <<  "${GLSL_VERSION_DECL}\n"
                        "${GLSL_EXTENSION}\n"
@@ -392,10 +395,12 @@ std::string MaxSamplesCase::genFragmentSource (int numTargetSamples) const
        DE_UNREF(numTargetSamples);
 
        std::ostringstream      buf;
-       const bool                      supportsES32    = glu::contextSupports(m_context.getRenderContext().getType(), glu::ApiType::es(3, 2));
+       const bool supportsES32orGL45 =
+               glu::contextSupports(m_context.getRenderContext().getType(), glu::ApiType::es(3, 2)) ||
+               glu::contextSupports(m_context.getRenderContext().getType(), glu::ApiType::core(4, 5));
        map<string, string>     args;
-       args["GLSL_VERSION_DECL"]       = supportsES32 ? getGLSLVersionDeclaration(glu::GLSL_VERSION_320_ES) : getGLSLVersionDeclaration(glu::GLSL_VERSION_310_ES);
-       args["GLSL_EXTENSION"]          = supportsES32 ? "" : "#extension GL_OES_sample_variables : require";
+       args["GLSL_VERSION_DECL"]       = (supportsES32orGL45) ? getGLSLVersionDeclaration(glu::GLSL_VERSION_320_ES) : getGLSLVersionDeclaration(glu::GLSL_VERSION_310_ES);
+       args["GLSL_EXTENSION"]          = (supportsES32orGL45) ? "" : "#extension GL_OES_sample_variables : require";
 
        buf <<  "${GLSL_VERSION_DECL}\n"
                        "${GLSL_EXTENSION}\n"
@@ -479,10 +484,12 @@ std::string SampleIDCase::genFragmentSource (int numTargetSamples) const
        DE_ASSERT(numTargetSamples != 0);
 
        std::ostringstream buf;
-       const bool                      supportsES32    = glu::contextSupports(m_context.getRenderContext().getType(), glu::ApiType::es(3, 2));
+       const bool supportsES32orGL45 =
+               glu::contextSupports(m_context.getRenderContext().getType(), glu::ApiType::es(3, 2)) ||
+               glu::contextSupports(m_context.getRenderContext().getType(), glu::ApiType::core(4, 5));
        map<string, string>     args;
-       args["GLSL_VERSION_DECL"]       = supportsES32 ? getGLSLVersionDeclaration(glu::GLSL_VERSION_320_ES) : getGLSLVersionDeclaration(glu::GLSL_VERSION_310_ES);
-       args["GLSL_EXTENSION"]          = supportsES32 ? "" : "#extension GL_OES_sample_variables : require";
+       args["GLSL_VERSION_DECL"]       = (supportsES32orGL45) ? getGLSLVersionDeclaration(glu::GLSL_VERSION_320_ES) : getGLSLVersionDeclaration(glu::GLSL_VERSION_310_ES);
+       args["GLSL_EXTENSION"]          = (supportsES32orGL45) ? "" : "#extension GL_OES_sample_variables : require";
 
        if (m_vericationMode == VERIFY_USING_SAMPLES)
        {
@@ -652,10 +659,12 @@ std::string SamplePosDistributionCase::genFragmentSource (int numTargetSamples)
 
        const bool                      multisampleTarget       = (m_numRequestedSamples > 0) || (m_renderTarget == TARGET_DEFAULT && m_context.getRenderTarget().getNumSamples() > 1);
        std::ostringstream      buf;
-       const bool                      supportsES32            = glu::contextSupports(m_context.getRenderContext().getType(), glu::ApiType::es(3, 2));
+       const bool supportsES32orGL45 =
+               glu::contextSupports(m_context.getRenderContext().getType(), glu::ApiType::es(3, 2)) ||
+               glu::contextSupports(m_context.getRenderContext().getType(), glu::ApiType::core(4, 5));
        map<string, string>     args;
-       args["GLSL_VERSION_DECL"]                               = supportsES32 ? getGLSLVersionDeclaration(glu::GLSL_VERSION_320_ES) : getGLSLVersionDeclaration(glu::GLSL_VERSION_310_ES);
-       args["GLSL_EXTENSION"]                                  = supportsES32 ? "\n" : "#extension GL_OES_sample_variables : require\n";
+       args["GLSL_VERSION_DECL"]       = (supportsES32orGL45) ? getGLSLVersionDeclaration(glu::GLSL_VERSION_320_ES) : getGLSLVersionDeclaration(glu::GLSL_VERSION_310_ES);
+       args["GLSL_EXTENSION"]          = (supportsES32orGL45) ? "\n" : "#extension GL_OES_sample_variables : require\n";
 
        if (multisampleTarget)
        {
@@ -974,15 +983,14 @@ void SamplePosCorrectnessCase::postDraw (void)
 std::string SamplePosCorrectnessCase::genVertexSource (int numTargetSamples) const
 {
        DE_UNREF(numTargetSamples);
-
-       auto            ctxType = m_context.getRenderContext().getType();
-       const bool      isES32  = glu::contextSupports(ctxType, glu::ApiType::es(3, 2));
-       const bool      isGL45  = glu::contextSupports(ctxType, glu::ApiType::core(4, 5));
+       const bool supportsES32orGL45 =
+               glu::contextSupports(m_context.getRenderContext().getType(), glu::ApiType::es(3, 2)) ||
+               glu::contextSupports(m_context.getRenderContext().getType(), glu::ApiType::core(4, 5));
 
        std::ostringstream      buf;
        map<string, string>     args;
-       args["GLSL_VERSION_DECL"]       = isES32 ? getGLSLVersionDeclaration(glu::GLSL_VERSION_320_ES) : getGLSLVersionDeclaration(glu::GLSL_VERSION_310_ES);
-       args["GLSL_EXTENSION"]          = (isES32 || isGL45) ? "" : m_useSampleQualifier ? "#extension GL_OES_shader_multisample_interpolation : require" : "";
+       args["GLSL_VERSION_DECL"]       = supportsES32orGL45 ? getGLSLVersionDeclaration(glu::GLSL_VERSION_320_ES) : getGLSLVersionDeclaration(glu::GLSL_VERSION_310_ES);
+       args["GLSL_EXTENSION"]          = supportsES32orGL45 ? "" : m_useSampleQualifier ? "#extension GL_OES_shader_multisample_interpolation : require" : "";
 
        buf <<  "${GLSL_VERSION_DECL}\n"
                        "${GLSL_EXTENSION}\n"
@@ -1002,11 +1010,13 @@ std::string SamplePosCorrectnessCase::genFragmentSource (int numTargetSamples) c
        DE_UNREF(numTargetSamples);
 
        std::ostringstream      buf;
-       const bool                      supportsES32    = glu::contextSupports(m_context.getRenderContext().getType(), glu::ApiType::es(3, 2));
+       const bool supportsES32orGL45 =
+               glu::contextSupports(m_context.getRenderContext().getType(), glu::ApiType::es(3, 2)) ||
+               glu::contextSupports(m_context.getRenderContext().getType(), glu::ApiType::core(4, 5));
        map<string, string>     args;
-       args["GLSL_VERSION_DECL"]                       = supportsES32 ? getGLSLVersionDeclaration(glu::GLSL_VERSION_320_ES) : getGLSLVersionDeclaration(glu::GLSL_VERSION_310_ES);
-       args["GLSL_SAMPLE_EXTENSION"]           = supportsES32 ? "" : "#extension GL_OES_sample_variables : require";
-       args["GLSL_MULTISAMPLE_EXTENSION"]      = supportsES32 ? "" : m_useSampleQualifier ? "#extension GL_OES_shader_multisample_interpolation : require" : "";
+       args["GLSL_VERSION_DECL"]               = supportsES32orGL45 ? getGLSLVersionDeclaration(glu::GLSL_VERSION_320_ES) : getGLSLVersionDeclaration(glu::GLSL_VERSION_310_ES);
+       args["GLSL_SAMPLE_EXTENSION"]           = supportsES32orGL45 ? "" : "#extension GL_OES_sample_variables : require";
+       args["GLSL_MULTISAMPLE_EXTENSION"]      = supportsES32orGL45 ? "" : m_useSampleQualifier ? "#extension GL_OES_shader_multisample_interpolation : require" : "";
 
        // encode the position to the output, use red channel as error channel
        buf <<  "${GLSL_VERSION_DECL}\n"
Domain: Graphics System / GL;