---
tests/all.py | 2 +-
tests/general/CMakeLists.gl.txt | 1 -
tests/general/draw-elements-base-vertex-bounds.c | 127 --------------------
.../CMakeLists.gl.txt | 1 +
tests/spec/arb_draw_elements_base_vertex/bounds.c | 127 ++++++++++++++++++++
5 files changed, 129 insertions(+), 129 deletions(-)
delete mode 100644 tests/general/draw-elements-base-vertex-bounds.c
create mode 100644 tests/spec/arb_draw_elements_base_vertex/bounds.c
diff --git a/tests/all.py b/tests/all.py
index 424eb92..1c740c2 100644
--- a/tests/all.py
+++ b/tests/all.py
@@ -1577,7 +1577,7 @@ arb_draw_elements_base_vertex['dlist'] =
concurrent_test('arb_draw_elements_base
add_plain_test(arb_draw_elements_base_vertex, 'draw-elements-base-vertex')
arb_draw_elements_base_vertex['draw-elements-base-vertex-user_varrays'] =
PiglitTest(['draw-elements-base-vertex', '-auto', 'user_varrays'])
add_plain_test(arb_draw_elements_base_vertex, 'draw-elements-base-vertex-neg')
-add_plain_test(arb_draw_elements_base_vertex,
'draw-elements-base-vertex-bounds')
+add_plain_test(arb_draw_elements_base_vertex,
'arb_draw_elements_base_vertex-bounds')
arb_draw_elements_base_vertex['draw-elements-base-vertex-neg-user_varrays'] =
PiglitTest(['draw-elements-base-vertex-neg', '-auto', 'user_varrays'])
add_plain_test(arb_draw_elements_base_vertex,
'arb_draw_elements_base_vertex-drawelements-instanced')
arb_draw_elements_base_vertex['draw-elements-instanced-base-vertex-user_varrays']
= PiglitTest(['draw-elements-instanced-base-vertex', '-auto', 'user_varrays'])
diff --git a/tests/general/CMakeLists.gl.txt b/tests/general/CMakeLists.gl.txt
index be2ed50..3f22a86 100644
--- a/tests/general/CMakeLists.gl.txt
+++ b/tests/general/CMakeLists.gl.txt
@@ -41,7 +41,6 @@ piglit_add_executable (draw-batch draw-batch.c)
piglit_add_executable (draw-copypixels-sync draw-copypixels-sync.c)
piglit_add_executable (draw-elements draw-elements.c)
piglit_add_executable (draw-elements-base-vertex draw-elements-base-vertex.c)
-piglit_add_executable (draw-elements-base-vertex-bounds
draw-elements-base-vertex-bounds.c)
piglit_add_executable (draw-elements-base-vertex-neg
draw-elements-base-vertex-neg.c)
IF (UNIX)
target_link_libraries (draw-elements-base-vertex-neg m)
diff --git a/tests/general/draw-elements-base-vertex-bounds.c
b/tests/general/draw-elements-base-vertex-bounds.c
deleted file mode 100644
index db150db..0000000
--- a/tests/general/draw-elements-base-vertex-bounds.c
+++ /dev/null
@@ -1,127 +0,0 @@
-/*
- * Copyright © 2009 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 <[email protected]>
- * Michal Suchanek <[email protected]>
- * based on mesa demo added by Keith Whitwell <[email protected]>
- */
-
-/** @file draw-elements-base-vertex.c
- * Tests ARB_draw_elements_base_vertex functionality by drawing two
- * triangles using different base vertices, using the same vertex and
- * index buffers.
- * In Mesa Gallium 7.11 this causes a crash.
- */
-
-#include "piglit-util-gl-common.h"
-
-PIGLIT_GL_TEST_CONFIG_BEGIN
-
- config.supports_gl_compat_version = 10;
-
- config.window_width = 300;
- config.window_height = 300;
- config.window_visual = PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE;
-
-PIGLIT_GL_TEST_CONFIG_END
-
-static GLfloat vertices[][4] = {
- { 1, -1, 0, 1 }, /* bottom right */
- { 1, 1, 0, 1 }, /* top right */
- { -1, 1, 0, 1 }, /* top left */
- { -1, -1, 0, 1 }, /* bottom left */
-};
-static GLubyte colors[][4] = {
- { 0, 255, 0, 0 },
- { 0, 0, 255, 0 },
- { 255, 255, 255, 0 },
- { 255, 0, 0, 0 },
-};
-
-void
-piglit_init(int argc, char **argv)
-{
- static const char * program =
- "!!ARBvp1.0\n"
- "MOV result.color, vertex.color;\n"
- "MOV result.position, vertex.position;\n"
- "END\n";
- GLuint program_no;
-
- piglit_require_extension("GL_ARB_draw_elements_base_vertex");
- piglit_require_extension("GL_ARB_vertex_program");
- glGenProgramsARB(1, &program_no);
- glBindProgramARB(GL_VERTEX_PROGRAM_ARB, program_no);
- glProgramStringARB(GL_VERTEX_PROGRAM_ARB, GL_PROGRAM_FORMAT_ASCII_ARB,
- strlen(program), program);
- assert(glIsProgramARB(program_no));
-
- glMatrixMode(GL_MODELVIEW);
- glPushMatrix();
- glLoadIdentity();
-
- glEnableClientState(GL_VERTEX_ARRAY);
- glVertexPointer(3, GL_FLOAT, sizeof(vertices[0]), vertices);
- glEnableClientState(GL_COLOR_ARRAY);
- glColorPointer(4, GL_UNSIGNED_BYTE, 0, colors);
-}
-
-enum piglit_result
-piglit_display(void)
-{
- GLboolean pass = GL_TRUE;
- GLuint indices[] = { 1, 2, 0,
- 3, 0, 1 };
- static GLfloat test_colors[][3] = {
- { 1, 0, 0 },
- { 0, 1, 0 },
- { 0, 0, 1 },
- { 1, 1, 1 },
- };
-
- glViewport(0, 0, piglit_width, piglit_height);
- glMatrixMode(GL_PROJECTION);
- glLoadIdentity();
- glOrtho(-1, 1, -1, 1, -0.5, 1000);
- glMatrixMode(GL_MODELVIEW);
- glLoadIdentity();
-
- glClearColor(0.3, 0.3, 0.3, 1);
- glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
-
- glEnable(GL_VERTEX_PROGRAM_ARB);
- /* draw elements 3,4,5 ->verts 3,0,1 (lower-right tri) */
- glDrawElements(GL_TRIANGLES, 3, GL_UNSIGNED_INT, indices + 3);
- /* draw elements 0,1,2 ->verts (1+1),(2+1),(0+1) (upper-left tri) */
- glDrawElementsBaseVertex(GL_TRIANGLES, 3, GL_UNSIGNED_INT, indices, 1);
- glFlush();
-
- pass = piglit_probe_pixel_rgb(0, 0, test_colors[0]) && pass;
- pass = piglit_probe_pixel_rgb(piglit_width - 1, 0, test_colors[1]) &&
pass;
- pass = piglit_probe_pixel_rgb(piglit_width - 1, piglit_height - 1,
test_colors[2]) && pass;
- pass = piglit_probe_pixel_rgb(0, piglit_height - 1, test_colors[3]) &&
pass;
-
- piglit_present_results();
-
- return pass ? PIGLIT_PASS : PIGLIT_FAIL;
-}
diff --git a/tests/spec/arb_draw_elements_base_vertex/CMakeLists.gl.txt
b/tests/spec/arb_draw_elements_base_vertex/CMakeLists.gl.txt
index d41cdf6..56d3f56 100644
--- a/tests/spec/arb_draw_elements_base_vertex/CMakeLists.gl.txt
+++ b/tests/spec/arb_draw_elements_base_vertex/CMakeLists.gl.txt
@@ -9,6 +9,7 @@ link_libraries (
${OPENGL_glu_LIBRARY}
)
+piglit_add_executable (arb_draw_elements_base_vertex-bounds bounds.c)
piglit_add_executable (arb_draw_elements_base_vertex-drawelements-instanced
drawelements-instanced.c)
piglit_add_executable (arb_draw_elements_base_vertex-dlist dlist.c)
piglit_add_executable (arb_draw_elements_base_vertex-multidrawelements
multidrawelements.c)
diff --git a/tests/spec/arb_draw_elements_base_vertex/bounds.c
b/tests/spec/arb_draw_elements_base_vertex/bounds.c
new file mode 100644
index 0000000..db150db
--- /dev/null
+++ b/tests/spec/arb_draw_elements_base_vertex/bounds.c
@@ -0,0 +1,127 @@
+/*
+ * Copyright © 2009 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 <[email protected]>
+ * Michal Suchanek <[email protected]>
+ * based on mesa demo added by Keith Whitwell <[email protected]>
+ */
+
+/** @file draw-elements-base-vertex.c
+ * Tests ARB_draw_elements_base_vertex functionality by drawing two
+ * triangles using different base vertices, using the same vertex and
+ * index buffers.
+ * In Mesa Gallium 7.11 this causes a crash.
+ */
+
+#include "piglit-util-gl-common.h"
+
+PIGLIT_GL_TEST_CONFIG_BEGIN
+
+ config.supports_gl_compat_version = 10;
+
+ config.window_width = 300;
+ config.window_height = 300;
+ config.window_visual = PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE;
+
+PIGLIT_GL_TEST_CONFIG_END
+
+static GLfloat vertices[][4] = {
+ { 1, -1, 0, 1 }, /* bottom right */
+ { 1, 1, 0, 1 }, /* top right */
+ { -1, 1, 0, 1 }, /* top left */
+ { -1, -1, 0, 1 }, /* bottom left */
+};
+static GLubyte colors[][4] = {
+ { 0, 255, 0, 0 },
+ { 0, 0, 255, 0 },
+ { 255, 255, 255, 0 },
+ { 255, 0, 0, 0 },
+};
+
+void
+piglit_init(int argc, char **argv)
+{
+ static const char * program =
+ "!!ARBvp1.0\n"
+ "MOV result.color, vertex.color;\n"
+ "MOV result.position, vertex.position;\n"
+ "END\n";
+ GLuint program_no;
+
+ piglit_require_extension("GL_ARB_draw_elements_base_vertex");
+ piglit_require_extension("GL_ARB_vertex_program");
+ glGenProgramsARB(1, &program_no);
+ glBindProgramARB(GL_VERTEX_PROGRAM_ARB, program_no);
+ glProgramStringARB(GL_VERTEX_PROGRAM_ARB, GL_PROGRAM_FORMAT_ASCII_ARB,
+ strlen(program), program);
+ assert(glIsProgramARB(program_no));
+
+ glMatrixMode(GL_MODELVIEW);
+ glPushMatrix();
+ glLoadIdentity();
+
+ glEnableClientState(GL_VERTEX_ARRAY);
+ glVertexPointer(3, GL_FLOAT, sizeof(vertices[0]), vertices);
+ glEnableClientState(GL_COLOR_ARRAY);
+ glColorPointer(4, GL_UNSIGNED_BYTE, 0, colors);
+}
+
+enum piglit_result
+piglit_display(void)
+{
+ GLboolean pass = GL_TRUE;
+ GLuint indices[] = { 1, 2, 0,
+ 3, 0, 1 };
+ static GLfloat test_colors[][3] = {
+ { 1, 0, 0 },
+ { 0, 1, 0 },
+ { 0, 0, 1 },
+ { 1, 1, 1 },
+ };
+
+ glViewport(0, 0, piglit_width, piglit_height);
+ glMatrixMode(GL_PROJECTION);
+ glLoadIdentity();
+ glOrtho(-1, 1, -1, 1, -0.5, 1000);
+ glMatrixMode(GL_MODELVIEW);
+ glLoadIdentity();
+
+ glClearColor(0.3, 0.3, 0.3, 1);
+ glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+
+ glEnable(GL_VERTEX_PROGRAM_ARB);
+ /* draw elements 3,4,5 ->verts 3,0,1 (lower-right tri) */
+ glDrawElements(GL_TRIANGLES, 3, GL_UNSIGNED_INT, indices + 3);
+ /* draw elements 0,1,2 ->verts (1+1),(2+1),(0+1) (upper-left tri) */
+ glDrawElementsBaseVertex(GL_TRIANGLES, 3, GL_UNSIGNED_INT, indices, 1);
+ glFlush();
+
+ pass = piglit_probe_pixel_rgb(0, 0, test_colors[0]) && pass;
+ pass = piglit_probe_pixel_rgb(piglit_width - 1, 0, test_colors[1]) &&
pass;
+ pass = piglit_probe_pixel_rgb(piglit_width - 1, piglit_height - 1,
test_colors[2]) && pass;
+ pass = piglit_probe_pixel_rgb(0, piglit_height - 1, test_colors[3]) &&
pass;
+
+ piglit_present_results();
+
+ return pass ? PIGLIT_PASS : PIGLIT_FAIL;
+}
--
1.7.10.4
_______________________________________________
Piglit mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/piglit
