On May 16, 2013, at 9:28 AM, Eric Anholt e...@anholt.net wrote:
---
tests/all.tests | 2 +
tests/spec/CMakeLists.txt | 1 +
tests/spec/gl-3.2/CMakeLists.gl.txt | 14 +++
tests/spec/gl-3.2/CMakeLists.txt| 1 +
tests/spec/gl-3.2/minmax.c | 177
5 files changed, 195 insertions(+)
create mode 100644 tests/spec/gl-3.2/CMakeLists.gl.txt
create mode 100644 tests/spec/gl-3.2/CMakeLists.txt
create mode 100644 tests/spec/gl-3.2/minmax.c
diff --git a/tests/all.tests b/tests/all.tests
index f53c991..26cfc75 100644
--- a/tests/all.tests
+++ b/tests/all.tests
@@ -714,6 +714,8 @@ for subtest in ['generated', 'written', 'flush']:
gl31[cmdline] = concurrent_test('gl-3.1-' + cmdline)
gl31['required-sized-texture-formats'] =
concurrent_test('gl-3.0-required-sized-texture-formats 31')
+spec['!OpenGL 3.2/minmax'] = concurrent_test('gl-3.2-minmax')
+
spec['!OpenGL 3.3/required-sized-texture-formats'] =
concurrent_test('gl-3.0-required-sized-texture-formats 33')
spec['!OpenGL 4.2/required-sized-texture-formats'] =
concurrent_test('gl-3.0-required-sized-texture-formats 42')
diff --git a/tests/spec/CMakeLists.txt b/tests/spec/CMakeLists.txt
index a1492cc..1b6a0c4 100644
--- a/tests/spec/CMakeLists.txt
+++ b/tests/spec/CMakeLists.txt
@@ -58,6 +58,7 @@ add_subdirectory (gl-2.0)
add_subdirectory (gl-2.1)
add_subdirectory (gl-3.0)
add_subdirectory (gl-3.1)
+add_subdirectory (gl-3.2)
add_subdirectory (gles-2.0)
add_subdirectory (gles-3.0)
add_subdirectory (glx_arb_create_context)
diff --git a/tests/spec/gl-3.2/CMakeLists.gl.txt
b/tests/spec/gl-3.2/CMakeLists.gl.txt
new file mode 100644
index 000..c6c99b8
--- /dev/null
+++ b/tests/spec/gl-3.2/CMakeLists.gl.txt
@@ -0,0 +1,14 @@
+include_directories(
+${GLEXT_INCLUDE_DIR}
+${OPENGL_INCLUDE_PATH}
+)
+
+link_libraries (
+piglitutil_${piglit_target_api}
+${OPENGL_gl_LIBRARY}
+${OPENGL_glu_LIBRARY}
+)
+
+piglit_add_executable (gl-3.2-minmax minmax.c)
+
+# vim: ft=cmake:
diff --git a/tests/spec/gl-3.2/CMakeLists.txt
b/tests/spec/gl-3.2/CMakeLists.txt
new file mode 100644
index 000..4a012b9
--- /dev/null
+++ b/tests/spec/gl-3.2/CMakeLists.txt
@@ -0,0 +1 @@
+piglit_include_target_api()
\ No newline at end of file
diff --git a/tests/spec/gl-3.2/minmax.c b/tests/spec/gl-3.2/minmax.c
new file mode 100644
index 000..bb906bc
--- /dev/null
+++ b/tests/spec/gl-3.2/minmax.c
@@ -0,0 +1,177 @@
+/* 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 minmax.c
+ *
+ * Test for the minimum maximum values in section 6.2 State Tables
+ * of the GL 3.2 spec.
+ */
+
+#include piglit-util-gl-common.h
+#include minmax-test.h
+
+PIGLIT_GL_TEST_CONFIG_BEGIN
+
+config.supports_gl_core_version = 32;
+config.supports_gl_compat_version = 10;
+
+config.window_width = 32;
+config.window_height = 32;
I think you can omit the window size.
+config.window_visual = PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGBA;
+
+PIGLIT_GL_TEST_CONFIG_END
+
+enum piglit_result
+piglit_display(void)
+{
+/* UNREACHED */
+return PIGLIT_FAIL;
+}
+
+void
+piglit_init(int argc, char **argv)
+{
+int vuniforms = 0, vblocks = 0;
+int guniforms = 0, gblocks = 0;
+int funiforms = 0, fblocks = 0;
+int blocksize = 0;
+
+piglit_require_gl_version(31);
Is that needed if you specified version info in the config block above? I guess
I'm not clear on this in general.
-Brian
+
+piglit_print_minmax_header();
+
+/* These should be in the section with Minimum Value but
+ * appear in the section with Initial Value.
+ */
+piglit_test_min_int(GL_MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS,
64);
+
