Non-compressed copy image target size (64,64,8)

Non-compressed copy image tests target size reduced to (64,64,8). The
compressed cases retain old size of (128,128,16) to ensure coverage of
all block size combinations.

Test: Run tests on N6 and N9 on L MR 1 with known failures.
Change-Id: I7ddc7c55d73731d0a8cc2fcc04f2391f78d2d7de

diff --git a/modules/gles31/functional/es31fCopyImageTests.cpp b/modules/gles31/functional/es31fCopyImageTests.cpp
index b4e9642..fa66729 100644 (file)
--- a/modules/gles31/functional/es31fCopyImageTests.cpp
+++ b/modules/gles31/functional/es31fCopyImageTests.cpp
@@ -2130,11 +2130,11 @@ void addCopyTests (TestCaseGroup* root, deUint32 srcFormat, deUint32 dstFormat)
 
                        const string    targetTestName  = string(targetToName(srcTarget)) + "_to_" + targetToName(dstTarget);
 
-                       const IVec3             targetSize2D    (128, 128, 1);
-                       const IVec3             targetSize3D    (128, 128, 16);
-
-                       const IVec3             srcSize                 = getTestedSize(srcTarget, srcFormat, (srcIs3D ? targetSize3D : targetSize2D));
-                       const IVec3             dstSize                 = getTestedSize(dstTarget, dstFormat, (dstIs3D ? targetSize3D : targetSize2D));
+                       // Compressed formats require more space to fit all block size combinations.
+                       const bool              isCompressedCase        = glu::isCompressedFormat(srcFormat) || glu::isCompressedFormat(dstFormat);
+                       const IVec3             targetSize                      = isCompressedCase ? IVec3(128, 128, 16) : IVec3(64, 64, 8);
+                       const IVec3             srcSize                         = getTestedSize(srcTarget, srcFormat, targetSize);
+                       const IVec3             dstSize                         = getTestedSize(dstTarget, dstFormat, targetSize);
 
                        group->addChild(new CopyImageTest(root->getContext(),
                                                                                        ImageInfo(srcFormat, srcTarget, srcSize),