Add cube gather tests that avoid corners; remove D32F from mustpass

This change adds new no_corners sub-groups to cube map texture gather
tests. Tests in those groups don't sample around cube map corners,
avoiding a HW issue on certain GPUs. All new tests are included in MR1
mustpass.

GL_DEPTH_COMPONENT32F cube gather cases that sample around corners are
removed from mustpass by request.

Additionally this resolves a bug with filling mipmap levels high up in
the mipmap chain in gather tests.

Bug: 18434194
Change-Id: Ib1635aefba4f1d64a15d22e481b79229573a64a7

diff --git a/android/cts/es31-lmp-mr1.txt b/android/cts/es31-lmp-mr1.txt
index c973611..fdaa5cd 100644 (file)
--- a/android/cts/es31-lmp-mr1.txt
+++ b/android/cts/es31-lmp-mr1.txt
@@ -10244,6 +10244,12 @@ dEQP-GLES31.functional.texture.gather.basic.cube.rgba8.size_pot.mirrored_repeat_
 dEQP-GLES31.functional.texture.gather.basic.cube.rgba8.size_npot.clamp_to_edge_repeat
 dEQP-GLES31.functional.texture.gather.basic.cube.rgba8.size_npot.repeat_mirrored_repeat
 dEQP-GLES31.functional.texture.gather.basic.cube.rgba8.size_npot.mirrored_repeat_clamp_to_edge
+dEQP-GLES31.functional.texture.gather.basic.cube.rgba8.no_corners.size_pot.clamp_to_edge_repeat
+dEQP-GLES31.functional.texture.gather.basic.cube.rgba8.no_corners.size_pot.repeat_mirrored_repeat
+dEQP-GLES31.functional.texture.gather.basic.cube.rgba8.no_corners.size_pot.mirrored_repeat_clamp_to_edge
+dEQP-GLES31.functional.texture.gather.basic.cube.rgba8.no_corners.size_npot.clamp_to_edge_repeat
+dEQP-GLES31.functional.texture.gather.basic.cube.rgba8.no_corners.size_npot.repeat_mirrored_repeat
+dEQP-GLES31.functional.texture.gather.basic.cube.rgba8.no_corners.size_npot.mirrored_repeat_clamp_to_edge
 dEQP-GLES31.functional.texture.gather.basic.cube.rgba8.texture_swizzle.green_blue_alpha_zero
 dEQP-GLES31.functional.texture.gather.basic.cube.rgba8.texture_swizzle.blue_alpha_zero_one
 dEQP-GLES31.functional.texture.gather.basic.cube.rgba8.texture_swizzle.alpha_zero_one_red
@@ -10262,6 +10268,12 @@ dEQP-GLES31.functional.texture.gather.basic.cube.rgba8ui.size_pot.mirrored_repea
 dEQP-GLES31.functional.texture.gather.basic.cube.rgba8ui.size_npot.clamp_to_edge_repeat
 dEQP-GLES31.functional.texture.gather.basic.cube.rgba8ui.size_npot.repeat_mirrored_repeat
 dEQP-GLES31.functional.texture.gather.basic.cube.rgba8ui.size_npot.mirrored_repeat_clamp_to_edge
+dEQP-GLES31.functional.texture.gather.basic.cube.rgba8ui.no_corners.size_pot.clamp_to_edge_repeat
+dEQP-GLES31.functional.texture.gather.basic.cube.rgba8ui.no_corners.size_pot.repeat_mirrored_repeat
+dEQP-GLES31.functional.texture.gather.basic.cube.rgba8ui.no_corners.size_pot.mirrored_repeat_clamp_to_edge
+dEQP-GLES31.functional.texture.gather.basic.cube.rgba8ui.no_corners.size_npot.clamp_to_edge_repeat
+dEQP-GLES31.functional.texture.gather.basic.cube.rgba8ui.no_corners.size_npot.repeat_mirrored_repeat
+dEQP-GLES31.functional.texture.gather.basic.cube.rgba8ui.no_corners.size_npot.mirrored_repeat_clamp_to_edge
 dEQP-GLES31.functional.texture.gather.basic.cube.rgba8ui.texture_swizzle.green_blue_alpha_zero
 dEQP-GLES31.functional.texture.gather.basic.cube.rgba8ui.texture_swizzle.blue_alpha_zero_one
 dEQP-GLES31.functional.texture.gather.basic.cube.rgba8ui.texture_swizzle.alpha_zero_one_red
