Move isCompressedFormat from CopyImageTests to gluTextureUtil.

Change-Id: Ieeaf23f844f47e538f422fe180403ad9a6e473a6

diff --git a/framework/opengl/gluTextureUtil.cpp b/framework/opengl/gluTextureUtil.cpp
index 7a0ef98..35f4ada 100644 (file)
--- a/framework/opengl/gluTextureUtil.cpp
+++ b/framework/opengl/gluTextureUtil.cpp
@@ -333,6 +333,56 @@ tcu::CompressedTexFormat mapGLCompressedTexFormat (deUint32 format)
        }
 }
 
+bool isCompressedFormat (deUint32 internalFormat)
+{
+       switch (internalFormat)
+       {
+               case GL_ETC1_RGB8_OES:
+               case GL_COMPRESSED_R11_EAC:
+               case GL_COMPRESSED_SIGNED_R11_EAC:
+               case GL_COMPRESSED_RG11_EAC:
+               case GL_COMPRESSED_SIGNED_RG11_EAC:
+               case GL_COMPRESSED_RGB8_ETC2:
+               case GL_COMPRESSED_SRGB8_ETC2:
+               case GL_COMPRESSED_RGB8_PUNCHTHROUGH_ALPHA1_ETC2:
+               case GL_COMPRESSED_SRGB8_PUNCHTHROUGH_ALPHA1_ETC2:
+               case GL_COMPRESSED_RGBA8_ETC2_EAC:
+               case GL_COMPRESSED_SRGB8_ALPHA8_ETC2_EAC:
+               case GL_COMPRESSED_RGBA_ASTC_4x4_KHR:
+               case GL_COMPRESSED_RGBA_ASTC_5x4_KHR:
+               case GL_COMPRESSED_RGBA_ASTC_5x5_KHR:
+               case GL_COMPRESSED_RGBA_ASTC_6x5_KHR:
+               case GL_COMPRESSED_RGBA_ASTC_6x6_KHR:
+               case GL_COMPRESSED_RGBA_ASTC_8x5_KHR:
+               case GL_COMPRESSED_RGBA_ASTC_8x6_KHR:
+               case GL_COMPRESSED_RGBA_ASTC_8x8_KHR:
+               case GL_COMPRESSED_RGBA_ASTC_10x5_KHR:
+               case GL_COMPRESSED_RGBA_ASTC_10x6_KHR:
+               case GL_COMPRESSED_RGBA_ASTC_10x8_KHR:
+               case GL_COMPRESSED_RGBA_ASTC_10x10_KHR:
+               case GL_COMPRESSED_RGBA_ASTC_12x10_KHR:
+               case GL_COMPRESSED_RGBA_ASTC_12x12_KHR:
+               case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_4x4_KHR:
+               case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x4_KHR:
+               case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x5_KHR:
+               case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x5_KHR:
+               case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x6_KHR:
+               case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x5_KHR:
+               case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x6_KHR:
+               case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x8_KHR:
+               case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x5_KHR:
+               case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x6_KHR:
+               case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x8_KHR:
+               case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x10_KHR:
+               case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x10_KHR:
+               case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x12_KHR:
+                       return true;
+
+               default:
+                       return false;
+       }
+}
+
 static tcu::TextureFormat::ChannelType mapGLChannelType (deUint32 dataType, bool normalized)
 {
        // \note Normalized bit is ignored where it doesn't apply.

diff --git a/framework/opengl/gluTextureUtil.hpp b/framework/opengl/gluTextureUtil.hpp
index c1cc6c8..9ce102e 100644 (file)
--- a/framework/opengl/gluTextureUtil.hpp
+++ b/framework/opengl/gluTextureUtil.hpp
@@ -84,6 +84,7 @@ DataType                                              getSampler3DType                                        (tcu::TextureFormat format);
 DataType                                               getSamplerCubeArrayType                         (tcu::TextureFormat format);
 
 bool                                                   isSizedFormatColorRenderable            (const RenderContext& renderCtx, const ContextInfo& contextInfo, deUint32 sizedFormat);
+bool                                                   isCompressedFormat                                      (deUint32 internalFormat);
 
 } // glu
 

diff --git a/modules/gles31/functional/es31fCopyImageTests.cpp b/modules/gles31/functional/es31fCopyImageTests.cpp
index 89c458d..0217550 100644 (file)
--- a/modules/gles31/functional/es31fCopyImageTests.cpp
+++ b/modules/gles31/functional/es31fCopyImageTests.cpp
@@ -170,60 +170,11 @@ const char* targetToName (deUint32 target)
        }
 }
 
