---
tests/all.tests | 4 +
tests/spec/CMakeLists.txt | 1 +
tests/spec/arb_vertex_program/CMakeLists.gl.txt | 16 ++++
tests/spec/arb_vertex_program/CMakeLists.txt | 1 +
.../spec/arb_vertex_program/getenv4d-with-error.c | 88 ++++++++++++++++++++
5 files changed, 110 insertions(+), 0 deletions(-)
create mode 100644 tests/spec/arb_vertex_program/CMakeLists.gl.txt
create mode 100644 tests/spec/arb_vertex_program/CMakeLists.txt
create mode 100644 tests/spec/arb_vertex_program/getenv4d-with-error.c
diff --git a/tests/all.tests b/tests/all.tests
index 86987d9..8a319be 100644
--- a/tests/all.tests
+++ b/tests/all.tests
@@ -892,6 +892,10 @@ spec['ARB_vertex_buffer_object'] = arb_vertex_buffer_object
arb_vertex_buffer_object['elements-negative-offset'] =
PlainExecTest(['arb_vertex_buffer_object-elements-negative-offset', '-auto'])
arb_vertex_buffer_object['mixed-immediate-and-vbo'] =
PlainExecTest(['arb_vertex_buffer_object-mixed-immediate-and-vbo', '-auto'])
+arb_vertex_program = Group()
+spec['ARB_vertex_program'] = arb_vertex_program
+arb_vertex_program['getenv4d-with-error'] =
PlainExecTest(['arb_vertex_program-getenv4d-with-error', '-auto'])
+
ext_framebuffer_object = Group()
spec['EXT_framebuffer_object'] = ext_framebuffer_object
add_fbo_stencil_tests(ext_framebuffer_object, 'GL_STENCIL_INDEX1')
diff --git a/tests/spec/CMakeLists.txt b/tests/spec/CMakeLists.txt
index efcc660..52dfcf4 100644
--- a/tests/spec/CMakeLists.txt
+++ b/tests/spec/CMakeLists.txt
@@ -15,3 +15,4 @@ add_subdirectory (nv_conditional_render)
add_subdirectory (nv_texture_barrier)
add_subdirectory (arb_draw_elements_base_vertex)
add_subdirectory (arb_vertex_buffer_object)
+add_subdirectory (arb_vertex_program)
diff --git a/tests/spec/arb_vertex_program/CMakeLists.gl.txt
b/tests/spec/arb_vertex_program/CMakeLists.gl.txt
new file mode 100644
index 0000000..f71badd
--- /dev/null
+++ b/tests/spec/arb_vertex_program/CMakeLists.gl.txt
@@ -0,0 +1,16 @@
+include_directories(
+ ${OPENGL_INCLUDE_PATH}
+ ${GLUT_INCLUDE_DIR}
+ ${piglit_SOURCE_DIR}/tests/util
+)
+
+link_libraries (
+ piglitutil
+ ${OPENGL_gl_LIBRARY}
+ ${OPENGL_glu_LIBRARY}
+ ${GLUT_glut_LIBRARY}
+)
+
+add_executable (arb_vertex_program-getenv4d-with-error getenv4d-with-error.c)
+
+# vim: ft=cmake:
diff --git a/tests/spec/arb_vertex_program/CMakeLists.txt
b/tests/spec/arb_vertex_program/CMakeLists.txt
new file mode 100644
index 0000000..144a306
--- /dev/null
+++ b/tests/spec/arb_vertex_program/CMakeLists.txt
@@ -0,0 +1 @@
+piglit_include_target_api()
diff --git a/tests/spec/arb_vertex_program/getenv4d-with-error.c
b/tests/spec/arb_vertex_program/getenv4d-with-error.c
new file mode 100644
index 0000000..3e77a7f
--- /dev/null
+++ b/tests/spec/arb_vertex_program/getenv4d-with-error.c
@@ -0,0 +1,88 @@
+/*
+ * 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 getenv4d-with-error.c
+ *
+ * Tests for a bug in Mesa where glGetProgramEnvParameter4dARB would
+ * fail to update the result if there was an existing GL error in the
+ * context.
+ */
+
+#include "piglit-util.h"
+
+int piglit_width = 64, piglit_height = 64;
+int piglit_window_mode = GLUT_RGB | GLUT_DOUBLE | GLUT_ALPHA;
+
+void
+piglit_init(int argc, char **argv)
+{
+ bool pass = true;
+ double test_data[4] = { 0.1, 0.2, 0.3, 0.4 };
+ double result_data[4];
+ float epsilon = .00001;
+
+ piglit_require_extension("GL_ARB_vertex_program");
+
+ glProgramEnvParameter4dARB(GL_VERTEX_PROGRAM_ARB, 0,
+ test_data[0],
+ test_data[1],
+ test_data[2],
+ test_data[3]);
+
+ /* Produce a GL error to trick Mesa's
+ * glGetProgramEnvParameterdvARB code.
+ */
+ glDepthFunc(0xd0d0d0d0);
+
+ glGetProgramEnvParameterdvARB(GL_VERTEX_PROGRAM_ARB, 0, result_data);
+
+ if (fabs(test_data[0] - result_data[0]) > epsilon ||
+ fabs(test_data[1] - result_data[1]) > epsilon ||
+ fabs(test_data[2] - result_data[2]) > epsilon ||
+ fabs(test_data[3] - result_data[3]) > epsilon) {
+ fprintf(stderr, "ProgramEnvParamter4dvARB failed:\n");
+ fprintf(stderr, "Expected: (%f %f %f %f)\n",
+ test_data[0],
+ test_data[1],
+ test_data[2],
+ test_data[3]);
+ fprintf(stderr, "Expected: (%f %f %f %f)\n",
+ result_data[0],
+ result_data[1],
+ result_data[2],
+ result_data[3]);
+
+ pass = false;
+ }
+
+ /* Clear our error. */
+ (void)glGetError();
+
+ piglit_report_result(pass ? PIGLIT_PASS : PIGLIT_FAIL);
+}
+
+enum piglit_result
+piglit_display(void)
+{
+ return PIGLIT_FAIL;
+}
--
1.7.5.4
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