@@ -10276,6 +10288,12 @@ dEQP-GLES31.functional.texture.gather.basic.cube.rgba8i.size_pot.mirrored_repeat
 dEQP-GLES31.functional.texture.gather.basic.cube.rgba8i.size_npot.clamp_to_edge_repeat
 dEQP-GLES31.functional.texture.gather.basic.cube.rgba8i.size_npot.repeat_mirrored_repeat
 dEQP-GLES31.functional.texture.gather.basic.cube.rgba8i.size_npot.mirrored_repeat_clamp_to_edge
+dEQP-GLES31.functional.texture.gather.basic.cube.rgba8i.no_corners.size_pot.clamp_to_edge_repeat
+dEQP-GLES31.functional.texture.gather.basic.cube.rgba8i.no_corners.size_pot.repeat_mirrored_repeat
+dEQP-GLES31.functional.texture.gather.basic.cube.rgba8i.no_corners.size_pot.mirrored_repeat_clamp_to_edge
+dEQP-GLES31.functional.texture.gather.basic.cube.rgba8i.no_corners.size_npot.clamp_to_edge_repeat
+dEQP-GLES31.functional.texture.gather.basic.cube.rgba8i.no_corners.size_npot.repeat_mirrored_repeat
+dEQP-GLES31.functional.texture.gather.basic.cube.rgba8i.no_corners.size_npot.mirrored_repeat_clamp_to_edge
 dEQP-GLES31.functional.texture.gather.basic.cube.rgba8i.texture_swizzle.green_blue_alpha_zero
 dEQP-GLES31.functional.texture.gather.basic.cube.rgba8i.texture_swizzle.blue_alpha_zero_one
 dEQP-GLES31.functional.texture.gather.basic.cube.rgba8i.texture_swizzle.alpha_zero_one_red
@@ -10284,25 +10302,18 @@ dEQP-GLES31.functional.texture.gather.basic.cube.rgba8i.texture_swizzle.one_red_
 dEQP-GLES31.functional.texture.gather.basic.cube.rgba8i.filter_mode.min_nearest_mipmap_nearest_mag_nearest
 dEQP-GLES31.functional.texture.gather.basic.cube.rgba8i.base_level.level_1
 dEQP-GLES31.functional.texture.gather.basic.cube.rgba8i.base_level.level_2
