[Piglit] [PATCH] ATI_draw_buffers: Add two new ARB_fp test variants.
Eric Anholt
eric at anholt.net
Wed Apr 20 17:21:45 PDT 2011
One of these is at least one of the bugs that Trine is hitting --
fragment.color was overriding other fragment.color[n] when present.
---
tests/all.tests | 2 +
tests/spec/ati_draw_buffers/CMakeLists.gl.txt | 2 +
tests/spec/ati_draw_buffers/arbfp-no-index.c | 165 +++++++++++++++++++++++++
tests/spec/ati_draw_buffers/arbfp-no-option.c | 149 ++++++++++++++++++++++
4 files changed, 318 insertions(+), 0 deletions(-)
create mode 100644 tests/spec/ati_draw_buffers/arbfp-no-index.c
create mode 100644 tests/spec/ati_draw_buffers/arbfp-no-option.c
diff --git a/tests/all.tests b/tests/all.tests
index 095559b..74c92bb 100644
--- a/tests/all.tests
+++ b/tests/all.tests
@@ -958,6 +958,8 @@ add_fbo_generatemipmap_extension(ext_texture_srgb, 'GL_EXT_texture_sRGB-s3tc', '
ati_draw_buffers = Group()
spec['ATI_draw_buffers'] = ati_draw_buffers
add_plain_test(ati_draw_buffers, 'ati_draw_buffers-arbfp')
+ati_draw_buffers['arbfp-no-index'] = PlainExecTest(['ati_draw_buffers-arbfp-no-index', '-auto'])
+ati_draw_buffers['arbfp-no-option'] = PlainExecTest(['ati_draw_buffers-arbfp-no-option', '-auto'])
ati_envmap_bumpmap = Group()
spec['ATI_envmap_bumpmap'] = ati_envmap_bumpmap
diff --git a/tests/spec/ati_draw_buffers/CMakeLists.gl.txt b/tests/spec/ati_draw_buffers/CMakeLists.gl.txt
index 0bb87e7..15d0f09 100644
--- a/tests/spec/ati_draw_buffers/CMakeLists.gl.txt
+++ b/tests/spec/ati_draw_buffers/CMakeLists.gl.txt
@@ -14,5 +14,7 @@ link_libraries (
)
add_executable (ati_draw_buffers-arbfp arbfp.c)
+add_executable (ati_draw_buffers-arbfp-no-index arbfp-no-index.c)
+add_executable (ati_draw_buffers-arbfp-no-option arbfp-no-option.c)
# vim: ft=cmake:
diff --git a/tests/spec/ati_draw_buffers/arbfp-no-index.c b/tests/spec/ati_draw_buffers/arbfp-no-index.c
new file mode 100644
index 0000000..24251b5
--- /dev/null
+++ b/tests/spec/ati_draw_buffers/arbfp-no-index.c
@@ -0,0 +1,165 @@
+/*
+ * Copyright © 2010 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.
+ *
+ * Authors:
+ * Eric Anholt <eric at anholt.net>
+ * Marek Olšák <maraeo at gmail.com>
+ *
+ */
+
+/** @file arbfp.c
+ *
+ * Tests that with OPTION ATI_draw_buffers, fragment.color does not
+ * override fragment.color[1].
+ *
+ * From the ATI_draw_buffers spec:
+ *
+ * '"[n]" is optional -- color <n> is used if specified; color 0
+ * is used otherwise.'
+ *
+ * This bug in Mesa impacted Trine.
+ */
+
+#include "piglit-util.h"
+
+int piglit_width = 128;
+int piglit_height = 128;
+int piglit_window_mode = GLUT_RGB | GLUT_ALPHA | GLUT_DOUBLE;
+
+static float result0[] = {0.7, 0.6, 0.3, 0.1};
+static float result1[] = {0.2, 0.9, 0.5, 0.8};
+
+static const char *mrt_fp_string =
+ "!!ARBfp1.0\n"
+ "OPTION ATI_draw_buffers;\n"
+ "MOV result.color[1], fragment.texcoord[1];\n"
+ "MOV result.color, fragment.texcoord[0];\n"
+ "END\n";
+
+static GLuint
+attach_texture(int i)
+{
+ GLuint tex;
+
+ glGenTextures(1, &tex);
+ glBindTexture(GL_TEXTURE_2D, tex);
+ glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA,
+ piglit_width, piglit_height, 0,
+ GL_RGBA, GL_UNSIGNED_BYTE, NULL);
+
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+
+ glFramebufferTexture2DEXT(GL_FRAMEBUFFER_EXT,
+ GL_COLOR_ATTACHMENT0_EXT + i,
+ GL_TEXTURE_2D,
+ tex,
+ 0);
+ assert(glGetError() == 0);
+
+ return tex;
+}
+
+enum piglit_result
+piglit_display(void)
+{
+ GLboolean pass = GL_TRUE;
+ GLuint tex0, tex1, fb;
+ GLenum status;
+ const GLenum attachments[] = {
+ GL_COLOR_ATTACHMENT0_EXT,
+ GL_COLOR_ATTACHMENT1_EXT,
+ };
+
+ piglit_ortho_projection(piglit_width, piglit_height, GL_FALSE);
+
+ glGenFramebuffersEXT(1, &fb);
+ glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, fb);
+
+ tex0 = attach_texture(0);
+ tex1 = attach_texture(1);
+
+ glDrawBuffersATI(2, attachments);
+
+ status = glCheckFramebufferStatusEXT (GL_FRAMEBUFFER_EXT);
+ if (status != GL_FRAMEBUFFER_COMPLETE_EXT) {
+ fprintf(stderr, "fbo incomplete (status = 0x%04x)\n", status);
+ piglit_report_result(PIGLIT_SKIP);
+ }
+
+ /* Clear render targets (textures) to red */
+ glClearColor(1.0, 0.0, 0.0, 0.0);
+ glClear(GL_COLOR_BUFFER_BIT);
+
+ glMultiTexCoord4fv(GL_TEXTURE0, result0);
+ glMultiTexCoord4fv(GL_TEXTURE1, result1);
+
+ glEnable(GL_FRAGMENT_PROGRAM_ARB);
+ piglit_draw_rect(0, 0, piglit_width, piglit_height);
+ glDisable(GL_FRAGMENT_PROGRAM_ARB);
+
+ glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0);
+
+ /* Draw the two green textures to halves of the window. */
+ glEnable(GL_TEXTURE_2D);
+ glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
+ glBindTexture(GL_TEXTURE_2D, tex0);
+ piglit_draw_rect_tex(0, 0,
+ piglit_width / 2, piglit_height,
+ 0, 0, 1, 1);
+ glBindTexture(GL_TEXTURE_2D, tex1);
+ piglit_draw_rect_tex(piglit_width / 2, 0,
+ piglit_width / 2, piglit_height,
+ 0, 0, 1, 1);
+ glDisable(GL_TEXTURE_2D);
+ glDeleteTextures(1, &tex0);
+ glDeleteTextures(1, &tex1);
+ glDeleteFramebuffersEXT(1, &fb);
+
+ pass = pass && piglit_probe_rect_rgba(0, 0, piglit_width / 2, piglit_height,
+ result0);
+ pass = pass && piglit_probe_rect_rgba(piglit_width / 2, 0, piglit_width / 2, piglit_height,
+ result1);
+
+ glutSwapBuffers();
+
+ return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+}
+
+void
+piglit_init(int argc, char **argv)
+{
+ GLint num;
+
+ piglit_ortho_projection(piglit_width, piglit_height, GL_FALSE);
+
+ piglit_require_extension("GL_EXT_framebuffer_object");
+ piglit_require_extension("GL_ATI_draw_buffers");
+ piglit_require_extension("GL_ARB_fragment_program");
+ piglit_require_extension("GL_ARB_vertex_program");
+
+ glGetIntegerv(GL_MAX_DRAW_BUFFERS_ARB, &num);
+ if (num < 2)
+ piglit_report_result(PIGLIT_SKIP);
+
+ piglit_compile_program(GL_FRAGMENT_PROGRAM_ARB, mrt_fp_string);
+}
diff --git a/tests/spec/ati_draw_buffers/arbfp-no-option.c b/tests/spec/ati_draw_buffers/arbfp-no-option.c
new file mode 100644
index 0000000..c090c2f
--- /dev/null
+++ b/tests/spec/ati_draw_buffers/arbfp-no-option.c
@@ -0,0 +1,149 @@
+/*
+ * Copyright © 2010 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.
+ *
+ * Authors:
+ * Eric Anholt <eric at anholt.net>
+ * Marek Olšák <maraeo at gmail.com>
+ *
+ */
+
+/** @file arbfp-disabled-1.c
+ *
+ * Tests that drawing to two render targets with result.color (and no OPTION)
+ * works.
+ *
+ * From the ATI_draw_buffers spec:
+ *
+ * 'If the "ATI_draw_buffers" fragment program option, is not
+ * being used then DrawBuffersATI specifies a set of draw buffers
+ * into which output color 0 is written.'
+ */
+
+#include "piglit-util.h"
+
+int piglit_width = 128;
+int piglit_height = 128;
+int piglit_window_mode = GLUT_RGB | GLUT_ALPHA | GLUT_DOUBLE;
+
+static const char *mrt_fp_string =
+ "!!ARBfp1.0\n"
+ "MOV result.color, {0, 1, 0, 0};\n"
+ "END\n";
+
+static GLuint
+attach_texture(int i)
+{
+ GLuint tex;
+
+ glGenTextures(1, &tex);
+ glBindTexture(GL_TEXTURE_2D, tex);
+ glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA,
+ piglit_width, piglit_height, 0,
+ GL_RGBA, GL_UNSIGNED_BYTE, NULL);
+
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+
+ glFramebufferTexture2DEXT(GL_FRAMEBUFFER_EXT,
+ GL_COLOR_ATTACHMENT0_EXT + i,
+ GL_TEXTURE_2D,
+ tex,
+ 0);
+ assert(glGetError() == 0);
+
+ return tex;
+}
+
+enum piglit_result
+piglit_display(void)
+{
+ GLboolean pass = GL_TRUE;
+ GLuint tex0, tex1, fb;
+ GLenum status;
+ const GLenum attachments[] = {
+ GL_COLOR_ATTACHMENT0_EXT,
+ GL_COLOR_ATTACHMENT1_EXT,
+ };
+ float green[4] = {0, 1, 0, 0};
+
+ glGenFramebuffersEXT(1, &fb);
+ glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, fb);
+
+ tex0 = attach_texture(0);
+ tex1 = attach_texture(1);
+
+ glDrawBuffersATI(2, attachments);
+
+ status = glCheckFramebufferStatusEXT (GL_FRAMEBUFFER_EXT);
+ if (status != GL_FRAMEBUFFER_COMPLETE_EXT) {
+ fprintf(stderr, "fbo incomplete (status = 0x%04x)\n", status);
+ piglit_report_result(PIGLIT_SKIP);
+ }
+
+ /* Clear render targets (textures) to red */
+ glClearColor(1.0, 0.0, 0.0, 0.0);
+ glClear(GL_COLOR_BUFFER_BIT);
+
+ glEnable(GL_FRAGMENT_PROGRAM_ARB);
+ piglit_draw_rect(-1, -1, 2, 2);
+ glDisable(GL_FRAGMENT_PROGRAM_ARB);
+
+ glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0);
+
+ /* Draw the two green textures to top/bottom halves of the window. */
+ glEnable(GL_TEXTURE_2D);
+ glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
+ glBindTexture(GL_TEXTURE_2D, tex0);
+ piglit_draw_rect_tex(-1, -1, 2, 1,
+ 0, 0, 1, 1);
+ glBindTexture(GL_TEXTURE_2D, tex1);
+ piglit_draw_rect_tex(-1, 0, 2, 1,
+ 0, 0, 1, 1);
+ glDisable(GL_TEXTURE_2D);
+ glDeleteTextures(1, &tex0);
+ glDeleteTextures(1, &tex1);
+ glDeleteFramebuffersEXT(1, &fb);
+
+ pass = piglit_probe_rect_rgba(0, 0, piglit_width, piglit_height,
+ green);
+
+ glutSwapBuffers();
+
+ return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+}
+
+void
+piglit_init(int argc, char **argv)
+{
+ GLint num;
+
+ piglit_require_extension("GL_EXT_framebuffer_object");
+ piglit_require_extension("GL_ATI_draw_buffers");
+ piglit_require_extension("GL_ARB_fragment_program");
+ piglit_require_extension("GL_ARB_vertex_program");
+
+ glGetIntegerv(GL_MAX_DRAW_BUFFERS_ARB, &num);
+ if (num < 2)
+ piglit_report_result(PIGLIT_SKIP);
+
+ piglit_compile_program(GL_FRAGMENT_PROGRAM_ARB, mrt_fp_string);
+}
--
1.7.4.4
More information about the Piglit
mailing list