am 9252e819: Remove tessellation.user_defined_io.per_patch cases from must pass.

* commit '9252e8197ed615959ad594ecc85fa3c1ed8e2f2d':
  Remove tessellation.user_defined_io.per_patch cases from must pass.

diff --git a/android/cts/com.drawelements.deqp.gles31.xml b/android/cts/com.drawelements.deqp.gles31.xml
index 8e1bf53..1774e84 100644 (file)
--- a/android/cts/com.drawelements.deqp.gles31.xml
+++ b/android/cts/com.drawelements.deqp.gles31.xml
@@ -11481,18 +11481,6 @@
 <Test name="repeat_mirrored_repeat" />
 <Test name="mirrored_repeat_clamp_to_edge" />
 </TestCase>
-<TestSuite name="no_corners">
-<TestCase name="size_pot">
-<Test name="clamp_to_edge_repeat" />
-<Test name="repeat_mirrored_repeat" />
-<Test name="mirrored_repeat_clamp_to_edge" />
-</TestCase>
-<TestCase name="size_npot">
-<Test name="clamp_to_edge_repeat" />
-<Test name="repeat_mirrored_repeat" />
-<Test name="mirrored_repeat_clamp_to_edge" />
-</TestCase>
-</TestSuite>
 <TestCase name="texture_swizzle">
 <Test name="green_blue_alpha_zero" />
 <Test name="blue_alpha_zero_one" />
@@ -11519,18 +11507,6 @@
 <Test name="repeat_mirrored_repeat" />
 <Test name="mirrored_repeat_clamp_to_edge" />
 </TestCase>
-<TestSuite name="no_corners">
-<TestCase name="size_pot">
-<Test name="clamp_to_edge_repeat" />
-<Test name="repeat_mirrored_repeat" />
-<Test name="mirrored_repeat_clamp_to_edge" />
-</TestCase>
-<TestCase name="size_npot">
-<Test name="clamp_to_edge_repeat" />
-<Test name="repeat_mirrored_repeat" />
-<Test name="mirrored_repeat_clamp_to_edge" />
-</TestCase>
-</TestSuite>
 <TestCase name="texture_swizzle">
 <Test name="green_blue_alpha_zero" />
 <Test name="blue_alpha_zero_one" />
@@ -11554,18 +11530,6 @@
 <Test name="repeat_mirrored_repeat" />
 <Test name="mirrored_repeat_clamp_to_edge" />
 </TestCase>
-<TestSuite name="no_corners">
-<TestCase name="size_pot">
-<Test name="clamp_to_edge_repeat" />
-<Test name="repeat_mirrored_repeat" />
-<Test name="mirrored_repeat_clamp_to_edge" />
-</TestCase>
-<TestCase name="size_npot">
-<Test name="clamp_to_edge_repeat" />
-<Test name="repeat_mirrored_repeat" />
-<Test name="mirrored_repeat_clamp_to_edge" />
-</TestCase>
-</TestSuite>
 <TestCase name="texture_swizzle">
 <Test name="green_blue_alpha_zero" />
 <Test name="blue_alpha_zero_one" />
@@ -11579,7 +11543,6 @@
 </TestCase>
 </TestSuite>
 <TestSuite name="depth32f">
-<TestSuite name="no_corners">
 <TestSuite name="size_pot">
 <TestCase name="compare_less">
 <Test name="clamp_to_edge_repeat" />
@@ -11604,7 +11567,13 @@
 <Test name="mirrored_repeat_clamp_to_edge" />
 </TestCase>
 </TestSuite>
-</TestSuite>
+<TestCase name="filter_mode">
+<Test name="min_linear_mag_linear" />
+</TestCase>
+<TestCase name="base_level">
+<Test name="level_1" />
+<Test name="level_2" />
+</TestCase>
 </TestSuite>
 </TestSuite>
 </TestSuite>
@@ -15015,6 +14984,7 @@
 <Test name="mismatch_member_type" />
 <Test name="mismatch_member_name" />
 <Test name="mismatch_member_precision" />
+<Test name="match_different_member_interpolation" />
 <Test name="mismatch_member_array_size" />
 <Test name="match_different_member_struct_names" />
 <Test name="mismatch_member_struct_member_name" />
@@ -15414,6 +15384,7 @@
 <Test name="tessellation_output_triangles_point_mode_geometry_output_lines" />
 <Test name="tessellation_output_quads_point_mode_geometry_output_lines" />
 <Test name="tessellation_output_isolines_point_mode_geometry_output_triangles" />
