Signed-off-by: Chris Forbes <chr...@ijw.co.nz>
---
tests/all.tests | 1 +
tests/spec/arb_draw_indirect/CMakeLists.gl.txt | 1 +
.../spec/arb_draw_indirect/draw-arrays-instances.c | 123 +++++++++++++++++++++
3 files changed, 125 insertions(+)
create mode 100644 tests/spec/arb_draw_indirect/draw-arrays-instances.c
diff --git a/tests/all.tests b/tests/all.tests
index 4e7777b..ed8f79f 100644
--- a/tests/all.tests
+++ b/tests/all.tests
@@ -1225,6 +1225,7 @@ add_concurrent_test(arb_draw_indirect,
'arb_draw_indirect-draw-arrays-base-insta
add_concurrent_test(arb_draw_indirect,
'arb_draw_indirect-draw-elements-base-instance')
add_concurrent_test(arb_draw_indirect,
'arb_draw_indirect-draw-elements-prim-restart')
add_concurrent_test(arb_draw_indirect,
'arb_draw_indirect-draw-elements-prim-restart-ugly')
+add_concurrent_test(arb_draw_indirect,
'arb_draw_indirect-draw-arrays-instances')
# Group ARB_fragment_program
arb_fragment_program = Group()
diff --git a/tests/spec/arb_draw_indirect/CMakeLists.gl.txt
b/tests/spec/arb_draw_indirect/CMakeLists.gl.txt
index 1fa189c..94735db 100644
--- a/tests/spec/arb_draw_indirect/CMakeLists.gl.txt
+++ b/tests/spec/arb_draw_indirect/CMakeLists.gl.txt
@@ -16,5 +16,6 @@ piglit_add_executable
(arb_draw_indirect-draw-arrays-base-instance draw-arrays-b
piglit_add_executable (arb_draw_indirect-draw-elements-base-instance
draw-elements-base-instance.c)
piglit_add_executable (arb_draw_indirect-draw-elements-prim-restart
draw-elements-prim-restart.c)
piglit_add_executable (arb_draw_indirect-draw-elements-prim-restart-ugly
draw-elements-prim-restart-ugly.c)
+piglit_add_executable (arb_draw_indirect-draw-arrays-instances
draw-arrays-instances.c)
# vim: ft=cmake:
diff --git a/tests/spec/arb_draw_indirect/draw-arrays-instances.c
b/tests/spec/arb_draw_indirect/draw-arrays-instances.c
new file mode 100644
index 0000000..1d7c240
--- /dev/null
+++ b/tests/spec/arb_draw_indirect/draw-arrays-instances.c
@@ -0,0 +1,123 @@
+/*
+ * Copyright © 2013 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.
+ *
+ */
+
+/* Basic test of glDrawElementsIndirect */
+
+#include "piglit-util-gl-common.h"
+
+PIGLIT_GL_TEST_CONFIG_BEGIN
+
+ config.supports_gl_core_version = 31;
+
+ config.window_visual = PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB;
+
+PIGLIT_GL_TEST_CONFIG_END
+
+GLuint vao;
+GLint prog;
+
+float green[] = {0,1,0};
+float blue[] = {0,0,1};
+
+enum piglit_result
+piglit_display(void)
+{
+ bool pass = true;
+ int i;
+
+ glViewport(0, 0, 128, 128);
+
+ glClearColor(0,0,1,1);
+ glClear(GL_COLOR_BUFFER_BIT);
+
+ glBindVertexArray(vao);
+ glUseProgram(prog);
+
+ glDrawArraysIndirect(GL_TRIANGLE_STRIP, (GLvoid const *)0);
+
+ glUseProgram(0);
+
+ piglit_present_results();
+
+ for (i = 0; i < 8; i++)
+ pass = piglit_probe_pixel_rgb( 8 + 16 * i, 64, green) && pass;
+
+ return pass ? PIGLIT_PASS : PIGLIT_FAIL;
+}
+
+float vertices_data[] = {
+ -1, -1,
+ 1, -1,
+ -1, 1,
+ 1, 1,
+};
+
+GLuint indirect_data[] = {
+ 4, /* count */
+ 8, /* primcount */
+ 0, /* first vertex */
+ 0, /* mbz */
+};
+
+void
+piglit_init(int argc, char **argv)
+{
+ GLuint vertices_bo;
+ GLuint indirect_bo;
+
+ piglit_require_extension("GL_ARB_draw_indirect");
+
+ glGenVertexArrays(1, &vao);
+ glBindVertexArray(vao);
+
+ glGenBuffers(1, &vertices_bo);
+ glBindBuffer(GL_ARRAY_BUFFER, vertices_bo);
+ glBufferData(GL_ARRAY_BUFFER, sizeof(vertices_data), vertices_data,
GL_STATIC_DRAW);
+ glEnableVertexAttribArray(0);
+ glVertexAttribPointer(0, 2, GL_FLOAT, GL_FALSE, 0, 0);
+
+ glGenBuffers(1, &indirect_bo);
+ glBindBuffer(GL_DRAW_INDIRECT_BUFFER, indirect_bo);
+ glBufferData(GL_DRAW_INDIRECT_BUFFER, sizeof(indirect_data),
indirect_data, GL_STATIC_DRAW);
+
+ prog = piglit_build_simple_program(
+ "#version 140\n"
+ "#extension GL_ARB_explicit_attrib_location: require\n"
+ "\n"
+ "layout(location=0) in vec2 pos;\n"
+ "\n"
+ "void main() {\n"
+ " float x = -0.875 + gl_InstanceID * 0.25 + 0.075
* pos.x;\n"
+ " float y = 0.075 * pos.y;\n"
+ " gl_Position = vec4(x, y, 0, 1);\n"
+ "}\n",
+
+ "#version 140\n"
+ "\n"
+ "void main() {\n"
+ " gl_FragColor = vec4(0,1,0,1);\n"
+ "}\n");
+
+ glBindVertexArray(0);
+}
--
1.8.4.2
_______________________________________________
Piglit mailing list
Piglit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/piglit
