GLES 2/3: Fix masked color clear tests.

This corrects the generating truth table to use the proper flags
for using a non-scissored masked clear.

Components: OpenGL

Affects:
dEQP-GLES2.functional.color_clear.masked_rgb
dEQP-GLES2.functional.color_clear.masked_rgba
dEQP-GLES3.functional.color_clear.masked_rgb
dEQP-GLES3.functional.color_clear.masked_rgba

Google bug: b/78103598
VK-GL-CTS issue: 1125

Change-Id: I8b9e6db49ddfd76b887d1d7825caa005ab0bbb0c

diff --git a/modules/gles2/functional/es2fColorClearTest.cpp b/modules/gles2/functional/es2fColorClearTest.cpp
index 2c275c2..bbc16da 100644 (file)
--- a/modules/gles2/functional/es2fColorClearTest.cpp
+++ b/modules/gles2/functional/es2fColorClearTest.cpp
@@ -316,8 +316,8 @@ void ColorClearTest::init (void)
        addChild(new ColorClearCase(m_context, "short_scissored_rgb",   30,             2,4,            false,  true,   false,  true    ));
        addChild(new ColorClearCase(m_context, "scissored_rgb",                 15,             4,30,           false,  true,   false,  true    ));
        addChild(new ColorClearCase(m_context, "scissored_rgba",                15,             4,30,           true,   true,   false,  true    ));
-       addChild(new ColorClearCase(m_context, "masked_rgb",                    15,             4,30,           false,  true,   false,  true    ));
-       addChild(new ColorClearCase(m_context, "masked_rgba",                   15,             4,30,           true,   true,   false,  true    ));
+       addChild(new ColorClearCase(m_context, "masked_rgb",                    15,             4,30,           false,  false,  true,   true    ));
+       addChild(new ColorClearCase(m_context, "masked_rgba",                   15,             4,30,           true,   false,  true,   true    ));
        addChild(new ColorClearCase(m_context, "masked_scissored_rgb",  15,             4,30,           false,  true,   true,   true    ));
        addChild(new ColorClearCase(m_context, "masked_scissored_rgba", 15,             4,30,           true,   true,   true,   true    ));
        addChild(new ColorClearCase(m_context, "complex_rgb",                   15,             5,50,           false,  true,   true,   false   ));

diff --git a/modules/gles3/functional/es3fColorClearTest.cpp b/modules/gles3/functional/es3fColorClearTest.cpp
index 8b8a28b..74b7125 100644 (file)
--- a/modules/gles3/functional/es3fColorClearTest.cpp
+++ b/modules/gles3/functional/es3fColorClearTest.cpp
@@ -316,8 +316,8 @@ void ColorClearTest::init (void)
        addChild(new ColorClearCase(m_context, "short_scissored_rgb",   30,             2,4,            false,  true,   false,  true    ));
        addChild(new ColorClearCase(m_context, "scissored_rgb",                 15,             4,30,           false,  true,   false,  true    ));
        addChild(new ColorClearCase(m_context, "scissored_rgba",                15,             4,30,           true,   true,   false,  true    ));
-       addChild(new ColorClearCase(m_context, "masked_rgb",                    15,             4,30,           false,  true,   false,  true    ));
-       addChild(new ColorClearCase(m_context, "masked_rgba",                   15,             4,30,           true,   true,   false,  true    ));
+       addChild(new ColorClearCase(m_context, "masked_rgb",                    15,             4,30,           false,  false,  true,   true    ));
+       addChild(new ColorClearCase(m_context, "masked_rgba",                   15,             4,30,           true,   false,  true,   true    ));
        addChild(new ColorClearCase(m_context, "masked_scissored_rgb",  15,             4,30,           false,  true,   true,   true    ));
        addChild(new ColorClearCase(m_context, "masked_scissored_rgba", 15,             4,30,           true,   true,   true,   true    ));
        addChild(new ColorClearCase(m_context, "complex_rgb",                   15,             5,50,           false,  true,   true,   false   ));