Moved from opengl 1.1 to opengl 1.0 profile in all.py.
---
tests/all.py | 2 +-
tests/bugs/CMakeLists.gl.txt | 1 -
tests/bugs/drawbuffer-modes.c | 171 -----------------------------------
tests/spec/gl-1.0/CMakeLists.gl.txt | 1 +
tests/spec/gl-1.0/drawbuffer-modes.c | 171 +++++++++++++++++++++++++++++++++++
5 files changed, 173 insertions(+), 173 deletions(-)
delete mode 100644 tests/bugs/drawbuffer-modes.c
create mode 100644 tests/spec/gl-1.0/drawbuffer-modes.c
diff --git a/tests/all.py b/tests/all.py
index 065ec9a..5c23811 100644
--- a/tests/all.py
+++ b/tests/all.py
@@ -719,6 +719,7 @@ with profile.test_list.group_manager(
g(['gl-1.0-dlist-bitmap'])
g(['gl-1.0-dlist-shademodel'])
g(['gl-1.0-drawpixels-color-index'])
+ g(['gl-1.0-drawbuffer-modes'], run_concurrent=False)
g(['gl-1.0-edgeflag'])
g(['gl-1.0-edgeflag-const'])
g(['gl-1.0-edgeflag-quads'])
@@ -758,7 +759,6 @@ with profile.test_list.group_manager(
g(['max-texture-size-level'])
g(['copyteximage', '1D'])
g(['copyteximage', '2D'])
- g(['drawbuffer-modes'], run_concurrent=False)
g(['fdo10370'])
g(['fdo23489'])
g(['fdo23670-depth_test'])
diff --git a/tests/bugs/CMakeLists.gl.txt b/tests/bugs/CMakeLists.gl.txt
index f8cf104..544bb30 100644
--- a/tests/bugs/CMakeLists.gl.txt
+++ b/tests/bugs/CMakeLists.gl.txt
@@ -10,7 +10,6 @@ link_libraries (
${OPENGL_gl_LIBRARY}
)
-piglit_add_executable (drawbuffer-modes drawbuffer-modes.c)
piglit_add_executable (fdo10370 fdo10370.c)
piglit_add_executable (fdo14575 fdo14575.c)
piglit_add_executable (r300-readcache r300-readcache.c)
diff --git a/tests/bugs/drawbuffer-modes.c b/tests/bugs/drawbuffer-modes.c
deleted file mode 100644
index 94d9796..0000000
--- a/tests/bugs/drawbuffer-modes.c
+++ /dev/null
@@ -1,171 +0,0 @@
-/* Copyright © 2011 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.
- */
-
-/**
- * \file drawbuffer-modes.c
- * Verify the functionality of glDrawBuffer() function with different color
- * buffer modes in default framebuffer
- *
- * This test works by calling glDrawBuffer function for each color buffer mode
- * and testing the buffer's color value against expected value. All the calls
- * should ensure no error.
- *
- * This test case also verifies the fix for Bug 44153:
- * https://bugs.freedesktop.org/show_bug.cgi?id=44153
- *
- * \Author Yi Sun <[email protected]>, Anuj Phogat <[email protected]>
- */
-#include "piglit-util-gl.h"
-
-PIGLIT_GL_TEST_CONFIG_BEGIN
-
- config.supports_gl_compat_version = 10;
-
- config.window_visual = PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE;
- config.requires_displayed_window = true;
- config.khr_no_error_support = PIGLIT_NO_ERRORS;
-
-PIGLIT_GL_TEST_CONFIG_END
-
-float color[7][4] = {
- { 0.1, 0.2, 0.3, 1.0 },
- { 0.2, 0.3, 0.4, 1.0 },
- { 0.3, 0.4, 0.5, 1.0 },
- { 0.4, 0.5, 0.6, 1.0 },
- { 0.5, 0.6, 0.7, 1.0 },
- { 0.6, 0.7, 0.8, 1.0 },
- { 1.0, 1.0, 1.0, 1.0 } };
-
-int bufferlist[] = {
- GL_FRONT_AND_BACK,
- GL_BACK, GL_FRONT,
- GL_LEFT,
- GL_BACK_LEFT,
- GL_FRONT_LEFT,
- GL_NONE };
-
-enum piglit_result
-piglit_display(void)
-{
- bool pass = true;
- bool pixel_probe = true;
- int i;
- GLfloat probe[4];
- for ( i = 0; i < ARRAY_SIZE(bufferlist); i++) {
- glDrawBuffer(bufferlist[i]);
- glClear(GL_COLOR_BUFFER_BIT);
- glColor4fv(color[i]);
- piglit_draw_rect(20, 20, 50, 50);
- pass = piglit_check_gl_error(GL_NO_ERROR)
- && pass;
- switch (bufferlist[i]) {
- case GL_FRONT_AND_BACK:
- glReadBuffer(GL_BACK_LEFT);
- pass = piglit_probe_rect_rgba(20, 20, 50, 50,
- color[i])
- && pass;
- glReadBuffer(GL_FRONT_LEFT);
- pass = pass &&
- piglit_probe_rect_rgba(20, 20, 50, 50,
- color[i]);
- break;
- case GL_LEFT:
- glReadBuffer(GL_BACK_LEFT);
- pass = piglit_probe_rect_rgba(20, 20, 50, 50,
- color[i])
- && pass;
- glReadBuffer(GL_FRONT_LEFT);
- pass = piglit_probe_rect_rgba(20, 20, 50, 50,
- color[i])
- && pass;
- break;
- case GL_BACK:
- case GL_BACK_LEFT:
- glReadBuffer(bufferlist[i]);
- pass = piglit_probe_rect_rgba(20, 20, 50, 50,
- color[i])
- && pass;
- /* This should not modify GL_FRONT_LEFT buffer */
- glReadBuffer(GL_FRONT_LEFT);
- pixel_probe = piglit_probe_pixel_rgba_silent(25, 25,
- color[i],
- probe);
- pass = !pixel_probe && pass;
- if(pixel_probe)
- printf("glDrawBuffer(GL_BACK) modifies"
- " GL_FRONT_LEFT buffer\n");
- break;
- case GL_FRONT:
- case GL_FRONT_LEFT:
- glReadBuffer(bufferlist[i]);
- pass = piglit_probe_rect_rgba(20, 20, 50, 50,
- color[i])
- && pass;
- /* This should not modify GL_BACK_LEFT buffer */
- glReadBuffer(GL_BACK_LEFT);
- pixel_probe = piglit_probe_pixel_rgba_silent(25, 25,
- color[i],
- probe);
- pass = !pixel_probe && pass;
- if(pixel_probe)
- printf("glDrawBuffer(GL_FRONT) modifies"
- " GL_BACK_LEFT buffer\n");
- break;
- case GL_NONE:
- /* Drawing to a buffer GL_NONE should not
- * modify any existing buffers
- */
- glReadBuffer(GL_BACK_LEFT);
- pixel_probe = piglit_probe_pixel_rgba_silent(25, 25,
- color[i],
- probe);
- pass = !pixel_probe && pass;
- if(pixel_probe)
- printf("glDrawBuffer(GL_NONE) modifies"
- " GL_BACK_LEFT buffer\n");
- glReadBuffer(GL_FRONT_LEFT);
- pixel_probe = piglit_probe_pixel_rgba_silent(25, 25,
- color[i],
- probe);
- pass = !pixel_probe && pass;
- if (pixel_probe)
- printf("glDrawBuffer(GL_NONE) modifies"
- " GL_FRONT_LEFT buffer\n");
- break;
- }
- pass = piglit_check_gl_error(GL_NO_ERROR)
- && pass;
- }
- return (pass ? PIGLIT_PASS : PIGLIT_FAIL);
-}
-
-void piglit_init(int argc, char **argv)
-{
- glMatrixMode(GL_PROJECTION);
- glPushMatrix();
- glLoadIdentity();
- glOrtho(0, piglit_width, 0, piglit_height, -1, 1);
- glMatrixMode(GL_MODELVIEW);
- glPushMatrix();
- glLoadIdentity();
- glClearColor(0.2, 0.2, 0.2, 1.0);
-}
diff --git a/tests/spec/gl-1.0/CMakeLists.gl.txt
b/tests/spec/gl-1.0/CMakeLists.gl.txt
index 9ec381f..5cc1d0b 100644
--- a/tests/spec/gl-1.0/CMakeLists.gl.txt
+++ b/tests/spec/gl-1.0/CMakeLists.gl.txt
@@ -13,6 +13,7 @@ piglit_add_executable (gl-1.0-blend-func blend.c)
piglit_add_executable (gl-1.0-dlist-beginend dlist-beginend.c)
piglit_add_executable (gl-1.0-dlist-bitmap dlist-bitmap.c)
piglit_add_executable (gl-1.0-dlist-shademodel dlist-shademodel.c)
+piglit_add_executable (gl-1.0-drawbuffer-modes drawbuffer-modes.c)
piglit_add_executable (gl-1.0-drawpixels-color-index drawpixels-color-index.c)
piglit_add_executable (gl-1.0-edgeflag edgeflag.c)
piglit_add_executable (gl-1.0-edgeflag-const edgeflag-const.c)
diff --git a/tests/spec/gl-1.0/drawbuffer-modes.c
b/tests/spec/gl-1.0/drawbuffer-modes.c
new file mode 100644
index 0000000..94d9796
--- /dev/null
+++ b/tests/spec/gl-1.0/drawbuffer-modes.c
@@ -0,0 +1,171 @@
+/* Copyright © 2011 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.
+ */
+
+/**
+ * \file drawbuffer-modes.c
+ * Verify the functionality of glDrawBuffer() function with different color
+ * buffer modes in default framebuffer
+ *
+ * This test works by calling glDrawBuffer function for each color buffer mode
+ * and testing the buffer's color value against expected value. All the calls
+ * should ensure no error.
+ *
+ * This test case also verifies the fix for Bug 44153:
+ * https://bugs.freedesktop.org/show_bug.cgi?id=44153
+ *
+ * \Author Yi Sun <[email protected]>, Anuj Phogat <[email protected]>
+ */
+#include "piglit-util-gl.h"
+
+PIGLIT_GL_TEST_CONFIG_BEGIN
+
+ config.supports_gl_compat_version = 10;
+
+ config.window_visual = PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE;
+ config.requires_displayed_window = true;
+ config.khr_no_error_support = PIGLIT_NO_ERRORS;
+
+PIGLIT_GL_TEST_CONFIG_END
+
+float color[7][4] = {
+ { 0.1, 0.2, 0.3, 1.0 },
+ { 0.2, 0.3, 0.4, 1.0 },
+ { 0.3, 0.4, 0.5, 1.0 },
+ { 0.4, 0.5, 0.6, 1.0 },
+ { 0.5, 0.6, 0.7, 1.0 },
+ { 0.6, 0.7, 0.8, 1.0 },
+ { 1.0, 1.0, 1.0, 1.0 } };
+
+int bufferlist[] = {
+ GL_FRONT_AND_BACK,
+ GL_BACK, GL_FRONT,
+ GL_LEFT,
+ GL_BACK_LEFT,
+ GL_FRONT_LEFT,
+ GL_NONE };
+
+enum piglit_result
+piglit_display(void)
+{
+ bool pass = true;
+ bool pixel_probe = true;
+ int i;
+ GLfloat probe[4];
+ for ( i = 0; i < ARRAY_SIZE(bufferlist); i++) {
+ glDrawBuffer(bufferlist[i]);
+ glClear(GL_COLOR_BUFFER_BIT);
+ glColor4fv(color[i]);
+ piglit_draw_rect(20, 20, 50, 50);
+ pass = piglit_check_gl_error(GL_NO_ERROR)
+ && pass;
+ switch (bufferlist[i]) {
+ case GL_FRONT_AND_BACK:
+ glReadBuffer(GL_BACK_LEFT);
+ pass = piglit_probe_rect_rgba(20, 20, 50, 50,
+ color[i])
+ && pass;
+ glReadBuffer(GL_FRONT_LEFT);
+ pass = pass &&
+ piglit_probe_rect_rgba(20, 20, 50, 50,
+ color[i]);
+ break;
+ case GL_LEFT:
+ glReadBuffer(GL_BACK_LEFT);
+ pass = piglit_probe_rect_rgba(20, 20, 50, 50,
+ color[i])
+ && pass;
+ glReadBuffer(GL_FRONT_LEFT);
+ pass = piglit_probe_rect_rgba(20, 20, 50, 50,
+ color[i])
+ && pass;
+ break;
+ case GL_BACK:
+ case GL_BACK_LEFT:
+ glReadBuffer(bufferlist[i]);
+ pass = piglit_probe_rect_rgba(20, 20, 50, 50,
+ color[i])
+ && pass;
+ /* This should not modify GL_FRONT_LEFT buffer */
+ glReadBuffer(GL_FRONT_LEFT);
+ pixel_probe = piglit_probe_pixel_rgba_silent(25, 25,
+ color[i],
+ probe);
+ pass = !pixel_probe && pass;
+ if(pixel_probe)
+ printf("glDrawBuffer(GL_BACK) modifies"
+ " GL_FRONT_LEFT buffer\n");
+ break;
+ case GL_FRONT:
+ case GL_FRONT_LEFT:
+ glReadBuffer(bufferlist[i]);
+ pass = piglit_probe_rect_rgba(20, 20, 50, 50,
+ color[i])
+ && pass;
+ /* This should not modify GL_BACK_LEFT buffer */
+ glReadBuffer(GL_BACK_LEFT);
+ pixel_probe = piglit_probe_pixel_rgba_silent(25, 25,
+ color[i],
+ probe);
+ pass = !pixel_probe && pass;
+ if(pixel_probe)
+ printf("glDrawBuffer(GL_FRONT) modifies"
+ " GL_BACK_LEFT buffer\n");
+ break;
+ case GL_NONE:
+ /* Drawing to a buffer GL_NONE should not
+ * modify any existing buffers
+ */
+ glReadBuffer(GL_BACK_LEFT);
+ pixel_probe = piglit_probe_pixel_rgba_silent(25, 25,
+ color[i],
+ probe);
+ pass = !pixel_probe && pass;
+ if(pixel_probe)
+ printf("glDrawBuffer(GL_NONE) modifies"
+ " GL_BACK_LEFT buffer\n");
+ glReadBuffer(GL_FRONT_LEFT);
+ pixel_probe = piglit_probe_pixel_rgba_silent(25, 25,
+ color[i],
+ probe);
+ pass = !pixel_probe && pass;
+ if (pixel_probe)
+ printf("glDrawBuffer(GL_NONE) modifies"
+ " GL_FRONT_LEFT buffer\n");
+ break;
+ }
+ pass = piglit_check_gl_error(GL_NO_ERROR)
+ && pass;
+ }
+ return (pass ? PIGLIT_PASS : PIGLIT_FAIL);
+}
+
+void piglit_init(int argc, char **argv)
+{
+ glMatrixMode(GL_PROJECTION);
+ glPushMatrix();
+ glLoadIdentity();
+ glOrtho(0, piglit_width, 0, piglit_height, -1, 1);
+ glMatrixMode(GL_MODELVIEW);
+ glPushMatrix();
+ glLoadIdentity();
+ glClearColor(0.2, 0.2, 0.2, 1.0);
+}
--
2.7.4
_______________________________________________
Piglit mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/piglit