-dEQP-GLES31.functional.texture.gather.basic.cube.depth32f.size_pot.compare_less.clamp_to_edge_repeat
-dEQP-GLES31.functional.texture.gather.basic.cube.depth32f.size_pot.compare_less.repeat_mirrored_repeat
-dEQP-GLES31.functional.texture.gather.basic.cube.depth32f.size_pot.compare_less.mirrored_repeat_clamp_to_edge
-dEQP-GLES31.functional.texture.gather.basic.cube.depth32f.size_pot.compare_greater.clamp_to_edge_repeat
-dEQP-GLES31.functional.texture.gather.basic.cube.depth32f.size_pot.compare_greater.repeat_mirrored_repeat
-dEQP-GLES31.functional.texture.gather.basic.cube.depth32f.size_pot.compare_greater.mirrored_repeat_clamp_to_edge
-dEQP-GLES31.functional.texture.gather.basic.cube.depth32f.size_npot.compare_less.clamp_to_edge_repeat
-dEQP-GLES31.functional.texture.gather.basic.cube.depth32f.size_npot.compare_less.repeat_mirrored_repeat
-dEQP-GLES31.functional.texture.gather.basic.cube.depth32f.size_npot.compare_less.mirrored_repeat_clamp_to_edge
-dEQP-GLES31.functional.texture.gather.basic.cube.depth32f.size_npot.compare_greater.clamp_to_edge_repeat
-dEQP-GLES31.functional.texture.gather.basic.cube.depth32f.size_npot.compare_greater.repeat_mirrored_repeat
-dEQP-GLES31.functional.texture.gather.basic.cube.depth32f.size_npot.compare_greater.mirrored_repeat_clamp_to_edge
-dEQP-GLES31.functional.texture.gather.basic.cube.depth32f.filter_mode.min_linear_mag_linear
-dEQP-GLES31.functional.texture.gather.basic.cube.depth32f.filter_mode.min_nearest_mipmap_nearest_mag_linear
-dEQP-GLES31.functional.texture.gather.basic.cube.depth32f.filter_mode.min_nearest_mipmap_linear_mag_linear
-dEQP-GLES31.functional.texture.gather.basic.cube.depth32f.filter_mode.min_linear_mipmap_nearest_mag_linear
-dEQP-GLES31.functional.texture.gather.basic.cube.depth32f.filter_mode.min_linear_mipmap_linear_mag_linear
-dEQP-GLES31.functional.texture.gather.basic.cube.depth32f.base_level.level_1
-dEQP-GLES31.functional.texture.gather.basic.cube.depth32f.base_level.level_2
+dEQP-GLES31.functional.texture.gather.basic.cube.depth32f.no_corners.size_pot.compare_less.clamp_to_edge_repeat
+dEQP-GLES31.functional.texture.gather.basic.cube.depth32f.no_corners.size_pot.compare_less.repeat_mirrored_repeat
+dEQP-GLES31.functional.texture.gather.basic.cube.depth32f.no_corners.size_pot.compare_less.mirrored_repeat_clamp_to_edge
+dEQP-GLES31.functional.texture.gather.basic.cube.depth32f.no_corners.size_pot.compare_greater.clamp_to_edge_repeat
+dEQP-GLES31.functional.texture.gather.basic.cube.depth32f.no_corners.size_pot.compare_greater.repeat_mirrored_repeat
+dEQP-GLES31.functional.texture.gather.basic.cube.depth32f.no_corners.size_pot.compare_greater.mirrored_repeat_clamp_to_edge
+dEQP-GLES31.functional.texture.gather.basic.cube.depth32f.no_corners.size_npot.compare_less.clamp_to_edge_repeat
+dEQP-GLES31.functional.texture.gather.basic.cube.depth32f.no_corners.size_npot.compare_less.repeat_mirrored_repeat
+dEQP-GLES31.functional.texture.gather.basic.cube.depth32f.no_corners.size_npot.compare_less.mirrored_repeat_clamp_to_edge
+dEQP-GLES31.functional.texture.gather.basic.cube.depth32f.no_corners.size_npot.compare_greater.clamp_to_edge_repeat
+dEQP-GLES31.functional.texture.gather.basic.cube.depth32f.no_corners.size_npot.compare_greater.repeat_mirrored_repeat
+dEQP-GLES31.functional.texture.gather.basic.cube.depth32f.no_corners.size_npot.compare_greater.mirrored_repeat_clamp_to_edge
 dEQP-GLES31.functional.texture.gather.offset.min_required_offset.2d.rgba8.size_pot.clamp_to_edge_repeat
 dEQP-GLES31.functional.texture.gather.offset.min_required_offset.2d.rgba8.size_pot.repeat_mirrored_repeat
 dEQP-GLES31.functional.texture.gather.offset.min_required_offset.2d.rgba8.size_pot.mirrored_repeat_clamp_to_edge

diff --git a/modules/gles31/functional/es31fTextureGatherTests.cpp b/modules/gles31/functional/es31fTextureGatherTests.cpp
index a35444c..74e6354 100644 (file)
--- a/modules/gles31/functional/es31fTextureGatherTests.cpp
+++ b/modules/gles31/functional/es31fTextureGatherTests.cpp
@@ -85,8 +85,8 @@ static inline int divRoundToZero (int a, int b)
 
 static void fillWithRandomColorTiles (const PixelBufferAccess& dst, const Vec4& minVal, const Vec4& maxVal, deUint32 seed)
 {
-       const int       numCols         = 7;
-       const int       numRows         = 5;
+       const int       numCols         = dst.getWidth()  >= 7 ? 7 : dst.getWidth();
+       const int       numRows         = dst.getHeight() >= 5 ? 5 : dst.getHeight();
        de::Random      rnd                     (seed);
 
        for (int slice = 0; slice < dst.getDepth(); slice++)
@@ -751,6 +751,12 @@ enum GatherType
        GATHERTYPE_LAST
 };
 
