[Piglit] [PATCH 2/2] gl-3.1: Move draw-buffers-errors test from 3.2 to 3.1
Ian Romanick
idr at freedesktop.org
Thu Sep 19 13:58:46 PDT 2013
From: Ian Romanick <ian.d.romanick at intel.com>
The exact same spec language appears in the 3.1 spec. Currently no Mesa
driver supports OpenGL 3.2, but there are drivers that support 3.1.
This allows the test to run now on those drivers.
NOTE: This test currently fails in Mesa.
Signed-off-by: Ian Romanick <ian.d.romanick at intel.com>
Cc: Nicholas Mack <nichmack at gmail.com>
Cc: Paul Berry <stereotype441 at gmail.com>
---
tests/all.tests | 2 +-
tests/spec/gl-3.1/CMakeLists.gl.txt | 1 +
tests/spec/gl-3.1/draw-buffers-errors.c | 110 ++++++++++++++++++++++++++++++++
tests/spec/gl-3.2/CMakeLists.gl.txt | 1 -
tests/spec/gl-3.2/draw-buffers-errors.c | 110 --------------------------------
5 files changed, 112 insertions(+), 112 deletions(-)
create mode 100644 tests/spec/gl-3.1/draw-buffers-errors.c
delete mode 100644 tests/spec/gl-3.2/draw-buffers-errors.c
diff --git a/tests/all.tests b/tests/all.tests
index ed0fa02..2c4eb50 100644
--- a/tests/all.tests
+++ b/tests/all.tests
@@ -734,6 +734,7 @@ add_plain_test(gl30, 'sampler-cube-shadow')
gl31 = Group()
spec['!OpenGL 3.1'] = gl31
+gl31['draw-buffers-errors'] = concurrent_test('gl-3.1-draw-buffers-errors')
gl31['genned-names'] = concurrent_test('gl-3.1-genned-names')
gl31['minmax'] = concurrent_test('gl-3.1-minmax')
for subtest in ['generated', 'written', 'flush']:
@@ -745,7 +746,6 @@ gl31['required-texture-attachment-formats'] = concurrent_test('gl-3.0-required-t
spec['!OpenGL 3.2/minmax'] = concurrent_test('gl-3.2-minmax')
spec['!OpenGL 3.2/clear-no-buffers'] = concurrent_test('gl-3.2-clear-no-buffers')
-spec['!OpenGL 3.2/draw-buffers-errors'] = concurrent_test('gl-3.2-draw-buffers-errors')
spec['!OpenGL 3.2/get-buffer-parameter-i64v'] = concurrent_test('gl-3.2-get-buffer-parameter-i64v')
spec['!OpenGL 3.2/get-integer-64iv'] = concurrent_test('gl-3.2-get-integer-64iv')
spec['!OpenGL 3.2/get-integer-64v'] = concurrent_test('gl-3.2-get-integer-64v')
diff --git a/tests/spec/gl-3.1/CMakeLists.gl.txt b/tests/spec/gl-3.1/CMakeLists.gl.txt
index 70eb135..7d835e8 100644
--- a/tests/spec/gl-3.1/CMakeLists.gl.txt
+++ b/tests/spec/gl-3.1/CMakeLists.gl.txt
@@ -9,6 +9,7 @@ link_libraries (
${OPENGL_glu_LIBRARY}
)
+piglit_add_executable (gl-3.1-draw-buffers-errors draw-buffers-errors.c)
piglit_add_executable (gl-3.1-genned-names genned-names.c)
piglit_add_executable (gl-3.1-minmax minmax.c)
piglit_add_executable (gl-3.1-primitive-restart-xfb primitive-restart-xfb.c)
diff --git a/tests/spec/gl-3.1/draw-buffers-errors.c b/tests/spec/gl-3.1/draw-buffers-errors.c
new file mode 100644
index 0000000..054ec97
--- /dev/null
+++ b/tests/spec/gl-3.1/draw-buffers-errors.c
@@ -0,0 +1,110 @@
+/**
+ * Copyright © 2013 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ */
+
+/**
+ * Test that DrawBuffers() returns correct error message for different values
+ *
+ * Section 4.2.1 (Selecting a Buffer for Writing) of OpenGL 3.1 spec says:
+ *
+ * "For both the default framebuffer and framebuffer objects, the constants
+ * FRONT, BACK, LEFT, RIGHT, and FRONT_AND_BACK are not valid in the bufs
+ * array passed to DrawBuffers, and will result in the error INVALID_ENUM."
+ *
+ * "If the GL is bound to the default framebuffer and DrawBuffers is supplied
+ * with a constant (other than NONE) that does not indicate any of the color
+ * buffers allocated to the GL context by the window system, the error
+ * INVALID_OPERATION will be generated."
+ */
+
+#include "piglit-util-gl-common.h"
+
+PIGLIT_GL_TEST_CONFIG_BEGIN
+
+ config.supports_gl_compat_version = 31;
+ config.supports_gl_core_version = 31;
+
+ config.window_visual = PIGLIT_GL_VISUAL_DOUBLE;
+
+PIGLIT_GL_TEST_CONFIG_END
+
+
+static const GLenum invalids[]={
+ GL_FRONT,
+ GL_BACK,
+ GL_LEFT,
+ GL_RIGHT,
+ GL_FRONT_AND_BACK
+};
+
+static const GLenum valids[] = {
+ GL_NONE,
+ GL_FRONT_LEFT,
+ GL_FRONT_RIGHT,
+ GL_BACK_LEFT,
+ GL_BACK_RIGHT
+};
+
+enum piglit_result
+piglit_display(void)
+{
+ /* UNREACHED */
+ return PIGLIT_FAIL;
+}
+
+void
+piglit_init(int argc, char **argv)
+{
+ bool pass = true;
+ unsigned i;
+
+ for (i = 0; i < ARRAY_SIZE(valids); i++) {
+ GLenum err = 0;
+ glDrawBuffers(1, &valids[i]);
+ err = glGetError();
+ /* err = INVALID_OPERATION if that color buffer is not
+ * allocated to the window system
+ */
+ if (err != GL_NONE && err != GL_INVALID_OPERATION) {
+ printf("Expected GL_NONE or GL_INVALID_OPERATION with"
+ " %s but received: %s\n",
+ piglit_get_gl_enum_name(valids[i]),
+ piglit_get_gl_enum_name(err));
+ pass = false;
+ }
+ }
+
+ for (i = 0; i < ARRAY_SIZE(invalids); i++) {
+ GLenum err = 0;
+ glDrawBuffers(1, &invalids[i]);
+ err = glGetError();
+ if (err != GL_INVALID_ENUM) {
+ printf("Expected GL_INVALID_ENUM with %s but "
+ "received: %s\n",
+ piglit_get_gl_enum_name(invalids[i]),
+ piglit_get_gl_enum_name(err));
+ pass = false;
+ }
+ }
+
+ piglit_report_result(pass ? PIGLIT_PASS : PIGLIT_FAIL);
+}
diff --git a/tests/spec/gl-3.2/CMakeLists.gl.txt b/tests/spec/gl-3.2/CMakeLists.gl.txt
index 67a1d1e..9fc0a75 100644
--- a/tests/spec/gl-3.2/CMakeLists.gl.txt
+++ b/tests/spec/gl-3.2/CMakeLists.gl.txt
@@ -10,7 +10,6 @@ link_libraries (
)
piglit_add_executable (gl-3.2-minmax minmax.c)
-piglit_add_executable (gl-3.2-draw-buffers-errors draw-buffers-errors.c)
piglit_add_executable (gl-3.2-clear-no-buffers clear-no-buffers.c)
piglit_add_executable (gl-3.2-get-buffer-parameter-i64v get-buffer-parameter-i64v.c)
piglit_add_executable (gl-3.2-get-integer-64iv get-integer-64iv.c)
diff --git a/tests/spec/gl-3.2/draw-buffers-errors.c b/tests/spec/gl-3.2/draw-buffers-errors.c
deleted file mode 100644
index f5ba814..0000000
--- a/tests/spec/gl-3.2/draw-buffers-errors.c
+++ /dev/null
@@ -1,110 +0,0 @@
-/**
- * Copyright © 2013 Intel Corporation
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
- * IN THE SOFTWARE.
- */
-
-/**
- * Test that DrawBuffers() returns correct error message for different values
- *
- * Section 4.2.1(Selecting a Buffer for Writing) of OpenGL 3.2 Core says:
- *
- * "For both the default framebuffer and framebuffer objects, the constants
- * FRONT, BACK, LEFT, RIGHT, and FRONT_AND_BACK are not valid in the bufs
- * array passed to DrawBuffers, and will result in the error INVALID_ENUM."
- *
- * "If the GL is bound to the default framebuffer and DrawBuffers is supplied
- * with a constant (other than NONE) that does not indicate any of the color
- * buffers allocated to the GL context by the window system, the error
- * INVALID_OPERATION will be generated."
- */
-
-#include "piglit-util-gl-common.h"
-
-PIGLIT_GL_TEST_CONFIG_BEGIN
-
- config.supports_gl_compat_version = 32;
- config.supports_gl_core_version = 32;
-
- config.window_visual = PIGLIT_GL_VISUAL_DOUBLE;
-
-PIGLIT_GL_TEST_CONFIG_END
-
-
-static const GLenum invalids[]={
- GL_FRONT,
- GL_BACK,
- GL_LEFT,
- GL_RIGHT,
- GL_FRONT_AND_BACK
-};
-
-static const GLenum valids[] = {
- GL_NONE,
- GL_FRONT_LEFT,
- GL_FRONT_RIGHT,
- GL_BACK_LEFT,
- GL_BACK_RIGHT
-};
-
-enum piglit_result
-piglit_display(void)
-{
- /* UNREACHED */
- return PIGLIT_FAIL;
-}
-
-void
-piglit_init(int argc, char **argv)
-{
- bool pass = true;
- unsigned i;
-
- for (i = 0; i < ARRAY_SIZE(valids); i++) {
- GLenum err = 0;
- glDrawBuffers(1, &valids[i]);
- err = glGetError();
- /* err = INVALID_OPERATION if that color buffer is not
- * allocated to the window system
- */
- if (err != GL_NONE && err != GL_INVALID_OPERATION) {
- printf("Expected GL_NONE or GL_INVALID_OPERATION with"
- " %s but received: %s\n",
- piglit_get_gl_enum_name(valids[i]),
- piglit_get_gl_enum_name(err));
- pass = false;
- }
- }
-
- for (i = 0; i < ARRAY_SIZE(invalids); i++) {
- GLenum err = 0;
- glDrawBuffers(1, &invalids[i]);
- err = glGetError();
- if (err != GL_INVALID_ENUM) {
- printf("Expected GL_INVALID_ENUM with %s but "
- "received: %s\n",
- piglit_get_gl_enum_name(invalids[i]),
- piglit_get_gl_enum_name(err));
- pass = false;
- }
- }
-
- piglit_report_result(pass ? PIGLIT_PASS : PIGLIT_FAIL);
-}
--
1.8.1.4
More information about the Piglit
mailing list