+<Test name="record_variable_selection" />
 </TestCase>
 <TestCase name="point_size">
 <Test name="vertex_set" />

diff --git a/android/cts/es31-mustpass-2014.2.9-2014-10-24.txt b/android/cts/es31-mustpass-2014.2.9-2014-10-24.txt
index 3187b0b..de2639e 100644 (file)
--- a/android/cts/es31-mustpass-2014.2.9-2014-10-24.txt
+++ b/android/cts/es31-mustpass-2014.2.9-2014-10-24.txt
@@ -10023,12 +10023,6 @@ 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
@@ -10043,12 +10037,6 @@ 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
@@ -10062,12 +10050,6 @@ 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
@@ -10075,18 +10057,21 @@ dEQP-GLES31.functional.texture.gather.basic.cube.rgba8i.texture_swizzle.zero_one
 dEQP-GLES31.functional.texture.gather.basic.cube.rgba8i.texture_swizzle.one_red_green_blue
 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.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.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.base_level.level_1
+dEQP-GLES31.functional.texture.gather.basic.cube.depth32f.base_level.level_2
 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_npot.clamp_to_edge_repeat
 dEQP-GLES31.functional.texture.gather.offset.min_required_offset.2d.rgba8ui.size_pot.clamp_to_edge_repeat
@@ -12617,6 +12602,7 @@ dEQP-GLES31.functional.separate_shader.validation.io_blocks.mismatch_member_orde
 dEQP-GLES31.functional.separate_shader.validation.io_blocks.mismatch_member_type
 dEQP-GLES31.functional.separate_shader.validation.io_blocks.mismatch_member_name
 dEQP-GLES31.functional.separate_shader.validation.io_blocks.mismatch_member_precision
+dEQP-GLES31.functional.separate_shader.validation.io_blocks.match_different_member_interpolation
 dEQP-GLES31.functional.separate_shader.validation.io_blocks.mismatch_member_array_size
 dEQP-GLES31.functional.separate_shader.validation.io_blocks.match_different_member_struct_names
 dEQP-GLES31.functional.separate_shader.validation.io_blocks.mismatch_member_struct_member_name
@@ -12985,6 +12971,7 @@ dEQP-GLES31.functional.tessellation_geometry_interaction.feedback.tessellation_o
 dEQP-GLES31.functional.tessellation_geometry_interaction.feedback.tessellation_output_triangles_point_mode_geometry_output_lines
 dEQP-GLES31.functional.tessellation_geometry_interaction.feedback.tessellation_output_quads_point_mode_geometry_output_lines
 dEQP-GLES31.functional.tessellation_geometry_interaction.feedback.tessellation_output_isolines_point_mode_geometry_output_triangles
+dEQP-GLES31.functional.tessellation_geometry_interaction.feedback.record_variable_selection
 dEQP-GLES31.functional.tessellation_geometry_interaction.point_size.vertex_set
 dEQP-GLES31.functional.tessellation_geometry_interaction.point_size.evaluation_set
 dEQP-GLES31.functional.tessellation_geometry_interaction.point_size.geometry_set

diff --git a/modules/gles31/functional/es31fTessellationTests.cpp b/modules/gles31/functional/es31fTessellationTests.cpp
index 3dfef3b..5743788 100644 (file)
--- a/modules/gles31/functional/es31fTessellationTests.cpp
+++ b/modules/gles31/functional/es31fTessellationTests.cpp
@@ -1322,12 +1322,6 @@ static bool verifyFractionalSpacingSingle (TestLog& log, SpacingMode spacingMode
                                        return false;
                                }
                        }
-                       else
-                       {
-                               // We have 2 segmentsA and 2 segmentsB, ensure segmentsB has the shorter lengths
-                               if (segmentsB[0].length > segmentsA[0].length)
-                                       std::swap(segmentsA, segmentsB);
-                       }
 
                        // Check that the additional segments are placed symmetrically.
                        if (segmentsB[0].index + segmentsB[1].index + 1 != (int)segments.size())
