Merge "Merge "Fix error mask generation in checkLineContinuity" into nougat-cts-dev...

[platform/upstream/VK-GL-CTS.git] / modules / internal / ditAstcTests.cpp

diff --git a/modules/internal/ditAstcTests.cpp b/modules/internal/ditAstcTests.cpp
index 2146c7c..8ef101d 100644 (file)
--- a/modules/internal/ditAstcTests.cpp
+++ b/modules/internal/ditAstcTests.cpp
@@ -113,7 +113,9 @@ AstcCase::IterateResult AstcCase::iterate (void)
                {
                        verifyBlocksValid(m_format, TexDecompressionParams::ASTCMODE_HDR, getNumBlocksFromBytes(generatedData.size()), &generatedData[0]);
 
-                       if (!astc::isBlockTestTypeHDROnly(blockTestType))
+                       // \note CEMS generates HDR blocks as well
+                       if (!astc::isBlockTestTypeHDROnly(blockTestType) &&
+                               (blockTestType != astc::BLOCK_TEST_TYPE_CEMS))
                                verifyBlocksValid(m_format, TexDecompressionParams::ASTCMODE_LDR, getNumBlocksFromBytes(generatedData.size()), &generatedData[0]);
                }
        }