summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarek Olšák <maraeo@gmail.com>2011-03-07 02:48:11 +0100
committerMarek Olšák <maraeo@gmail.com>2011-03-07 02:49:12 +0100
commitf4d10fc074c65323e94ae3ea198408f98215aa47 (patch)
tree95710346c631b55d79b8f081464633a8a2965240
parent77e6363e5b859cfcbedf83ac7b3b29203c885063 (diff)
instanced_arrays: new test for ARB_instanced_arrays without ARB_draw_instanced
-rw-r--r--tests/all.tests4
-rw-r--r--tests/spec/CMakeLists.txt1
-rw-r--r--tests/spec/arb_instanced_arrays/CMakeLists.gl.txt17
-rw-r--r--tests/spec/arb_instanced_arrays/CMakeLists.txt1
-rw-r--r--tests/spec/arb_instanced_arrays/instanced_arrays.c189
5 files changed, 212 insertions, 0 deletions
diff --git a/tests/all.tests b/tests/all.tests
index 1283d3937..10c1ff909 100644
--- a/tests/all.tests
+++ b/tests/all.tests
@@ -1220,6 +1220,10 @@ ati_envmap_bumpmap = Group()
spec['ATI_envmap_bumpmap'] = ati_envmap_bumpmap
add_plain_test(ati_envmap_bumpmap, 'ati_envmap_bumpmap-bump')
+arb_instanced_arrays = Group()
+spec['ARB_instanced_arrays'] = arb_instanced_arrays
+add_plain_test(arb_instanced_arrays, 'instanced_arrays')
+
ext_fog_coord = Group()
spec['EXT_fog_coord'] = ext_fog_coord
add_plain_test(ext_fog_coord, 'ext_fog_coord-modes')
diff --git a/tests/spec/CMakeLists.txt b/tests/spec/CMakeLists.txt
index 172205c48..b32debff9 100644
--- a/tests/spec/CMakeLists.txt
+++ b/tests/spec/CMakeLists.txt
@@ -1,5 +1,6 @@
add_subdirectory (arb_color_buffer_float)
add_subdirectory (arb_es2_compatibility)
+add_subdirectory (arb_instanced_arrays)
add_subdirectory (arb_shader_texture_lod)
add_subdirectory (ati_envmap_bumpmap)
add_subdirectory (ext_fog_coord)
diff --git a/tests/spec/arb_instanced_arrays/CMakeLists.gl.txt b/tests/spec/arb_instanced_arrays/CMakeLists.gl.txt
new file mode 100644
index 000000000..5ea31cc5f
--- /dev/null
+++ b/tests/spec/arb_instanced_arrays/CMakeLists.gl.txt
@@ -0,0 +1,17 @@
+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}
+ ${TIFF_LIBRARY}
+)
+
+add_executable (instanced_arrays instanced_arrays.c)
+
+# vim: ft=cmake:
diff --git a/tests/spec/arb_instanced_arrays/CMakeLists.txt b/tests/spec/arb_instanced_arrays/CMakeLists.txt
new file mode 100644
index 000000000..144a306f4
--- /dev/null
+++ b/tests/spec/arb_instanced_arrays/CMakeLists.txt
@@ -0,0 +1 @@
+piglit_include_target_api()
diff --git a/tests/spec/arb_instanced_arrays/instanced_arrays.c b/tests/spec/arb_instanced_arrays/instanced_arrays.c
new file mode 100644
index 000000000..f65486745
--- /dev/null
+++ b/tests/spec/arb_instanced_arrays/instanced_arrays.c
@@ -0,0 +1,189 @@
+/*
+ * Copyright (c) 2010 VMware, Inc.
+ *
+ * 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
+ * on the rights to use, copy, modify, merge, publish, distribute, sub
+ * license, 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
+ * NON-INFRINGEMENT. IN NO EVENT SHALL VMWARE AND/OR THEIR SUPPLIERS
+ * 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
+ * Tests GL_ARB_instanced_arrays
+ */
+
+#include "piglit-util.h"
+
+
+int piglit_width = 500, piglit_height = 500;
+int piglit_window_mode = GLUT_RGB | GLUT_ALPHA | GLUT_DOUBLE;
+
+static const char *TestName = "draw-instanced-arrays";
+
+static GLint PosAttrib, ColorAttrib;
+
+#define PRIMS 8
+
+static const char *VertShaderText =
+ "attribute vec2 Pos; \n"
+ "attribute vec4 Color; \n"
+ "void main() \n"
+ "{ \n"
+ " vec4 p = gl_Vertex; \n"
+ " vec2 pos = Pos; \n"
+ " p.x += pos.x; \n"
+ " p.y += pos.y; \n"
+ " gl_Position = gl_ModelViewProjectionMatrix * p; \n"
+ " gl_FrontColor = Color; \n"
+ "} \n";
+
+static const char *FragShaderText =
+ "void main() \n"
+ "{ \n"
+ " gl_FragColor = gl_Color; \n"
+ "} \n";
+
+
+static GLuint VertShader, FragShader, Program;
+
+static const GLfloat Positions[PRIMS][2] = {
+ { -6, 6 },
+ { -4, 4 },
+ { -2, 2 },
+ { 0, 0 },
+ { 2, -2 },
+ { 4, -4 },
+ { 6, -6 },
+ { 8, -8 }
+};
+
+static const GLfloat Colors[PRIMS][4] = {
+ {1, 0, 0, 1},
+ {0, 1, 0, 1},
+ {0, 0, 1, 1},
+ {1, 1, 0, 1},
+ {0, 1, 1, 1},
+ {1, 0, 1, 1},
+ {1, 1, 1, 1},
+ {0.5, 0.5, 0.5, 1},
+};
+
+
+static GLboolean
+test_instancing(GLuint divisor)
+{
+ static const GLfloat verts[4][2] = {
+ {-1, -1}, {1, -1}, {1, 1}, {-1, 1}
+ };
+
+ glVertexPointer(2, GL_FLOAT, 0, verts);
+ glEnableClientState(GL_VERTEX_ARRAY);
+
+ glVertexAttribPointer(PosAttrib, 2, GL_FLOAT, GL_FALSE, 0, Positions);
+ glVertexAttribPointer(ColorAttrib, 4, GL_FLOAT, GL_FALSE, 0, Colors);
+ glEnableVertexAttribArray(PosAttrib);
+ glEnableVertexAttribArray(ColorAttrib);
+ glVertexAttribDivisorARB(PosAttrib, 1);
+ /* advance color once every 'n' instances */
+ glVertexAttribDivisorARB(ColorAttrib, divisor);
+
+ glClear(GL_COLOR_BUFFER_BIT);
+
+ glUseProgram(Program);
+
+ glDrawArraysInstancedARB(GL_POLYGON, 0, 4, PRIMS);
+
+ glUseProgram(0);
+
+ {
+ GLint i;
+ GLint pos[4];
+
+ for (i = 0; i < PRIMS; i++) {
+ GLuint elem = i / divisor;
+
+ /* use glRasterPos to determine where to read a sample pixel */
+ glRasterPos2fv(Positions[i]);
+ glGetIntegerv(GL_CURRENT_RASTER_POSITION, pos);
+
+ if (!piglit_probe_pixel_rgba(pos[0], pos[1], Colors[elem])) {
+ fprintf(stderr, "%s: instance %d failed to draw correctly\n",
+ TestName, i);
+ fprintf(stderr, "%s: color instance divisor = %u\n",
+ TestName, divisor);
+ glutSwapBuffers();
+ return GL_FALSE;
+ }
+ }
+ }
+
+ glDisableClientState(GL_VERTEX_ARRAY);
+ glDisableVertexAttribArray(PosAttrib);
+ glDisableVertexAttribArray(ColorAttrib);
+
+ glutSwapBuffers();
+
+ return GL_TRUE;
+}
+
+
+enum piglit_result
+piglit_display(void)
+{
+ GLuint div;
+
+ for (div = 1; div <= PRIMS; div++) {
+ if (!test_instancing(div))
+ return PIGLIT_FAILURE;
+ }
+
+ return PIGLIT_SUCCESS;
+}
+
+
+void
+piglit_init(int argc, char **argv)
+{
+ piglit_require_extension("GL_ARB_instanced_arrays");
+
+ /* Workaround a GLEW bug: */
+ glDrawArraysInstancedARB = (PFNGLDRAWARRAYSINSTANCEDARBPROC)piglit_get_proc_address("glDrawArraysInstancedARB");
+ glDrawElementsInstancedARB = (PFNGLDRAWELEMENTSINSTANCEDARBPROC)piglit_get_proc_address("glDrawElementsInstancedARB");
+
+ VertShader = piglit_compile_shader_text(GL_VERTEX_SHADER, VertShaderText);
+ assert(VertShader);
+
+ FragShader = piglit_compile_shader_text(GL_FRAGMENT_SHADER, FragShaderText);
+ assert(FragShader);
+
+ Program = piglit_link_simple_program(VertShader, FragShader);
+
+ glUseProgram(Program);
+
+ PosAttrib = glGetAttribLocation(Program, "Pos");
+ ColorAttrib = glGetAttribLocation(Program, "Color");
+
+ glMatrixMode(GL_PROJECTION);
+ glLoadIdentity();
+ glFrustum(-5, 5, -5, 5, 10, 20);
+
+ glMatrixMode(GL_MODELVIEW);
+ glLoadIdentity();
+ glTranslatef(0, 0, -11.0);
+ glScalef(0.5, 0.5, 1.0);
+}