@@ -1344,8 +1338,8 @@ static bool verifyFractionalSpacingSingle (TestLog& log, SpacingMode spacingMode
                                additionalSegmentLocationDst = de::min(segmentsB[0].index, segmentsB[1].index);
                        else
                                additionalSegmentLocationDst = segmentsB[0].length < segmentsA[0].length - 0.001f ? de::min(segmentsB[0].index, segmentsB[1].index)
+                                                                                        : segmentsA[0].length < segmentsB[0].length - 0.001f ? de::min(segmentsA[0].index, segmentsA[1].index)
                                                                                         : -1; // \note -1 when can't reliably decide which ones are the additional segments, a or b.
-
                        return true;
                }
        }

diff --git a/modules/gles31/functional/es31fTextureGatherTests.cpp b/modules/gles31/functional/es31fTextureGatherTests.cpp
index 74e6354..a35444c 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         = dst.getWidth()  >= 7 ? 7 : dst.getWidth();
-       const int       numRows         = dst.getHeight() >= 5 ? 5 : dst.getHeight();
+       const int       numCols         = 7;
+       const int       numRows         = 5;
        de::Random      rnd                     (seed);
 
        for (int slice = 0; slice < dst.getDepth(); slice++)
@@ -751,12 +751,6 @@ 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)
@@ -956,7 +950,7 @@ public:
                                                                                                                                 tcu::Sampler::FilterMode       minFilter,
                                                                                                                                 tcu::Sampler::FilterMode       magFilter,
                                                                                                                                 int                                            baseLevel,
-                                                                                                                                deUint32                                       flags);
+                                                                                                                                bool                                           mipmapIncomplete);
 
        void                                                            init                                    (void);
        void                                                            deinit                                  (void);
@@ -988,7 +982,7 @@ protected:
        const tcu::Sampler::FilterMode          m_minFilter;
        const tcu::Sampler::FilterMode          m_magFilter;
        const int                                                       m_baseLevel;
-       const deUint32                                          m_flags;
+       const bool                                                      m_mipmapIncomplete;
 
 private:
        enum
@@ -1030,7 +1024,7 @@ TextureGatherCase::TextureGatherCase (Context&                                            context,
                                                                          tcu::Sampler::FilterMode              minFilter,
                                                                          tcu::Sampler::FilterMode              magFilter,
                                                                          int                                                   baseLevel,
-                                                                         deUint32                                              flags)
+                                                                         bool                                                  mipmapIncomplete)
        : TestCase                              (context, name, description)
        , m_gatherType                  (gatherType)
        , m_offsetSize                  (offsetSize)
@@ -1042,7 +1036,7 @@ TextureGatherCase::TextureGatherCase (Context&                                            context,
        , m_minFilter                   (minFilter)
        , m_magFilter                   (magFilter)
        , m_baseLevel                   (baseLevel)
-       , m_flags                               (flags)
+       , m_mipmapIncomplete    (mipmapIncomplete)
        , m_textureType                 (textureType)
        , m_colorBufferFormat   (tcu::TextureFormat(tcu::TextureFormat::RGBA,
                                                                                                isDepthFormat(textureFormat) ? tcu::TextureFormat::UNORM_INT8 : textureFormat.type))
@@ -1057,9 +1051,8 @@ 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_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.
+       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.
 }
 
 IVec2 TextureGatherCase::getOffsetRange (void) const
@@ -1313,7 +1306,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_flags & GATHERCASE_MIPMAP_INCOMPLETE) ?
+                                                       << (m_mipmapIncomplete ?
                                                                "(note that they cause the texture to be incomplete)" :
                                                                "(note that they should have no effect on gather result)")
                                                        << TestLog::EndMessage