-bool isCompressedFormat (deUint32 format)
-{
-       switch (format)
-       {
-               case GL_COMPRESSED_R11_EAC:
-               case GL_COMPRESSED_SIGNED_R11_EAC:
-               case GL_COMPRESSED_RG11_EAC:
-               case GL_COMPRESSED_SIGNED_RG11_EAC:
-               case GL_COMPRESSED_RGB8_ETC2:
-               case GL_COMPRESSED_SRGB8_ETC2:
-               case GL_COMPRESSED_RGB8_PUNCHTHROUGH_ALPHA1_ETC2:
-               case GL_COMPRESSED_SRGB8_PUNCHTHROUGH_ALPHA1_ETC2:
-               case GL_COMPRESSED_RGBA8_ETC2_EAC:
-               case GL_COMPRESSED_SRGB8_ALPHA8_ETC2_EAC:
-               case GL_COMPRESSED_RGBA_ASTC_4x4_KHR:
-               case GL_COMPRESSED_RGBA_ASTC_5x4_KHR:
-               case GL_COMPRESSED_RGBA_ASTC_5x5_KHR:
-               case GL_COMPRESSED_RGBA_ASTC_6x5_KHR:
-               case GL_COMPRESSED_RGBA_ASTC_6x6_KHR:
-               case GL_COMPRESSED_RGBA_ASTC_8x5_KHR:
-               case GL_COMPRESSED_RGBA_ASTC_8x6_KHR:
-               case GL_COMPRESSED_RGBA_ASTC_8x8_KHR:
-               case GL_COMPRESSED_RGBA_ASTC_10x5_KHR:
-               case GL_COMPRESSED_RGBA_ASTC_10x6_KHR:
-               case GL_COMPRESSED_RGBA_ASTC_10x8_KHR:
-               case GL_COMPRESSED_RGBA_ASTC_10x10_KHR:
-               case GL_COMPRESSED_RGBA_ASTC_12x10_KHR:
-               case GL_COMPRESSED_RGBA_ASTC_12x12_KHR:
-               case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_4x4_KHR:
-               case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x4_KHR:
-               case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x5_KHR:
-               case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x5_KHR:
-               case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x6_KHR:
-               case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x5_KHR:
-               case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x6_KHR:
-               case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x8_KHR:
-               case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x5_KHR:
-               case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x6_KHR:
-               case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x8_KHR:
-               case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x10_KHR:
-               case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x10_KHR:
-               case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x12_KHR:
-                       return true;
-
-               default:
-                       return false;
-       }
-}
-
 string formatToName (deUint32 format)
 {
        string enumName;
 
-       if (isCompressedFormat(format))
+       if (glu::isCompressedFormat(format))
                enumName = glu::getCompressedTexFormatStr(format).toString().substr(14); // Strip GL_COMPRESSED_
        else
                enumName = glu::getPixelFormatStr(format).toString().substr(3); // Strip GL_
@@ -233,7 +184,7 @@ string formatToName (deUint32 format)
 
 bool isFloatFormat (deUint32 format)
 {
-       if (isCompressedFormat(format))
+       if (glu::isCompressedFormat(format))
                return false;
        else
                return tcu::getTextureChannelClass(glu::mapGLInternalFormat(format).type) == tcu::TEXTURECHANNELCLASS_FLOATING_POINT;
@@ -241,7 +192,7 @@ bool isFloatFormat (deUint32 format)
 
 bool isUintFormat (deUint32 format)
 {
-       if (isCompressedFormat(format))
+       if (glu::isCompressedFormat(format))
                return false;
        else
                return tcu::getTextureChannelClass(glu::mapGLInternalFormat(format).type) == tcu::TEXTURECHANNELCLASS_UNSIGNED_INTEGER;
@@ -249,7 +200,7 @@ bool isUintFormat (deUint32 format)
 
 bool isIntFormat (deUint32 format)
 {
-       if (isCompressedFormat(format))
+       if (glu::isCompressedFormat(format))
                return false;
        else
                return tcu::getTextureChannelClass(glu::mapGLInternalFormat(format).type) == tcu::TEXTURECHANNELCLASS_SIGNED_INTEGER;
@@ -305,7 +256,7 @@ ImageInfo::ImageInfo (deUint32 format, deUint32 target, const IVec3& size)
        , m_size                (size)
 {
        DE_ASSERT(m_target == GL_TEXTURE_2D_ARRAY || m_target == GL_TEXTURE_3D || m_size.z() == 1);
-       DE_ASSERT(isTextureTarget(m_target) || !isCompressedFormat(m_target));
+       DE_ASSERT(isTextureTarget(m_target) || !glu::isCompressedFormat(m_target));
 }
 
 
@@ -349,9 +300,9 @@ deUint32 getMoreRestrictiveFormat (deUint32 formatA, deUint32 formatB)
 {
        if (formatA == formatB)
                return formatA;
-       else if (isCompressedFormat(formatA) && isAstcFormat(glu::mapGLCompressedTexFormat(formatA)))
+       else if (glu::isCompressedFormat(formatA) && isAstcFormat(glu::mapGLCompressedTexFormat(formatA)))
                return formatA;
-       else if (isCompressedFormat(formatB) && isAstcFormat(glu::mapGLCompressedTexFormat(formatB)))
+       else if (glu::isCompressedFormat(formatB) && isAstcFormat(glu::mapGLCompressedTexFormat(formatB)))
                return formatB;
        else if (isFloatFormat(formatA))
        {
@@ -365,11 +316,11 @@ deUint32 getMoreRestrictiveFormat (deUint32 formatA, deUint32 formatB)
 
                return formatB;
        }
-       else if (isCompressedFormat(formatA))
+       else if (glu::isCompressedFormat(formatA))
        {
                return formatA;
        }
-       else if (isCompressedFormat(formatB))
+       else if (glu::isCompressedFormat(formatB))
        {
                return formatB;
        }
@@ -379,7 +330,7 @@ deUint32 getMoreRestrictiveFormat (deUint32 formatA, deUint32 formatB)
 
 int getTexelBlockSize (deUint32 format)
 {
-       if (isCompressedFormat(format))
+       if (glu::isCompressedFormat(format))
                return tcu::getBlockSize(glu::mapGLCompressedTexFormat(format));
        else
                return glu::mapGLInternalFormat(format).getPixelSize();
@@ -387,7 +338,7 @@ int getTexelBlockSize (deUint32 format)
 
 IVec3 getTexelBlockPixelSize (deUint32 format)
 {
-       if (isCompressedFormat(format))
+       if (glu::isCompressedFormat(format))
                return tcu::getBlockPixelSize(glu::mapGLCompressedTexFormat(format));
        else
                return IVec3(1, 1, 1);
@@ -477,7 +428,7 @@ void genTexel (de::Random& rng, deUint32 glFormat, int texelBlockSize, const int
                        access.setPixel(color, texelNdx, 0, 0);
                }
        }
-       else if (isCompressedFormat(glFormat))
+       else if (glu::isCompressedFormat(glFormat))
        {
                const tcu::CompressedTexFormat compressedFormat = glu::mapGLCompressedTexFormat(glFormat);
 
@@ -572,7 +523,7 @@ void genericTexImage (const glw::Functions& gl,
 
        DE_ASSERT(target == GL_TEXTURE_CUBE_MAP || faceNdx == 0);
 
-       if (isCompressedFormat(format))
+       if (glu::isCompressedFormat(format))
        {
                switch (getTargetTexDims(target))
                {
@@ -672,7 +623,7 @@ void genRenderbufferImage (const glw::Functions&                    gl,
        DE_ASSERT(info.getTarget() == GL_RENDERBUFFER);
        DE_ASSERT(info.getSize().z() == 1);
        DE_ASSERT(getLevelCount(info) == 1);
-       DE_ASSERT(!isCompressedFormat(info.getFormat()));
+       DE_ASSERT(!glu::isCompressedFormat(info.getFormat()));
 
        glu::Framebuffer framebuffer(gl);
 
@@ -1021,7 +972,7 @@ void verifyTexture2D (tcu::TestContext&                                            testContext,
                                          const vector<ArrayBuffer<deUint8> >&  data,
                                          const ImageInfo&                                              info)
 {
-       if (isCompressedFormat(info.getFormat()))
+       if (glu::isCompressedFormat(info.getFormat()))
        {
                vector<de::ArrayBuffer<deUint8> >       levelDatas;
                vector<tcu::PixelBufferAccess>          levelAccesses;
@@ -1122,7 +1073,7 @@ void verifyTexture3D (tcu::TestContext&                                           testContext,
                                          const vector<ArrayBuffer<deUint8> >&  data,
                                          const ImageInfo&                                              info)
 {
-       if (isCompressedFormat(info.getFormat()))
+       if (glu::isCompressedFormat(info.getFormat()))
        {
                vector<de::ArrayBuffer<deUint8> >       levelDatas;
                vector<tcu::PixelBufferAccess>          levelAccesses;
@@ -1226,7 +1177,7 @@ void verifyTextureCubemap (tcu::TestContext&                                      testContext,
                                                   const vector<ArrayBuffer<deUint8> >& data,
                                                   const ImageInfo&                                             info)
 {
-       if (isCompressedFormat(info.getFormat()))
+       if (glu::isCompressedFormat(info.getFormat()))
        {
                const tcu::CompressedTexFormat& compressedFormat        = glu::mapGLCompressedTexFormat(info.getFormat());
                const tcu::TextureFormat&               decompressedFormat      = tcu::getUncompressedFormat(compressedFormat);
@@ -1385,7 +1336,7 @@ void verifyTexture2DArray (tcu::TestContext&                                      testContext,
                                                   const vector<ArrayBuffer<deUint8> >& data,
                                                   const ImageInfo&                                             info)
 {
-       if (isCompressedFormat(info.getFormat()))
+       if (glu::isCompressedFormat(info.getFormat()))
        {
                vector<de::ArrayBuffer<deUint8> >       levelDatas;
                vector<tcu::PixelBufferAccess>          levelAccesses;
@@ -1657,7 +1608,7 @@ CopyImageTest::~CopyImageTest (void)
 
 void checkFormatSupport (glu::ContextInfo& info, deUint32 format)
 {
-       if (isCompressedFormat(format))
+       if (glu::isCompressedFormat(format))
        {
                if (isAstcFormat(glu::mapGLCompressedTexFormat(format)))
                {
@@ -2054,13 +2005,13 @@ void addCopyTests (TestCaseGroup* root, deUint32 srcFormat, deUint32 dstFormat)
                const IVec3             srcTexelBlockPixelSize  = getTexelBlockPixelSize(srcFormat);
                const bool              srcIs3D                                 = srcTarget == GL_TEXTURE_2D_ARRAY || srcTarget == GL_TEXTURE_3D;
 
-               if (isCompressedFormat(srcFormat) && srcTarget == GL_RENDERBUFFER)
+               if (glu::isCompressedFormat(srcFormat) && srcTarget == GL_RENDERBUFFER)
                        continue;
 
                if (srcTarget == GL_RENDERBUFFER && !isColorRenderable(srcFormat))
                        continue;
 
-               if (isCompressedFormat(srcFormat) && !tcu::isAstcFormat(glu::mapGLCompressedTexFormat(srcFormat)) && srcIs3D)
+               if (glu::isCompressedFormat(srcFormat) && !tcu::isAstcFormat(glu::mapGLCompressedTexFormat(srcFormat)) && srcIs3D)
                        continue;
 
                for (int dstTargetNdx = 0; dstTargetNdx < DE_LENGTH_OF_ARRAY(targets); dstTargetNdx++)
@@ -2069,13 +2020,13 @@ void addCopyTests (TestCaseGroup* root, deUint32 srcFormat, deUint32 dstFormat)
                        const IVec3             dstTexelBlockPixelSize  = getTexelBlockPixelSize(dstFormat);
                        const bool              dstIs3D                                 = dstTarget == GL_TEXTURE_2D_ARRAY || dstTarget == GL_TEXTURE_3D;
 
-                       if (isCompressedFormat(dstFormat) && dstTarget == GL_RENDERBUFFER)
+                       if (glu::isCompressedFormat(dstFormat) && dstTarget == GL_RENDERBUFFER)
                                continue;
 
                        if (dstTarget == GL_RENDERBUFFER && !isColorRenderable(dstFormat))
                                continue;
 
-                       if (isCompressedFormat(dstFormat) && !tcu::isAstcFormat(glu::mapGLCompressedTexFormat(dstFormat)) && dstIs3D)
+                       if (glu::isCompressedFormat(dstFormat) && !tcu::isAstcFormat(glu::mapGLCompressedTexFormat(dstFormat)) && dstIs3D)
                                continue;
 
                        const string    targetTestName  = string(targetToName(srcTarget)) + "_to_" + targetToName(dstTarget);