Remove tests that check non-zero values for reservedMustBeZero after GL 4.2

draw_indirect.misc-reservedMustBeZero-arrays and
draw_indirect.misc-reservedMustBeZero-elements tests that the driver
doesn't crash or emit any error if the reserved field at
DrawArraysIndirectCommand and DrawEelementsIndirectCommand is
different to zero.

But that field become defined on GL 4.2 (it became baseInstance), so
after 4.2 those tests doesn't make sense.

Components: OpenGL

VK-GL-CTS issue: 2023

Affects:
KHR-GL42.draw_indirect.misc-reservedMustBeZero-arrays
KHR-GL42.draw_indirect.misc-reservedMustBeZero-elements
KHR-GL43.draw_indirect.misc-reservedMustBeZero-arrays
KHR-GL43.draw_indirect.misc-reservedMustBeZero-elements
KHR-GL44.draw_indirect.misc-reservedMustBeZero-arrays
KHR-GL44.draw_indirect.misc-reservedMustBeZero-elements
KHR-GL45.draw_indirect.misc-reservedMustBeZero-arrays
KHR-GL45.draw_indirect.misc-reservedMustBeZero-elements
KHR-GL46.draw_indirect.misc-reservedMustBeZero-arrays
KHR-GL46.draw_indirect.misc-reservedMustBeZero-elements

Change-Id: I6c9872efd4f161179da157f6f5f26731a2032372

diff --git a/external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.0.x/gl42-master.txt b/external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.0.x/gl42-master.txt
index 8ca8de1..9287485 100644 (file)
--- a/external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.0.x/gl42-master.txt
+++ b/external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.0.x/gl42-master.txt
@@ -3878,8 +3878,6 @@ KHR-GL42.draw_indirect.basic-mode-drawElements-triangle_strip_adjacency
 KHR-GL42.draw_indirect.advanced-twoPass-transformFeedback-arrays
 KHR-GL42.draw_indirect.advanced-twoPass-transformFeedback-elements
 KHR-GL42.draw_indirect.advanced-primitiveRestart-elements
-KHR-GL42.draw_indirect.misc-reservedMustBeZero-arrays
-KHR-GL42.draw_indirect.misc-reservedMustBeZero-elements
 KHR-GL42.draw_indirect.negative-noindirect-arrays
 KHR-GL42.draw_indirect.negative-noindirect-elements
 KHR-GL42.draw_indirect.negative-invalidMode-arrays

diff --git a/external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.0.x/gl43-master.txt b/external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.0.x/gl43-master.txt
index 1ababf8..7411192 100644 (file)
--- a/external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.0.x/gl43-master.txt
+++ b/external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.0.x/gl43-master.txt
@@ -3878,8 +3878,6 @@ KHR-GL43.draw_indirect.basic-mode-drawElements-triangle_strip_adjacency
 KHR-GL43.draw_indirect.advanced-twoPass-transformFeedback-arrays
 KHR-GL43.draw_indirect.advanced-twoPass-transformFeedback-elements
 KHR-GL43.draw_indirect.advanced-primitiveRestart-elements
-KHR-GL43.draw_indirect.misc-reservedMustBeZero-arrays
-KHR-GL43.draw_indirect.misc-reservedMustBeZero-elements
 KHR-GL43.draw_indirect.negative-noindirect-arrays
 KHR-GL43.draw_indirect.negative-noindirect-elements
 KHR-GL43.draw_indirect.negative-invalidMode-arrays

diff --git a/external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.0.x/gl44-master.txt b/external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.0.x/gl44-master.txt
index b5b4547..63901ab 100644 (file)
--- a/external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.0.x/gl44-master.txt
+++ b/external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.0.x/gl44-master.txt
@@ -3878,8 +3878,6 @@ KHR-GL44.draw_indirect.basic-mode-drawElements-triangle_strip_adjacency
 KHR-GL44.draw_indirect.advanced-twoPass-transformFeedback-arrays
 KHR-GL44.draw_indirect.advanced-twoPass-transformFeedback-elements
 KHR-GL44.draw_indirect.advanced-primitiveRestart-elements
-KHR-GL44.draw_indirect.misc-reservedMustBeZero-arrays
-KHR-GL44.draw_indirect.misc-reservedMustBeZero-elements
 KHR-GL44.draw_indirect.negative-noindirect-arrays
 KHR-GL44.draw_indirect.negative-noindirect-elements
 KHR-GL44.draw_indirect.negative-invalidMode-arrays

