---
tests/all.tests | 1 +
.../arb_uniform_buffer_object/CMakeLists.gl.txt | 1 +
.../getactiveuniformsiv-uniform-matrix-stride.c | 120 ++++++++++++++++++++
3 files changed, 122 insertions(+)
create mode 100644
tests/spec/arb_uniform_buffer_object/getactiveuniformsiv-uniform-matrix-stride.c
diff --git a/tests/all.tests b/tests/all.tests
index ab96a77..b3859d1 100644
--- a/tests/all.tests
+++ b/tests/all.tests
@@ -1906,6 +1906,7 @@ arb_uniform_buffer_object['getactiveuniformblockname'] =
concurrent_test('arb_un
arb_uniform_buffer_object['getactiveuniformname'] =
concurrent_test('arb_uniform_buffer_object-getactiveuniformname')
arb_uniform_buffer_object['getactiveuniformsiv-uniform-array-stride'] =
concurrent_test('arb_uniform_buffer_object-getactiveuniformsiv-uniform-array-stride')
arb_uniform_buffer_object['getactiveuniformsiv-uniform-block-index'] =
concurrent_test('arb_uniform_buffer_object-getactiveuniformsiv-uniform-block-index')
+arb_uniform_buffer_object['getactiveuniformsiv-uniform-matrix-stride'] =
concurrent_test('arb_uniform_buffer_object-getactiveuniformsiv-uniform-matrix-stride')
arb_uniform_buffer_object['getactiveuniformsiv-uniform-type'] =
concurrent_test('arb_uniform_buffer_object-getactiveuniformsiv-uniform-type')
arb_uniform_buffer_object['getintegeri_v'] =
concurrent_test('arb_uniform_buffer_object-getintegeri_v')
arb_uniform_buffer_object['getprogramiv'] =
concurrent_test('arb_uniform_buffer_object-getprogramiv')
diff --git a/tests/spec/arb_uniform_buffer_object/CMakeLists.gl.txt
b/tests/spec/arb_uniform_buffer_object/CMakeLists.gl.txt
index 47f6f9f..85e4306 100644
--- a/tests/spec/arb_uniform_buffer_object/CMakeLists.gl.txt
+++ b/tests/spec/arb_uniform_buffer_object/CMakeLists.gl.txt
@@ -17,6 +17,7 @@ add_executable
(arb_uniform_buffer_object-getactiveuniformblockname getactiveuni
add_executable (arb_uniform_buffer_object-getactiveuniformname
getactiveuniformname.c)
add_executable
(arb_uniform_buffer_object-getactiveuniformsiv-uniform-array-stride
getactiveuniformsiv-uniform-array-stride.c)
add_executable
(arb_uniform_buffer_object-getactiveuniformsiv-uniform-block-index
getactiveuniformsiv-uniform-block-index.c)
+add_executable
(arb_uniform_buffer_object-getactiveuniformsiv-uniform-matrix-stride
getactiveuniformsiv-uniform-matrix-stride.c)
add_executable (arb_uniform_buffer_object-getactiveuniformsiv-uniform-type
getactiveuniformsiv-uniform-type.c uniform-types.c)
add_executable (arb_uniform_buffer_object-getintegeri_v getintegeri_v.c)
add_executable (arb_uniform_buffer_object-getprogramiv getprogramiv.c)
diff --git
a/tests/spec/arb_uniform_buffer_object/getactiveuniformsiv-uniform-matrix-stride.c
b/tests/spec/arb_uniform_buffer_object/getactiveuniformsiv-uniform-matrix-stride.c
new file mode 100644
index 0000000..c7db92a
--- /dev/null
+++
b/tests/spec/arb_uniform_buffer_object/getactiveuniformsiv-uniform-matrix-stride.c
@@ -0,0 +1,120 @@
+/*
+ * 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 getactiveuniformsiv-uniform-matrix-stride.c
+ *
+ * Tests that (std140 layout) uniform matrix strides are reported
+ * correctly through the API.
+ *
+ * Because std140 lays matrices out like arrays, and array elements
+ * get rounded up to the size of a vec4, MATRIX_STRIDE is either 16 or
+ * a non-matrix value.
+ */
+
+#include "piglit-util-gl-common.h"
+
+PIGLIT_GL_TEST_MAIN(
+ 10 /*window_width*/,
+ 10 /*window_height*/,
+ GLUT_DOUBLE | GLUT_RGB | GLUT_ALPHA)
+
+static const char fs_source[] =
+ "#extension GL_ARB_uniform_buffer_object : require\n"
+ "\n"
+ "layout(std140) uniform ub {\n"
+ " vec4 v4;\n"
+ " mat4 m4;\n"
+ " mat3 m3;\n"
+ " mat2 m2;\n"
+ " mat4 m4a[2];\n"
+ "};\n"
+ "uniform vec4 default_v4;\n"
+ "uniform mat4 default_m4;\n"
+ "\n"
+ "void main()\n"
+ "{\n"
+ " gl_FragColor = v4 + default_v4 + default_m4[0];\n"
+ "}\n";
+
+void
+piglit_init(int argc, char **argv)
+{
+ bool pass = true;
+ GLuint fs, prog;
+ const char *uniform_names[] = {
+ "v4",
+ "m4",
+ "m3",
+ "m2",
+ "m4a[0]",
+ "default_v4",
+ "default_m4",
+ };
+ int expected_strides[] = {
+ 0,
+ 16,
+ 16,
+ 16,
+ 16,
+ -1,
+ -1,
+ };
+ GLint strides[ARRAY_SIZE(uniform_names)];
+ GLuint uniform_indices[ARRAY_SIZE(uniform_names)];
+ int i;
+
+ piglit_require_extension("GL_ARB_uniform_buffer_object");
+
+ fs = piglit_compile_shader_text(GL_FRAGMENT_SHADER, fs_source);
+ prog = piglit_link_simple_program(0, fs);
+ if (!fs || !prog) {
+ printf("Failed to compile FS:\n%s", fs_source);
+ piglit_report_result(PIGLIT_FAIL);
+ }
+
+ glGetUniformIndices(prog, ARRAY_SIZE(uniform_names), uniform_names,
+ uniform_indices);
+ glGetActiveUniformsiv(prog, ARRAY_SIZE(uniform_names), uniform_indices,
+ GL_UNIFORM_MATRIX_STRIDE, strides);
+ for (i = 0; i < ARRAY_SIZE(uniform_names); i++) {
+ printf("Uniform \"%s\": stride %d, expected %d",
+ uniform_names[i],
+ strides[i],
+ expected_strides[i]);
+
+ if (strides[i] != expected_strides[i]) {
+ printf(" FAIL");
+ pass = false;
+ }
+
+ printf("\n");
+ }
+
+ piglit_report_result(pass ? PIGLIT_PASS : PIGLIT_FAIL);
+}
+
+enum piglit_result piglit_display(void)
+{
+ /* UNREACHED */
+ return PIGLIT_FAIL;
+}
--
1.7.10.4
_______________________________________________
Piglit mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/piglit