+enum GatherCaseFlags
+{
+       GATHERCASE_MIPMAP_INCOMPLETE            = (1<<0),       //!< Excercise special case of sampling mipmap-incomplete texture
+       GATHERCASE_DONT_SAMPLE_CUBE_CORNERS     = (1<<1)        //!< For cube map cases: do not sample cube corners
+};
+
 static inline const char* gatherTypeName (GatherType type)
 {
        switch (type)
@@ -950,7 +956,7 @@ public:
                                                                                                                                 tcu::Sampler::FilterMode       minFilter,
                                                                                                                                 tcu::Sampler::FilterMode       magFilter,
                                                                                                                                 int                                            baseLevel,
-                                                                                                                                bool                                           mipmapIncomplete);
+                                                                                                                                deUint32                                       flags);
 
        void                                                            init                                    (void);
        void                                                            deinit                                  (void);
@@ -982,7 +988,7 @@ protected:
        const tcu::Sampler::FilterMode          m_minFilter;
        const tcu::Sampler::FilterMode          m_magFilter;
        const int                                                       m_baseLevel;
-       const bool                                                      m_mipmapIncomplete;
+       const deUint32                                          m_flags;
 
 private:
        enum
@@ -1024,7 +1030,7 @@ TextureGatherCase::TextureGatherCase (Context&                                            context,
                                                                          tcu::Sampler::FilterMode              minFilter,
                                                                          tcu::Sampler::FilterMode              magFilter,
                                                                          int                                                   baseLevel,
-                                                                         bool                                                  mipmapIncomplete)
+                                                                         deUint32                                              flags)
        : TestCase                              (context, name, description)
        , m_gatherType                  (gatherType)
        , m_offsetSize                  (offsetSize)
@@ -1036,7 +1042,7 @@ TextureGatherCase::TextureGatherCase (Context&                                            context,
        , m_minFilter                   (minFilter)
        , m_magFilter                   (magFilter)
        , m_baseLevel                   (baseLevel)
-       , m_mipmapIncomplete    (mipmapIncomplete)
+       , m_flags                               (flags)
        , m_textureType                 (textureType)
        , m_colorBufferFormat   (tcu::TextureFormat(tcu::TextureFormat::RGBA,
                                                                                                isDepthFormat(textureFormat) ? tcu::TextureFormat::UNORM_INT8 : textureFormat.type))
@@ -1051,8 +1057,9 @@ TextureGatherCase::TextureGatherCase (Context&                                            context,
                          m_colorBufferFormat.type == tcu::TextureFormat::SIGNED_INT16);
        DE_ASSERT(glu::isGLInternalColorFormatFilterable(glu::getInternalFormat(m_colorBufferFormat)) ||
                          (m_magFilter == tcu::Sampler::NEAREST && (m_minFilter == tcu::Sampler::NEAREST || m_minFilter == tcu::Sampler::NEAREST_MIPMAP_NEAREST)));
-       DE_ASSERT(isMipmapFilter(m_minFilter) || !m_mipmapIncomplete);
-       DE_ASSERT(!(m_mipmapIncomplete && isDepthFormat(m_textureFormat))); // It's not clear what shadow textures should return when incomplete.
+       DE_ASSERT(isMipmapFilter(m_minFilter) || !(m_flags & GATHERCASE_MIPMAP_INCOMPLETE));
+       DE_ASSERT(m_textureType == TEXTURETYPE_CUBE || !(m_flags & GATHERCASE_DONT_SAMPLE_CUBE_CORNERS));
+       DE_ASSERT(!((m_flags & GATHERCASE_MIPMAP_INCOMPLETE) && isDepthFormat(m_textureFormat))); // It's not clear what shadow textures should return when incomplete.
 }
 
 IVec2 TextureGatherCase::getOffsetRange (void) const
@@ -1306,7 +1313,7 @@ void TextureGatherCase::init (void)
                << TestLog::Message << "Minification and magnification filter modes are "
                                                        << glu::getTextureFilterName(glu::getGLFilterMode(m_minFilter)) << " and "
                                                        << glu::getTextureFilterName(glu::getGLFilterMode(m_magFilter)) << ", respectively "