diff --git a/external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.0.x/gl45-master.txt b/external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.0.x/gl45-master.txt
index 75c49cb..f031ddd 100644 (file)
--- a/external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.0.x/gl45-master.txt
+++ b/external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.0.x/gl45-master.txt
@@ -3878,8 +3878,6 @@ KHR-GL45.draw_indirect.basic-mode-drawElements-triangle_strip_adjacency
 KHR-GL45.draw_indirect.advanced-twoPass-transformFeedback-arrays
 KHR-GL45.draw_indirect.advanced-twoPass-transformFeedback-elements
 KHR-GL45.draw_indirect.advanced-primitiveRestart-elements
-KHR-GL45.draw_indirect.misc-reservedMustBeZero-arrays
-KHR-GL45.draw_indirect.misc-reservedMustBeZero-elements
 KHR-GL45.draw_indirect.negative-noindirect-arrays
 KHR-GL45.draw_indirect.negative-noindirect-elements
 KHR-GL45.draw_indirect.negative-invalidMode-arrays

diff --git a/external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.0.x/gl46-master.txt b/external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.0.x/gl46-master.txt
index 78ffae6..4f1429d 100644 (file)
--- a/external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.0.x/gl46-master.txt
+++ b/external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.0.x/gl46-master.txt
@@ -3878,8 +3878,6 @@ KHR-GL46.draw_indirect.basic-mode-drawElements-triangle_strip_adjacency
 KHR-GL46.draw_indirect.advanced-twoPass-transformFeedback-arrays
 KHR-GL46.draw_indirect.advanced-twoPass-transformFeedback-elements
 KHR-GL46.draw_indirect.advanced-primitiveRestart-elements
-KHR-GL46.draw_indirect.misc-reservedMustBeZero-arrays
-KHR-GL46.draw_indirect.misc-reservedMustBeZero-elements
 KHR-GL46.draw_indirect.negative-noindirect-arrays
 KHR-GL46.draw_indirect.negative-noindirect-elements
 KHR-GL46.draw_indirect.negative-invalidMode-arrays

diff --git a/external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.0.x/src/gl42-master.txt b/external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.0.x/src/gl42-master.txt
index e5c3274..a64a7f0 100644 (file)
--- a/external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.0.x/src/gl42-master.txt
+++ b/external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.0.x/src/gl42-master.txt
@@ -3878,8 +3878,6 @@ KHR-GL42.draw_indirect.basic-mode-drawElements-triangle_strip_adjacency
 KHR-GL42.draw_indirect.advanced-twoPass-transformFeedback-arrays
 KHR-GL42.draw_indirect.advanced-twoPass-transformFeedback-elements
 KHR-GL42.draw_indirect.advanced-primitiveRestart-elements
-KHR-GL42.draw_indirect.misc-reservedMustBeZero-arrays
-KHR-GL42.draw_indirect.misc-reservedMustBeZero-elements
 KHR-GL42.draw_indirect.negative-noindirect-arrays
 KHR-GL42.draw_indirect.negative-noindirect-elements
 KHR-GL42.draw_indirect.negative-invalidMode-arrays

diff --git a/external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.0.x/src/gl43-master.txt b/external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.0.x/src/gl43-master.txt
index e47dba1..f9a3ef6 100644 (file)
--- a/external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.0.x/src/gl43-master.txt
+++ b/external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.0.x/src/gl43-master.txt
@@ -3878,8 +3878,6 @@ KHR-GL43.draw_indirect.basic-mode-drawElements-triangle_strip_adjacency
 KHR-GL43.draw_indirect.advanced-twoPass-transformFeedback-arrays
 KHR-GL43.draw_indirect.advanced-twoPass-transformFeedback-elements
 KHR-GL43.draw_indirect.advanced-primitiveRestart-elements
-KHR-GL43.draw_indirect.misc-reservedMustBeZero-arrays
-KHR-GL43.draw_indirect.misc-reservedMustBeZero-elements
 KHR-GL43.draw_indirect.negative-noindirect-arrays
 KHR-GL43.draw_indirect.negative-noindirect-elements
 KHR-GL43.draw_indirect.negative-invalidMode-arrays

diff --git a/external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.0.x/src/gl44-master.txt b/external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.0.x/src/gl44-master.txt
index 649409f..1e66a37 100644 (file)
--- a/external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.0.x/src/gl44-master.txt
+++ b/external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.0.x/src/gl44-master.txt
@@ -3878,8 +3878,6 @@ KHR-GL44.draw_indirect.basic-mode-drawElements-triangle_strip_adjacency
 KHR-GL44.draw_indirect.advanced-twoPass-transformFeedback-arrays
 KHR-GL44.draw_indirect.advanced-twoPass-transformFeedback-elements
 KHR-GL44.draw_indirect.advanced-primitiveRestart-elements
