Fix negative test incorrectly testing levels instead of layers

Bug: 28090252
Change-Id: Icfe19cca34777e97f2ad49f09be7314467a307bc

diff --git a/android/cts/master/com.drawelements.deqp.gles31.xml b/android/cts/master/com.drawelements.deqp.gles31.xml
index d418ce5..9612384 100644 (file)
--- a/android/cts/master/com.drawelements.deqp.gles31.xml
+++ b/android/cts/master/com.drawelements.deqp.gles31.xml
@@ -52313,9 +52313,6 @@
                                                        <Test name="blit_framebuffer_multisample">
                                                                <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
                                                        </Test>
-                                                       <Test name="framebuffer_texture_layer">
-                                                               <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-                                                       </Test>
                                                        <Test name="invalidate_framebuffer">
                                                                <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
                                                        </Test>
@@ -53617,9 +53614,6 @@
                                                        <Test name="blit_framebuffer_multisample">
                                                                <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
                                                        </Test>
-                                                       <Test name="framebuffer_texture_layer">
-                                                               <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-                                                       </Test>
                                                        <Test name="invalidate_framebuffer">
                                                                <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
                                                        </Test>
@@ -54921,9 +54915,6 @@
                                                        <Test name="blit_framebuffer_multisample">
                                                                <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
                                                        </Test>
-                                                       <Test name="framebuffer_texture_layer">
-                                                               <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-                                                       </Test>
                                                        <Test name="invalidate_framebuffer">
                                                                <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
                                                        </Test>

diff --git a/android/cts/master/gles31-master.txt b/android/cts/master/gles31-master.txt
index 2540dd6..3a21401 100644 (file)
--- a/android/cts/master/gles31-master.txt
+++ b/android/cts/master/gles31-master.txt
@@ -16364,7 +16364,6 @@ dEQP-GLES31.functional.debug.negative_coverage.callbacks.buffer.framebuffer_text
 dEQP-GLES31.functional.debug.negative_coverage.callbacks.buffer.renderbuffer_storage
 dEQP-GLES31.functional.debug.negative_coverage.callbacks.buffer.blit_framebuffer
 dEQP-GLES31.functional.debug.negative_coverage.callbacks.buffer.blit_framebuffer_multisample
-dEQP-GLES31.functional.debug.negative_coverage.callbacks.buffer.framebuffer_texture_layer
 dEQP-GLES31.functional.debug.negative_coverage.callbacks.buffer.invalidate_framebuffer
 dEQP-GLES31.functional.debug.negative_coverage.callbacks.buffer.invalidate_sub_framebuffer
 dEQP-GLES31.functional.debug.negative_coverage.callbacks.buffer.renderbuffer_storage_multisample
@@ -16790,7 +16789,6 @@ dEQP-GLES31.functional.debug.negative_coverage.log.buffer.framebuffer_texture2d
 dEQP-GLES31.functional.debug.negative_coverage.log.buffer.renderbuffer_storage
 dEQP-GLES31.functional.debug.negative_coverage.log.buffer.blit_framebuffer
 dEQP-GLES31.functional.debug.negative_coverage.log.buffer.blit_framebuffer_multisample
-dEQP-GLES31.functional.debug.negative_coverage.log.buffer.framebuffer_texture_layer
 dEQP-GLES31.functional.debug.negative_coverage.log.buffer.invalidate_framebuffer
 dEQP-GLES31.functional.debug.negative_coverage.log.buffer.invalidate_sub_framebuffer
 dEQP-GLES31.functional.debug.negative_coverage.log.buffer.renderbuffer_storage_multisample
@@ -17216,7 +17214,6 @@ dEQP-GLES31.functional.debug.negative_coverage.get_error.buffer.framebuffer_text
 dEQP-GLES31.functional.debug.negative_coverage.get_error.buffer.renderbuffer_storage
 dEQP-GLES31.functional.debug.negative_coverage.get_error.buffer.blit_framebuffer
 dEQP-GLES31.functional.debug.negative_coverage.get_error.buffer.blit_framebuffer_multisample
-dEQP-GLES31.functional.debug.negative_coverage.get_error.buffer.framebuffer_texture_layer
 dEQP-GLES31.functional.debug.negative_coverage.get_error.buffer.invalidate_framebuffer
 dEQP-GLES31.functional.debug.negative_coverage.get_error.buffer.invalidate_sub_framebuffer
 dEQP-GLES31.functional.debug.negative_coverage.get_error.buffer.renderbuffer_storage_multisample

diff --git a/android/cts/master/src/gles31-test-issues.txt b/android/cts/master/src/gles31-test-issues.txt
index 207125e..5d40824 100644 (file)
--- a/android/cts/master/src/gles31-test-issues.txt
+++ b/android/cts/master/src/gles31-test-issues.txt
@@ -30,3 +30,6 @@ dEQP-GLES31.functional.shaders.builtin_functions.precision.reflect.*highp*.scala
 # Bug 28196756
 dEQP-GLES31.functional.shaders.builtin_functions.precision.acos.mediump_compute.*
 dEQP-GLES31.functional.shaders.builtin_functions.precision.atan.mediump_compute.*
+
+# Bug 28090252
+dEQP-GLES31.functional.debug.negative_coverage.*.buffer.framebuffer_texture_layer

diff --git a/modules/gles31/functional/es31fNegativeBufferApiTests.cpp b/modules/gles31/functional/es31fNegativeBufferApiTests.cpp
index 1d3b046..1e4632b 100644 (file)
--- a/modules/gles31/functional/es31fNegativeBufferApiTests.cpp
+++ b/modules/gles31/functional/es31fNegativeBufferApiTests.cpp
@@ -1655,9 +1655,9 @@ void framebuffer_texture_layer (NegativeTestContext& ctx)
                ctx.expectError                                 (GL_NO_ERROR);
 
                ctx.beginSection("GL_INVALID_VALUE is generated if texture is a 2D multisample array texture and layer not 0.");
-               ctx.glFramebufferTextureLayer   (GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, tex2DMSArray, -1, 0);
+               ctx.glFramebufferTextureLayer   (GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, tex2DMSArray, 0, -1);
                ctx.expectError                                 (GL_INVALID_VALUE);
-               ctx.glFramebufferTextureLayer   (GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, tex2DMSArray, 1, 0);
+               ctx.glFramebufferTextureLayer   (GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, tex2DMSArray, 0, 1);
                ctx.expectError                                 (GL_INVALID_VALUE);
                ctx.endSection();