@@ -1455,7 +1448,7 @@ bool TextureGatherCase::verify (const ConstPixelBufferAccess&     rendered,
 {
        TestLog& log = m_testCtx.getLog();
 
-       if (m_flags & GATHERCASE_MIPMAP_INCOMPLETE)
+       if (m_mipmapIncomplete)
        {
                const int       componentNdx            = de::max(0, gatherArgs.componentNdx);
                const Vec4      incompleteColor         (0.0f, 0.0f, 0.0f, 1.0f);
@@ -1630,9 +1623,9 @@ public:
                                                 tcu::Sampler::FilterMode       minFilter,
                                                 tcu::Sampler::FilterMode       magFilter,
                                                 int                                            baseLevel,
-                                                deUint32                                       flags,
+                                                bool                                           mipmapIncomplete,
                                                 const IVec2&                           textureSize)
-               : TextureGatherCase             (context, name, description, TEXTURETYPE_2D, gatherType, offsetSize, textureFormat, shadowCompareMode, wrapS, wrapT, texSwizzle, minFilter, magFilter, baseLevel, flags)
+               : TextureGatherCase             (context, name, description, TEXTURETYPE_2D, gatherType, offsetSize, textureFormat, shadowCompareMode, wrapS, wrapT, texSwizzle, minFilter, magFilter, baseLevel, mipmapIncomplete)
                , m_textureSize                 (textureSize)
                , m_swizzledTexture             (tcu::TextureFormat(), 1, 1)
        {
@@ -1678,7 +1671,7 @@ void TextureGather2DCase::createAndUploadTexture (void)
        {
                tcu::Texture2D&         refTexture      = m_texture->getRefTexture();
                const int                       levelBegin      = m_baseLevel;
-               const int                       levelEnd        = isMipmapFilter(m_minFilter) && !(m_flags & GATHERCASE_MIPMAP_INCOMPLETE) ? refTexture.getNumLevels() : m_baseLevel+1;
+               const int                       levelEnd        = isMipmapFilter(m_minFilter) && !m_mipmapIncomplete ? refTexture.getNumLevels() : m_baseLevel+1;
                DE_ASSERT(m_baseLevel < refTexture.getNumLevels());
 
                for (int levelNdx = levelBegin; levelNdx < levelEnd; levelNdx++)
@@ -1720,9 +1713,9 @@ public:
                                                          tcu::Sampler::FilterMode              minFilter,
                                                          tcu::Sampler::FilterMode              magFilter,
                                                          int                                                   baseLevel,
-                                                         deUint32                                              flags,
+                                                         bool                                                  mipmapIncomplete,
                                                          const IVec3&                                  textureSize)
-               : TextureGatherCase             (context, name, description, TEXTURETYPE_2D_ARRAY, gatherType, offsetSize, textureFormat, shadowCompareMode, wrapS, wrapT, texSwizzle, minFilter, magFilter, baseLevel, flags)
+               : TextureGatherCase             (context, name, description, TEXTURETYPE_2D_ARRAY, gatherType, offsetSize, textureFormat, shadowCompareMode, wrapS, wrapT, texSwizzle, minFilter, magFilter, baseLevel, mipmapIncomplete)
                , m_textureSize                 (textureSize)
                , m_swizzledTexture             (tcu::TextureFormat(), 1, 1, 1)
        {
@@ -1805,7 +1798,7 @@ void TextureGather2DArrayCase::createAndUploadTexture (void)
        {
                tcu::Texture2DArray&    refTexture      = m_texture->getRefTexture();
                const int                               levelBegin      = m_baseLevel;
-               const int                               levelEnd        = isMipmapFilter(m_minFilter) && !(m_flags & GATHERCASE_MIPMAP_INCOMPLETE) ? refTexture.getNumLevels() : m_baseLevel+1;
+               const int                               levelEnd        = isMipmapFilter(m_minFilter) && !m_mipmapIncomplete ? refTexture.getNumLevels() : m_baseLevel+1;
                DE_ASSERT(m_baseLevel < refTexture.getNumLevels());
 
                for (int levelNdx = levelBegin; levelNdx < levelEnd; levelNdx++)
@@ -1852,9 +1845,9 @@ public:
                                                   tcu::Sampler::FilterMode             minFilter,
                                                   tcu::Sampler::FilterMode             magFilter,
                                                   int                                                  baseLevel,
-                                                  deUint32                                             flags,
+                                                  bool                                                 mipmapIncomplete,
                                                   int                                                  textureSize)
-               : TextureGatherCase             (context, name, description, TEXTURETYPE_CUBE, GATHERTYPE_BASIC, OFFSETSIZE_NONE, textureFormat, shadowCompareMode, wrapS, wrapT, texSwizzle, minFilter, magFilter, baseLevel, flags)
+               : TextureGatherCase             (context, name, description, TEXTURETYPE_CUBE, GATHERTYPE_BASIC, OFFSETSIZE_NONE, textureFormat, shadowCompareMode, wrapS, wrapT, texSwizzle, minFilter, magFilter, baseLevel, mipmapIncomplete)
                , m_textureSize                 (textureSize)
                , m_swizzledTexture             (tcu::TextureFormat(), 1)
        {
@@ -1884,11 +1877,8 @@ private:
 
 vector<float> TextureGatherCubeCase::computeQuadTexCoord (int iterationNdx) const
 {
-       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);
+       vector<float> res;
+       gls::TextureTestUtil::computeQuadTexCoordCube(res, m_iterations[iterationNdx].face, Vec2(-1.2f), Vec2(1.2f));
        return res;
 }
 
@@ -1941,7 +1931,7 @@ void TextureGatherCubeCase::createAndUploadTexture (void)
        {
                tcu::TextureCube&       refTexture      = m_texture->getRefTexture();
                const int                       levelBegin      = m_baseLevel;
-               const int                       levelEnd        = isMipmapFilter(m_minFilter) && !(m_flags & GATHERCASE_MIPMAP_INCOMPLETE) ? refTexture.getNumLevels() : m_baseLevel+1;
+               const int                       levelEnd        = isMipmapFilter(m_minFilter) && !m_mipmapIncomplete ? refTexture.getNumLevels() : m_baseLevel+1;
                DE_ASSERT(m_baseLevel < refTexture.getNumLevels());
 
                for (int levelNdx = levelBegin; levelNdx < levelEnd; levelNdx++)
@@ -1993,23 +1983,23 @@ static inline TextureGatherCase* makeTextureGatherCase (TextureType                                     textureT
                                                                                                                tcu::Sampler::FilterMode        magFilter,
                                                                                                                int                                                     baseLevel,
                                                                                                                const IVec3&                            textureSize,
-                                                                                                               deUint32                                        flags = 0)
+                                                                                                               bool                                            mipmapIncomplete = false)
 {
        switch (textureType)
        {
                case TEXTURETYPE_2D:
                        return new TextureGather2DCase(context, name, description, gatherType, offsetSize, textureFormat, shadowCompareMode,
-                                                                                  wrapS, wrapT, texSwizzle, minFilter, magFilter, baseLevel, flags, textureSize.swizzle(0, 1));
+                                                                                  wrapS, wrapT, texSwizzle, minFilter, magFilter, baseLevel, mipmapIncomplete, textureSize.swizzle(0, 1));
 
                case TEXTURETYPE_2D_ARRAY:
                        return new TextureGather2DArrayCase(context, name, description, gatherType, offsetSize, textureFormat, shadowCompareMode,
-                                                                                               wrapS, wrapT, texSwizzle, minFilter, magFilter, baseLevel, flags, textureSize);
+                                                                                               wrapS, wrapT, texSwizzle, minFilter, magFilter, baseLevel, mipmapIncomplete, 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, flags, textureSize.x());
+                                                                                        wrapS, wrapT, texSwizzle, minFilter, magFilter, baseLevel, mipmapIncomplete, textureSize.x());
 
                default:
                        DE_ASSERT(false);
@@ -2126,55 +2116,43 @@ void TextureGatherTests::init (void)
                                        TestCaseGroup* const            formatGroup             = new TestCaseGroup(m_context, formats[formatNdx].name, "");
                                        textureTypeGroup->addChild(formatGroup);
 
-                                       for (int noCornersI = 0; noCornersI <= (textureType == TEXTURETYPE_CUBE)?1:0; noCornersI++)
+                                       for (int textureSizeNdx = 0; textureSizeNdx < DE_LENGTH_OF_ARRAY(textureSizes); textureSizeNdx++)
                                        {
-                                               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);
+                                               const IVec3&                    textureSize                     = textureSizes[textureSizeNdx].size;
+                                               TestCaseGroup* const    textureSizeGroup        = new TestCaseGroup(m_context, textureSizes[textureSizeNdx].name, "");
+                                               formatGroup->addChild(textureSizeGroup);
 
-                                               for (int textureSizeNdx = 0; textureSizeNdx < DE_LENGTH_OF_ARRAY(textureSizes); textureSizeNdx++)
+                                               for (int compareModeI = 0; compareModeI < tcu::Sampler::COMPAREMODE_LAST; 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;
+                                                       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,
-                                                                                                                                                                        noCorners ? GATHERCASE_DONT_SAMPLE_CUBE_CORNERS : 0));
-                                                               }
+                                                               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));
                                                        }
                                                }
                                        }
@@ -2277,7 +2255,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), GATHERCASE_MIPMAP_INCOMPLETE));
+                                                                                                                                                       0, IVec3(64, 64, 3), true /* Mipmap-incomplete */));
                                                }
                                        }
                                }