-KHR-GL44.draw_indirect.misc-reservedMustBeZero-arrays
-KHR-GL44.draw_indirect.misc-reservedMustBeZero-elements
 KHR-GL44.draw_indirect.negative-noindirect-arrays
 KHR-GL44.draw_indirect.negative-noindirect-elements
 KHR-GL44.draw_indirect.negative-invalidMode-arrays

diff --git a/external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.0.x/src/gl45-master.txt b/external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.0.x/src/gl45-master.txt
index c62f252..13de73c 100644 (file)
--- a/external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.0.x/src/gl45-master.txt
+++ b/external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.0.x/src/gl45-master.txt
@@ -3878,8 +3878,6 @@ KHR-GL45.draw_indirect.basic-mode-drawElements-triangle_strip_adjacency
 KHR-GL45.draw_indirect.advanced-twoPass-transformFeedback-arrays
 KHR-GL45.draw_indirect.advanced-twoPass-transformFeedback-elements
 KHR-GL45.draw_indirect.advanced-primitiveRestart-elements
-KHR-GL45.draw_indirect.misc-reservedMustBeZero-arrays
-KHR-GL45.draw_indirect.misc-reservedMustBeZero-elements
 KHR-GL45.draw_indirect.negative-noindirect-arrays
 KHR-GL45.draw_indirect.negative-noindirect-elements
 KHR-GL45.draw_indirect.negative-invalidMode-arrays

diff --git a/external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.0.x/src/gl46-master.txt b/external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.0.x/src/gl46-master.txt
index bb18db6..a0e7c97 100644 (file)
--- a/external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.0.x/src/gl46-master.txt
+++ b/external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.0.x/src/gl46-master.txt
@@ -3878,8 +3878,6 @@ KHR-GL46.draw_indirect.basic-mode-drawElements-triangle_strip_adjacency
 KHR-GL46.draw_indirect.advanced-twoPass-transformFeedback-arrays
 KHR-GL46.draw_indirect.advanced-twoPass-transformFeedback-elements
 KHR-GL46.draw_indirect.advanced-primitiveRestart-elements
-KHR-GL46.draw_indirect.misc-reservedMustBeZero-arrays
-KHR-GL46.draw_indirect.misc-reservedMustBeZero-elements
 KHR-GL46.draw_indirect.negative-noindirect-arrays
 KHR-GL46.draw_indirect.negative-noindirect-elements
 KHR-GL46.draw_indirect.negative-invalidMode-arrays

diff --git a/external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.1.x/gl42-master.txt b/external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.1.x/gl42-master.txt
index 8dc2e6a..d84483f 100644 (file)
--- a/external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.1.x/gl42-master.txt
+++ b/external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.1.x/gl42-master.txt
@@ -3923,8 +3923,6 @@ KHR-GL42.draw_indirect.basic-mode-drawElements-triangle_strip_adjacency
 KHR-GL42.draw_indirect.advanced-twoPass-transformFeedback-arrays
 KHR-GL42.draw_indirect.advanced-twoPass-transformFeedback-elements
 KHR-GL42.draw_indirect.advanced-primitiveRestart-elements
-KHR-GL42.draw_indirect.misc-reservedMustBeZero-arrays
-KHR-GL42.draw_indirect.misc-reservedMustBeZero-elements
 KHR-GL42.draw_indirect.negative-noindirect-arrays
 KHR-GL42.draw_indirect.negative-noindirect-elements
 KHR-GL42.draw_indirect.negative-invalidMode-arrays

diff --git a/external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.1.x/gl43-master.txt b/external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.1.x/gl43-master.txt
index 971be4d..6a02c54 100644 (file)
--- a/external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.1.x/gl43-master.txt
+++ b/external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.1.x/gl43-master.txt
@@ -3923,8 +3923,6 @@ KHR-GL43.draw_indirect.basic-mode-drawElements-triangle_strip_adjacency
 KHR-GL43.draw_indirect.advanced-twoPass-transformFeedback-arrays
 KHR-GL43.draw_indirect.advanced-twoPass-transformFeedback-elements
 KHR-GL43.draw_indirect.advanced-primitiveRestart-elements
-KHR-GL43.draw_indirect.misc-reservedMustBeZero-arrays
-KHR-GL43.draw_indirect.misc-reservedMustBeZero-elements
 KHR-GL43.draw_indirect.negative-noindirect-arrays
 KHR-GL43.draw_indirect.negative-noindirect-elements
 KHR-GL43.draw_indirect.negative-invalidMode-arrays

