Apply sRGB conversion to reference in sRGB framebuffer fetch test

Framebuffer fetch returns linear values when the framebuffer format
is sRGB and GL_FRAMEBUFFER_SRGB is enabled (default). This conversion
was not applied when generating reference textures for framebuffer
fetch tests. glReadPixels() does not apply any conversion, so the
final reference value must also be converted back to sRGB.

Affects: dEQP-GLES31.functional.shaders.framebuffer_fetch.
framebuffer_format.srgb8_alpha8

Components: AOSP

diff --git a/modules/gles31/functional/es31fShaderFramebufferFetchTests.cpp b/modules/gles31/functional/es31fShaderFramebufferFetchTests.cpp
index 8f591aa..9d77831 100644 (file)
--- a/modules/gles31/functional/es31fShaderFramebufferFetchTests.cpp
+++ b/modules/gles31/functional/es31fShaderFramebufferFetchTests.cpp
@@ -568,11 +568,25 @@ tcu::TextureLevel TextureFormatTestCase::genReferenceTexture (const tcu::Vec4& f
        tcu::TextureChannelClass        textureChannelClass = tcu::getTextureChannelClass(m_texFmt.type);
 
        if (textureChannelClass == tcu::TEXTURECHANNELCLASS_UNSIGNED_INTEGER)
+       {
                tcu::clear(reference.getAccess(), fbColor.asUint() + uniformColor.asUint());
+       }
        else if (textureChannelClass == tcu::TEXTURECHANNELCLASS_SIGNED_INTEGER)
+       {
                tcu::clear(reference.getAccess(), fbColor.asInt() + uniformColor.asInt());
+       }
        else
-               tcu::clear(reference.getAccess(), fbColor + uniformColor);
+       {
+               if (tcu::isSRGB(m_texFmt))
+               {
+                       const tcu::Vec4 fragmentColor = tcu::sRGBToLinear(fbColor) + uniformColor;
+                       tcu::clear(reference.getAccess(), tcu::linearToSRGB(fragmentColor));
+               }
+               else
+               {
+                       tcu::clear(reference.getAccess(), fbColor + uniformColor);
+               }
+       }
 
        return reference;
 }