commit f403b8e658fd2b2d71ed819f71b46080351098d3
author Mike Blumenkrantz <michael.blumenkrantz@gmail.com> Thu Mar 28 12:29:12 2024 -0400
committer Lorenzo Dal Col <lorenzo@khronosgroup.org> Fri Jun 07 13:24:32 2024 +0000
tree e9ff5b772973d17818b4a17087da2fb26e494507
parent c5acbf462b3da6b76494826876698c1eee4c17eb

fix R16 format checks in dEQP-GL45-ES3 FBO tests

these are required by desktop GL

Tests affected:
dEQP-GL45-ES31.functional.fbo.color.tex2d.r*16

VK-GL-CTS issue: 5055

Change-Id: Iddc1c8fe370dc71a151cf0d09657d60a56c687dd

modules/gles31/functional/es31fFboColorbufferTests.cpp

diff --git a/modules/gles31/functional/es31fFboColorbufferTests.cpp b/modules/gles31/functional/es31fFboColorbufferTests.cpp
index 12ce131..97b6032 100644
--- a/modules/gles31/functional/es31fFboColorbufferTests.cpp
+++ b/modules/gles31/functional/es31fFboColorbufferTests.cpp
@@ -407,7 +407,7 @@
 
         for (int ndx = 0; ndx < DE_LENGTH_OF_ARRAY(unorm16ColorFormats); ndx++)
             tex2dGroup->addChild(new FboColorTex2DCase(m_context, getFormatName(unorm16ColorFormats[ndx]), "",
-                                                       unorm16ColorFormats[ndx], IVec2(129, 117)));
+                                                       unorm16ColorFormats[ndx], IVec2(128, 128)));
     }
 }
 

modules/gles31/functional/es31fFboTestCase.cpp

diff --git a/modules/gles31/functional/es31fFboTestCase.cpp b/modules/gles31/functional/es31fFboTestCase.cpp
index c82fd8c..27d990b 100644
--- a/modules/gles31/functional/es31fFboTestCase.cpp
+++ b/modules/gles31/functional/es31fFboTestCase.cpp
@@ -219,6 +219,9 @@
     case GL_RG16F:
     case GL_R16F:
         return supportsES32 || supportsGL45;
+    case GL_R16:
+    case GL_RG16:
+    case GL_RGBA16:
     case GL_RGB16F:
         return supportsGL45;
 
@@ -230,9 +233,12 @@
 static std::vector<std::string> getEnablingExtensions(uint32_t format, glu::RenderContext &renderContext)
 {
     const bool supportsES32 = glu::contextSupports(renderContext.getType(), glu::ApiType::es(3, 2));
+    const bool supportsGL45 = glu::contextSupports(renderContext.getType(), glu::ApiType::core(4, 5));
     std::vector<std::string> out;
 
     DE_ASSERT(!isRequiredFormat(format, renderContext));
+    if (supportsGL45)
+        return out;
 
     switch (format)
     {