diff --git a/external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.1.x/gl44-master.txt b/external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.1.x/gl44-master.txt
index 2bac3e7..4fc2353 100644 (file)
--- a/external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.1.x/gl44-master.txt
+++ b/external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.1.x/gl44-master.txt
@@ -3923,8 +3923,6 @@ KHR-GL44.draw_indirect.basic-mode-drawElements-triangle_strip_adjacency
 KHR-GL44.draw_indirect.advanced-twoPass-transformFeedback-arrays
 KHR-GL44.draw_indirect.advanced-twoPass-transformFeedback-elements
 KHR-GL44.draw_indirect.advanced-primitiveRestart-elements
-KHR-GL44.draw_indirect.misc-reservedMustBeZero-arrays
-KHR-GL44.draw_indirect.misc-reservedMustBeZero-elements
 KHR-GL44.draw_indirect.negative-noindirect-arrays
 KHR-GL44.draw_indirect.negative-noindirect-elements
 KHR-GL44.draw_indirect.negative-invalidMode-arrays

diff --git a/external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.1.x/gl45-master.txt b/external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.1.x/gl45-master.txt
index e0ba5c9..a2b4a8c 100644 (file)
--- a/external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.1.x/gl45-master.txt
+++ b/external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.1.x/gl45-master.txt
@@ -3923,8 +3923,6 @@ KHR-GL45.draw_indirect.basic-mode-drawElements-triangle_strip_adjacency
 KHR-GL45.draw_indirect.advanced-twoPass-transformFeedback-arrays
 KHR-GL45.draw_indirect.advanced-twoPass-transformFeedback-elements
 KHR-GL45.draw_indirect.advanced-primitiveRestart-elements
-KHR-GL45.draw_indirect.misc-reservedMustBeZero-arrays
-KHR-GL45.draw_indirect.misc-reservedMustBeZero-elements
 KHR-GL45.draw_indirect.negative-noindirect-arrays
 KHR-GL45.draw_indirect.negative-noindirect-elements
 KHR-GL45.draw_indirect.negative-invalidMode-arrays

diff --git a/external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.1.x/gl46-master.txt b/external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.1.x/gl46-master.txt
index 070492d..2b3eb4a 100644 (file)
--- a/external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.1.x/gl46-master.txt
+++ b/external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.1.x/gl46-master.txt
@@ -3923,8 +3923,6 @@ KHR-GL46.draw_indirect.basic-mode-drawElements-triangle_strip_adjacency
 KHR-GL46.draw_indirect.advanced-twoPass-transformFeedback-arrays
 KHR-GL46.draw_indirect.advanced-twoPass-transformFeedback-elements
 KHR-GL46.draw_indirect.advanced-primitiveRestart-elements
-KHR-GL46.draw_indirect.misc-reservedMustBeZero-arrays
-KHR-GL46.draw_indirect.misc-reservedMustBeZero-elements
 KHR-GL46.draw_indirect.negative-noindirect-arrays
 KHR-GL46.draw_indirect.negative-noindirect-elements
 KHR-GL46.draw_indirect.negative-invalidMode-arrays

diff --git a/external/openglcts/modules/gles31/es31cDrawIndirectTests.cpp b/external/openglcts/modules/gles31/es31cDrawIndirectTests.cpp
index 982f126..326999c 100644 (file)
--- a/external/openglcts/modules/gles31/es31cDrawIndirectTests.cpp
+++ b/external/openglcts/modules/gles31/es31cDrawIndirectTests.cpp
@@ -8153,10 +8153,15 @@ void DrawIndirectTestsGL40::init()
        addChild(new TestSubcase(m_context, "advanced-primitiveRestart-elements",
                                                         TestSubcase::Create<CPrimitiveRestartElements<test_api::GL> >));
 
-       addChild(new TestSubcase(m_context, "misc-reservedMustBeZero-arrays",
-                                                        TestSubcase::Create<CNonZeroReservedMustBeZeroArray<test_api::GL> >));
-       addChild(new TestSubcase(m_context, "misc-reservedMustBeZero-elements",
-                                                        TestSubcase::Create<CNonZeroReservedMustBeZeroElements<test_api::GL> >));
+       // reservedMustBeZero field got defined after GL 4.2, so those tests only make sense before 4.2
+       const glu::ContextType& type = m_context.getRenderContext().getType();
+       if (!glu::contextSupports(type, glu::ApiType::core(4, 2)))
+       {
+               addChild(new TestSubcase(m_context, "misc-reservedMustBeZero-arrays",
+                                                                TestSubcase::Create<CNonZeroReservedMustBeZeroArray<test_api::GL> >));
+               addChild(new TestSubcase(m_context, "misc-reservedMustBeZero-elements",
+                                                                TestSubcase::Create<CNonZeroReservedMustBeZeroElements<test_api::GL> >));
+       }
 
        addChild(new TestSubcase(m_context, "negative-noindirect-arrays",
                                                         TestSubcase::Create<CNegativeZeroBufferArray<test_api::GL> >));