-                                                       << (m_mipmapIncomplete ?
+                                                       << ((m_flags & GATHERCASE_MIPMAP_INCOMPLETE) ?
                                                                "(note that they cause the texture to be incomplete)" :
                                                                "(note that they should have no effect on gather result)")
                                                        << TestLog::EndMessage
@@ -1448,7 +1455,7 @@ bool TextureGatherCase::verify (const ConstPixelBufferAccess&     rendered,
 {
        TestLog& log = m_testCtx.getLog();
 
-       if (m_mipmapIncomplete)
+       if (m_flags & GATHERCASE_MIPMAP_INCOMPLETE)
        {
                const int       componentNdx            = de::max(0, gatherArgs.componentNdx);
                const Vec4      incompleteColor         (0.0f, 0.0f, 0.0f, 1.0f);
@@ -1623,9 +1630,9 @@ public:
                                                 tcu::Sampler::FilterMode       minFilter,
                                                 tcu::Sampler::FilterMode       magFilter,
                                                 int                                            baseLevel,
-                                                bool                                           mipmapIncomplete,
+                                                deUint32                                       flags,
                                                 const IVec2&                           textureSize)
-               : TextureGatherCase             (context, name, description, TEXTURETYPE_2D, gatherType, offsetSize, textureFormat, shadowCompareMode, wrapS, wrapT, texSwizzle, minFilter, magFilter, baseLevel, mipmapIncomplete)
+               : TextureGatherCase             (context, name, description, TEXTURETYPE_2D, gatherType, offsetSize, textureFormat, shadowCompareMode, wrapS, wrapT, texSwizzle, minFilter, magFilter, baseLevel, flags)
                , m_textureSize                 (textureSize)
                , m_swizzledTexture             (tcu::TextureFormat(), 1, 1)
        {
@@ -1671,7 +1678,7 @@ void TextureGather2DCase::createAndUploadTexture (void)
        {
                tcu::Texture2D&         refTexture      = m_texture->getRefTexture();
                const int                       levelBegin      = m_baseLevel;
-               const int                       levelEnd        = isMipmapFilter(m_minFilter) && !m_mipmapIncomplete ? refTexture.getNumLevels() : m_baseLevel+1;
+               const int                       levelEnd        = isMipmapFilter(m_minFilter) && !(m_flags & GATHERCASE_MIPMAP_INCOMPLETE) ? refTexture.getNumLevels() : m_baseLevel+1;
                DE_ASSERT(m_baseLevel < refTexture.getNumLevels());
 
                for (int levelNdx = levelBegin; levelNdx < levelEnd; levelNdx++)
@@ -1713,9 +1720,9 @@ public:
                                                          tcu::Sampler::FilterMode              minFilter,
                                                          tcu::Sampler::FilterMode              magFilter,
                                                          int                                                   baseLevel,
-                                                         bool                                                  mipmapIncomplete,
+                                                         deUint32                                              flags,
                                                          const IVec3&                                  textureSize)
-               : TextureGatherCase             (context, name, description, TEXTURETYPE_2D_ARRAY, gatherType, offsetSize, textureFormat, shadowCompareMode, wrapS, wrapT, texSwizzle, minFilter, magFilter, baseLevel, mipmapIncomplete)
+               : TextureGatherCase             (context, name, description, TEXTURETYPE_2D_ARRAY, gatherType, offsetSize, textureFormat, shadowCompareMode, wrapS, wrapT, texSwizzle, minFilter, magFilter, baseLevel, flags)
                , m_textureSize                 (textureSize)
                , m_swizzledTexture             (tcu::TextureFormat(), 1, 1, 1)
        {
@@ -1798,7 +1805,7 @@ void TextureGather2DArrayCase::createAndUploadTexture (void)
        {
                tcu::Texture2DArray&    refTexture      = m_texture->getRefTexture();
                const int                               levelBegin      = m_baseLevel;
-               const int                               levelEnd        = isMipmapFilter(m_minFilter) && !m_mipmapIncomplete ? refTexture.getNumLevels() : m_baseLevel+1;
+               const int                               levelEnd        = isMipmapFilter(m_minFilter) && !(m_flags & GATHERCASE_MIPMAP_INCOMPLETE) ? refTexture.getNumLevels() : m_baseLevel+1;
                DE_ASSERT(m_baseLevel < refTexture.getNumLevels());
 
                for (int levelNdx = levelBegin; levelNdx < levelEnd; levelNdx++)
@@ -1845,9 +1852,9 @@ public:
                                                   tcu::Sampler::FilterMode             minFilter,
                                                   tcu::Sampler::FilterMode             magFilter,
                                                   int                                                  baseLevel,
-                                                  bool                                                 mipmapIncomplete,
+                                                  deUint32                                             flags,
                                                   int                                                  textureSize)
-               : TextureGatherCase             (context, name, description, TEXTURETYPE_CUBE, GATHERTYPE_BASIC, OFFSETSIZE_NONE, textureFormat, shadowCompareMode, wrapS, wrapT, texSwizzle, minFilter, magFilter, baseLevel, mipmapIncomplete)
+               : TextureGatherCase             (context, name, description, TEXTURETYPE_CUBE, GATHERTYPE_BASIC, OFFSETSIZE_NONE, textureFormat, shadowCompareMode, wrapS, wrapT, texSwizzle, minFilter, magFilter, baseLevel, flags)
                , m_textureSize                 (textureSize)
                , m_swizzledTexture             (tcu::TextureFormat(), 1)
        {
@@ -1877,8 +1884,11 @@ private:
 
 vector<float> TextureGatherCubeCase::computeQuadTexCoord (int iterationNdx) const
 {
-       vector<float> res;
-       gls::TextureTestUtil::computeQuadTexCoordCube(res, m_iterations[iterationNdx].face, Vec2(-1.2f), Vec2(1.2f));
+       const bool              corners = (m_flags & GATHERCASE_DONT_SAMPLE_CUBE_CORNERS) == 0;
+       const Vec2              minC    = corners ? Vec2(-1.2f) : Vec2(-0.6f, -1.2f);
+       const Vec2              maxC    = corners ? Vec2( 1.2f) : Vec2( 0.6f,  1.2f);
+       vector<float>   res;
+       gls::TextureTestUtil::computeQuadTexCoordCube(res, m_iterations[iterationNdx].face, minC, maxC);
        return res;
 }
 
@@ -1931,7 +1941,7 @@ void TextureGatherCubeCase::createAndUploadTexture (void)
        {
                tcu::TextureCube&       refTexture      = m_texture->getRefTexture();
                const int                       levelBegin      = m_baseLevel;
-               const int                       levelEnd        = isMipmapFilter(m_minFilter) && !m_mipmapIncomplete ? refTexture.getNumLevels() : m_baseLevel+1;
+               const int                       levelEnd        = isMipmapFilter(m_minFilter) && !(m_flags & GATHERCASE_MIPMAP_INCOMPLETE) ? refTexture.getNumLevels() : m_baseLevel+1;
                DE_ASSERT(m_baseLevel < refTexture.getNumLevels());
 
                for (int levelNdx = levelBegin; levelNdx < levelEnd; levelNdx++)
@@ -1983,23 +1993,23 @@ static inline TextureGatherCase* makeTextureGatherCase (TextureType                                     textureT
                                                                                                                tcu::Sampler::FilterMode        magFilter,
                                                                                                                int                                                     baseLevel,
                                                                                                                const IVec3&                            textureSize,
-                                                                                                               bool                                            mipmapIncomplete = false)
+                                                                                                               deUint32                                        flags = 0)
 {
        switch (textureType)
        {
                case TEXTURETYPE_2D:
                        return new TextureGather2DCase(context, name, description, gatherType, offsetSize, textureFormat, shadowCompareMode,
-                                                                                  wrapS, wrapT, texSwizzle, minFilter, magFilter, baseLevel, mipmapIncomplete, textureSize.swizzle(0, 1));
+                                                                                  wrapS, wrapT, texSwizzle, minFilter, magFilter, baseLevel, flags, textureSize.swizzle(0, 1));
 
                case TEXTURETYPE_2D_ARRAY:
                        return new TextureGather2DArrayCase(context, name, description, gatherType, offsetSize, textureFormat, shadowCompareMode,
-                                                                                               wrapS, wrapT, texSwizzle, minFilter, magFilter, baseLevel, mipmapIncomplete, textureSize);
+                                                                                               wrapS, wrapT, texSwizzle, minFilter, magFilter, baseLevel, flags, textureSize);
 
                case TEXTURETYPE_CUBE:
                        DE_ASSERT(gatherType == GATHERTYPE_BASIC);
                        DE_ASSERT(offsetSize == OFFSETSIZE_NONE);
                        return new TextureGatherCubeCase(context, name, description, textureFormat, shadowCompareMode,
-                                                                                        wrapS, wrapT, texSwizzle, minFilter, magFilter, baseLevel, mipmapIncomplete, textureSize.x());
+                                                                                        wrapS, wrapT, texSwizzle, minFilter, magFilter, baseLevel, flags, textureSize.x());
 
                default:
                        DE_ASSERT(false);
@@ -2116,43 +2126,55 @@ void TextureGatherTests::init (void)
                                        TestCaseGroup* const            formatGroup             = new TestCaseGroup(m_context, formats[formatNdx].name, "");
                                        textureTypeGroup->addChild(formatGroup);
 
-                                       for (int textureSizeNdx = 0; textureSizeNdx < DE_LENGTH_OF_ARRAY(textureSizes); textureSizeNdx++)
+                                       for (int noCornersI = 0; noCornersI <= (textureType == TEXTURETYPE_CUBE)?1:0; noCornersI++)
                                        {
-                                               const IVec3&                    textureSize                     = textureSizes[textureSizeNdx].size;
-                                               TestCaseGroup* const    textureSizeGroup        = new TestCaseGroup(m_context, textureSizes[textureSizeNdx].name, "");
-                                               formatGroup->addChild(textureSizeGroup);
+                                               const bool                              noCorners               = noCornersI!= 0;
+                                               TestCaseGroup* const    cornersGroup    = noCorners
+                                                                                                                               ? new TestCaseGroup(m_context, "no_corners", "Test case variants that don't sample around cube map corners")
+                                                                                                                               : formatGroup;
+
+                                               if (formatGroup != cornersGroup)
+                                                       formatGroup->addChild(cornersGroup);
 
-                                               for (int compareModeI = 0; compareModeI < tcu::Sampler::COMPAREMODE_LAST; compareModeI++)
+                                               for (int textureSizeNdx = 0; textureSizeNdx < DE_LENGTH_OF_ARRAY(textureSizes); textureSizeNdx++)
                                                {
-                                                       const tcu::Sampler::CompareMode compareMode = (tcu::Sampler::CompareMode)compareModeI;
+                                                       const IVec3&                    textureSize                     = textureSizes[textureSizeNdx].size;
+                                                       TestCaseGroup* const    textureSizeGroup        = new TestCaseGroup(m_context, textureSizes[textureSizeNdx].name, "");
+                                                       cornersGroup->addChild(textureSizeGroup);
+
+                                                       for (int compareModeI = 0; compareModeI < tcu::Sampler::COMPAREMODE_LAST; compareModeI++)
+                                                       {
+                                                               const tcu::Sampler::CompareMode compareMode = (tcu::Sampler::CompareMode)compareModeI;
 
-                                                       if ((compareMode != tcu::Sampler::COMPAREMODE_NONE) != isDepthFormat(format))
-                                                               continue;
+                                                               if ((compareMode != tcu::Sampler::COMPAREMODE_NONE) != isDepthFormat(format))
+                                                                       continue;
 
-                                                       if (compareMode != tcu::Sampler::COMPAREMODE_NONE &&
-                                                               compareMode != tcu::Sampler::COMPAREMODE_LESS &&
-                                                               compareMode != tcu::Sampler::COMPAREMODE_GREATER)
-                                                               continue;
+                                                               if (compareMode != tcu::Sampler::COMPAREMODE_NONE &&
+                                                                       compareMode != tcu::Sampler::COMPAREMODE_LESS &&
+                                                                       compareMode != tcu::Sampler::COMPAREMODE_GREATER)
+                                                                       continue;
 
-                                                       TestCaseGroup* const compareModeGroup = compareMode == tcu::Sampler::COMPAREMODE_NONE ?
-                                                                                                                                               textureSizeGroup :
-                                                                                                                                               new TestCaseGroup(m_context,
-                                                                                                                                                                                 (string() + "compare_" + compareModeName(compareMode)).c_str(),
-                                                                                                                                                                                 "");
-                                                       if (compareModeGroup != textureSizeGroup)
-                                                               textureSizeGroup->addChild(compareModeGroup);
+                                                               TestCaseGroup* const compareModeGroup = compareMode == tcu::Sampler::COMPAREMODE_NONE ?
+                                                                                                                                                       textureSizeGroup :
+                                                                                                                                                       new TestCaseGroup(m_context,
+                                                                                                                                                                                         (string() + "compare_" + compareModeName(compareMode)).c_str(),
+                                                                                                                                                                                         "");
+                                                               if (compareModeGroup != textureSizeGroup)
+                                                                       textureSizeGroup->addChild(compareModeGroup);
 
-                                                       for (int wrapCaseNdx = 0; wrapCaseNdx < DE_LENGTH_OF_ARRAY(wrapModes); wrapCaseNdx++)
-                                                       {
-                                                               const int                                               wrapSNdx        = wrapCaseNdx;
-                                                               const int                                               wrapTNdx        = (wrapCaseNdx + 1) % DE_LENGTH_OF_ARRAY(wrapModes);
-                                                               const tcu::Sampler::WrapMode    wrapS           = wrapModes[wrapSNdx].mode;
-                                                               const tcu::Sampler::WrapMode    wrapT           = wrapModes[wrapTNdx].mode;
+                                                               for (int wrapCaseNdx = 0; wrapCaseNdx < DE_LENGTH_OF_ARRAY(wrapModes); wrapCaseNdx++)
+                                                               {
+                                                                       const int                                               wrapSNdx        = wrapCaseNdx;
+                                                                       const int                                               wrapTNdx        = (wrapCaseNdx + 1) % DE_LENGTH_OF_ARRAY(wrapModes);
+                                                                       const tcu::Sampler::WrapMode    wrapS           = wrapModes[wrapSNdx].mode;
+                                                                       const tcu::Sampler::WrapMode    wrapT           = wrapModes[wrapTNdx].mode;
 
-                                                               const string caseName = string() + wrapModes[wrapSNdx].name + "_" + wrapModes[wrapTNdx].name;
+                                                                       const string caseName = string() + wrapModes[wrapSNdx].name + "_" + wrapModes[wrapTNdx].name;
 
-                                                               compareModeGroup->addChild(makeTextureGatherCase(textureType, m_context, caseName.c_str(), "", gatherType, offsetSize, format, compareMode, wrapS, wrapT,
-                                                                                                                                                                MaybeTextureSwizzle::createNoneTextureSwizzle(), tcu::Sampler::NEAREST, tcu::Sampler::NEAREST, 0, textureSize));
+                                                                       compareModeGroup->addChild(makeTextureGatherCase(textureType, m_context, caseName.c_str(), "", gatherType, offsetSize, format, compareMode, wrapS, wrapT,
+                                                                                                                                                                        MaybeTextureSwizzle::createNoneTextureSwizzle(), tcu::Sampler::NEAREST, tcu::Sampler::NEAREST, 0, textureSize,
+                                                                                                                                                                        noCorners ? GATHERCASE_DONT_SAMPLE_CUBE_CORNERS : 0));
+                                                               }
                                                        }
                                                }
                                        }
@@ -2255,7 +2277,7 @@ void TextureGatherTests::init (void)
                                                        incompleteGroup->addChild(makeTextureGatherCase(textureType, m_context, "mipmap_incomplete", "", gatherType, offsetSize, format,
                                                                                                                                                        compareMode, tcu::Sampler::REPEAT_GL, tcu::Sampler::REPEAT_GL,
                                                                                                                                                        MaybeTextureSwizzle::createNoneTextureSwizzle(), tcu::Sampler::NEAREST_MIPMAP_NEAREST, tcu::Sampler::NEAREST,
-                                                                                                                                                       0, IVec3(64, 64, 3), true /* Mipmap-incomplete */));
+                                                                                                                                                       0, IVec3(64, 64, 3), GATHERCASE_MIPMAP_INCOMPLETE));
                                                }
                                        }
                                }