[Piglit] [PATCH 7/7] GL_ARB_draw_instanced/elements: Test glDrawElementsInstancedARB() rendering.
Eric Anholt
eric at anholt.net
Tue Feb 28 13:32:41 PST 2012
We didn't have any tests hitting this path for actual drawing, so make
a derived test from instance-array-dereference.shader_test.
---
tests/all.tests | 1 +
.../arb_draw_instanced/execution/CMakeLists.gl.txt | 1 +
tests/spec/arb_draw_instanced/execution/elements.c | 125 ++++++++++++++++++++
3 files changed, 127 insertions(+), 0 deletions(-)
create mode 100644 tests/spec/arb_draw_instanced/execution/elements.c
diff --git a/tests/all.tests b/tests/all.tests
index 916be38..0539755 100644
--- a/tests/all.tests
+++ b/tests/all.tests
@@ -1026,6 +1026,7 @@ add_shader_test_dir(arb_draw_instanced,
testsDir + '/spec/arb_draw_instanced/execution',
recursive=True)
arb_draw_instanced['dlist'] = concurrent_test('arb_draw_instanced-dlist')
+arb_draw_instanced['elements'] = concurrent_test('arb_draw_instanced-elements')
arb_draw_instanced['negative-arrays-first-negative'] = concurrent_test('arb_draw_instanced-negative-arrays-first-negative')
arb_draw_instanced['negative-elements-type'] = concurrent_test('arb_draw_instanced-negative-elements-type')
diff --git a/tests/spec/arb_draw_instanced/execution/CMakeLists.gl.txt b/tests/spec/arb_draw_instanced/execution/CMakeLists.gl.txt
index c7a94c8..6010938 100644
--- a/tests/spec/arb_draw_instanced/execution/CMakeLists.gl.txt
+++ b/tests/spec/arb_draw_instanced/execution/CMakeLists.gl.txt
@@ -12,5 +12,6 @@ link_libraries (
)
add_executable (arb_draw_instanced-dlist dlist.c)
+add_executable (arb_draw_instanced-elements elements.c)
add_executable (arb_draw_instanced-negative-arrays-first-negative negative-arrays-first-negative.c)
add_executable (arb_draw_instanced-negative-elements-type negative-elements-type.c)
diff --git a/tests/spec/arb_draw_instanced/execution/elements.c b/tests/spec/arb_draw_instanced/execution/elements.c
new file mode 100644
index 0000000..abfe987
--- /dev/null
+++ b/tests/spec/arb_draw_instanced/execution/elements.c
@@ -0,0 +1,125 @@
+/*
+ * Copyright © 2012 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 elements.c
+ *
+ * Tests that glDrawElementsInstancedARB() can render multiple
+ * instances and the instance IDs are propagated to the shader.
+ *
+ * This is a derivative of instance-array-dereference.c, which uses
+ * glDrawArraysInstancedARB().
+ */
+
+#include "piglit-util.h"
+
+int piglit_width = 70, piglit_height = 30;
+int piglit_window_mode = GLUT_RGB | GLUT_DOUBLE;
+
+static const char *vs_source =
+ "#version 120\n"
+ "#extension GL_ARB_draw_instanced: require\n"
+ "\n"
+ "uniform vec4 instance_colors[] = vec4[](vec4(0.0, 1.0, 0.0, 1.0),\n"
+ " vec4(0.0, 1.0, 1.0, 1.0),\n"
+ " vec4(0.0, 0.0, 1.0, 1.0));\n"
+ "\n"
+ "varying vec4 color;\n"
+ "\n"
+ "void main()\n"
+ "{\n"
+ " color = instance_colors[gl_InstanceIDARB];\n"
+ "\n"
+ " vec4 v = gl_Vertex;\n"
+ " v.x += 20.0 * float(gl_InstanceIDARB);\n"
+ "\n"
+ " gl_Position = gl_ModelViewProjectionMatrix * v;\n"
+ "}\n";
+
+static const char *fs_source =
+ "varying vec4 color;\n"
+ "void main()\n"
+ "{\n"
+ " gl_FragColor = color;\n"
+ "}\n";
+
+enum piglit_result
+piglit_display(void)
+{
+ static const int indices[6] = {0, 1, 2, 0, 2, 3};
+ static const float verts[] = {
+ 10, 10,
+ 20, 10,
+ 20, 20,
+ 10, 20,
+ };
+ static const float green[4] = {0.0, 1.0, 0.0, 1.0};
+ static const float cyan[4] = {0.0, 1.0, 1.0, 1.0};
+ static const float blue[4] = {0.0, 0.0, 1.0, 1.0};
+ enum piglit_result result = PIGLIT_PASS;
+
+ piglit_ortho_projection(piglit_width, piglit_height, GL_FALSE);
+
+ glClearColor(0.5, 0.5, 0.5, 0.0);
+ glClear(GL_COLOR_BUFFER_BIT);
+
+ glVertexPointer(2, GL_FLOAT, 0, verts);
+ glEnableClientState(GL_VERTEX_ARRAY);
+ glDrawElementsInstancedARB(GL_TRIANGLES, 6, GL_UNSIGNED_INT,
+ indices, 3);
+ glDisableClientState(GL_VERTEX_ARRAY);
+
+ if (!piglit_probe_rect_rgba(10, 10, 10, 10, green))
+ result = PIGLIT_FAIL;
+
+ if (!piglit_probe_rect_rgba(30, 10, 10, 10, cyan))
+ result = PIGLIT_FAIL;
+
+ if (!piglit_probe_rect_rgba(50, 10, 10, 10, blue))
+ result = PIGLIT_FAIL;
+
+ piglit_present_results();
+
+ return result;
+}
+
+void
+piglit_init(int argc, char **argv)
+{
+ GLuint vs, fs, prog;
+
+ piglit_require_extension("GL_ARB_draw_instanced");
+
+ vs = piglit_compile_shader_text(GL_VERTEX_SHADER, vs_source);
+ fs = piglit_compile_shader_text(GL_FRAGMENT_SHADER, fs_source);
+
+ prog = piglit_link_simple_program(vs, fs);
+
+ if (!vs || !fs || !prog)
+ piglit_report_result(PIGLIT_FAIL);
+
+ glDeleteShader(vs);
+ glDeleteShader(fs);
+
+ glUseProgram(prog);
+}
--
1.7.9.1
More information about the Piglit
mailing list