[Piglit] [PATCH 4/7] gl-3.2: Add testing for the minimum maximums.
Eric Anholt
eric at anholt.net
Thu May 16 07:28:46 PDT 2013
---
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 0000000..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 0000000..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 0000000..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;
+ 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);
+
+ 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);
+ piglit_test_min_int(GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS, 4);
+ piglit_test_min_int(GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS, 4);
+
+ piglit_test_min_int(GL_MAX_CLIP_DISTANCES, 8);
+ piglit_test_min_int(GL_SUBPIXEL_BITS, 4);
+ piglit_test_min_int(GL_MAX_3D_TEXTURE_SIZE, 256);
+ piglit_test_min_int(GL_MAX_TEXTURE_SIZE, 1024);
+ piglit_test_min_int(GL_MAX_ARRAY_TEXTURE_LAYERS, 256);
+ piglit_test_min_float(GL_MAX_TEXTURE_LOD_BIAS, 2.0);
+ piglit_test_min_int(GL_MAX_CUBE_MAP_TEXTURE_SIZE, 1024);
+ piglit_test_min_int(GL_MAX_RENDERBUFFER_SIZE, 1024);
+
+ piglit_test_min_viewport_dimensions();
+
+ piglit_test_range_float(GL_POINT_SIZE_RANGE, 1, 1);
+ piglit_test_range_float(GL_ALIASED_LINE_WIDTH_RANGE, 1, 1);
+ piglit_test_range_float(GL_SMOOTH_LINE_WIDTH_RANGE, 1, 1);
+ piglit_test_min_int(GL_NUM_COMPRESSED_TEXTURE_FORMATS, 4);
+ piglit_test_min_int(GL_MAX_TEXTURE_BUFFER_SIZE, 65536);
+ piglit_test_min_int(GL_MAX_RECTANGLE_TEXTURE_SIZE, 1024);
+
+ piglit_test_tf_bits(GL_PRIMITIVES_GENERATED);
+ piglit_test_tf_bits(GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN);
+ piglit_test_oq_bits();
+
+ piglit_test_min_int(GL_MAX_VERTEX_ATTRIBS, 16);
+ piglit_test_min_int(GL_MAX_VERTEX_UNIFORM_COMPONENTS, 1024);
+ piglit_test_min_int(GL_MAX_VERTEX_UNIFORM_BLOCKS, 12);
+ piglit_test_min_int(GL_MAX_VERTEX_OUTPUT_COMPONENTS, 64);
+ piglit_test_min_int(GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS, 16);
+
+ /* MAX_GEOMETRY_UNIFORM_COMPONENTS was missing from the table
+ * from GL 3.2 through 4.1, though it's present in
+ * GL_ARB_geometry_shader and 4.2 with a value of 512. Assume
+ * that it's an oversight in the spec.
+ */
+ piglit_test_min_int(GL_MAX_GEOMETRY_UNIFORM_COMPONENTS, 512);
+ piglit_test_min_int(GL_MAX_GEOMETRY_UNIFORM_BLOCKS, 12);
+ piglit_test_min_int(GL_MAX_GEOMETRY_INPUT_COMPONENTS, 64);
+ piglit_test_min_int(GL_MAX_GEOMETRY_OUTPUT_COMPONENTS, 128);
+ piglit_test_min_int(GL_MAX_GEOMETRY_OUTPUT_VERTICES, 256);
+ piglit_test_min_int(GL_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS, 1024);
+ piglit_test_min_int(GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS, 16);
+
+ piglit_test_min_int(GL_MAX_FRAGMENT_UNIFORM_COMPONENTS, 1024);
+ piglit_test_min_int(GL_MAX_FRAGMENT_UNIFORM_BLOCKS, 12);
+ piglit_test_min_int(GL_MAX_FRAGMENT_INPUT_COMPONENTS, 128);
+ piglit_test_min_int(GL_MAX_TEXTURE_IMAGE_UNITS, 16);
+ piglit_test_max_int(GL_MIN_PROGRAM_TEXEL_OFFSET, -8);
+ piglit_test_min_int(GL_MAX_PROGRAM_TEXEL_OFFSET, 7);
+
+ piglit_test_min_int(GL_MAX_UNIFORM_BUFFER_BINDINGS, 36);
+ piglit_test_min_int(GL_MAX_UNIFORM_BLOCK_SIZE, 16384);
+ piglit_test_min_int(GL_UNIFORM_BUFFER_OFFSET_ALIGNMENT, 1);
+ piglit_test_min_int(GL_MAX_COMBINED_UNIFORM_BLOCKS, 36);
+
+ glGetIntegerv(GL_MAX_VERTEX_UNIFORM_BLOCKS, &vblocks);
+ glGetIntegerv(GL_MAX_VERTEX_UNIFORM_COMPONENTS, &vuniforms);
+ glGetIntegerv(GL_MAX_GEOMETRY_UNIFORM_BLOCKS, &gblocks);
+ glGetIntegerv(GL_MAX_GEOMETRY_UNIFORM_COMPONENTS, &guniforms);
+ glGetIntegerv(GL_MAX_FRAGMENT_UNIFORM_BLOCKS, &fblocks);
+ glGetIntegerv(GL_MAX_FRAGMENT_UNIFORM_COMPONENTS, &funiforms);
+ glGetIntegerv(GL_MAX_UNIFORM_BLOCK_SIZE, &blocksize);
+
+ /* Note that these two tokens already existed in the table
+ * above, with realistic minimum values. This appears to be a
+ * typo and was dropped in 3.2.
+ */
+ /* piglit_test_min_int(GL_MAX_VERTEX_UNIFORM_COMPONENTS, 1); */
+ /* piglit_test_min_int(GL_MAX_FRAGMENT_UNIFORM_COMPONENTS, 1); */
+
+ /* In this case, the "1" in the table refers to the footnote:
+ *
+ * "(1) The minimum value for each stage is
+ * MAX_stage_UNIFORM_BLOCKS ×
+ * MAX_stage_UNIFORM_BLOCK_SIZE +
+ * MAX_stage_UNIFORM_COMPONENTS"
+ *
+ * But that doesn't make sense -- BLOCK_SIZE is in bytes,
+ * while components is in number of floats. The GL 3.3 spec
+ * corrects this apparent typo to say BLOCK_SIZE / 4 * BLOCKS.
+ */
+ piglit_test_min_int(GL_MAX_COMBINED_VERTEX_UNIFORM_COMPONENTS,
+ vblocks * blocksize / 4 + vuniforms);
+ piglit_test_min_int(GL_MAX_COMBINED_FRAGMENT_UNIFORM_COMPONENTS,
+ fblocks * blocksize / 4 + funiforms);
+
+
+ /* XXX GEO */
+ piglit_test_min_int(GL_MAX_COMBINED_VERTEX_UNIFORM_COMPONENTS,
+ vblocks * blocksize / 4 + vuniforms);
+
+ piglit_test_min_int(GL_MAX_VARYING_COMPONENTS, 60);
+ piglit_test_min_int(GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS, 48);
+
+ piglit_test_min_int(GL_MAX_SAMPLE_MASK_WORDS, 1);
+ piglit_test_min_int(GL_MAX_COLOR_TEXTURE_SAMPLES, 1);
+ piglit_test_min_int(GL_MAX_DEPTH_TEXTURE_SAMPLES, 1);
+ piglit_test_min_int(GL_MAX_INTEGER_SAMPLES, 1);
+ piglit_test_min_int(GL_MAX_SERVER_WAIT_TIMEOUT, 0);
+
+ piglit_test_min_int(GL_MAX_DRAW_BUFFERS, 8);
+ piglit_test_min_int(GL_SAMPLE_BUFFERS, 0);
+ piglit_test_min_int(GL_SAMPLES, 0);
+ piglit_test_min_int(GL_MAX_COLOR_ATTACHMENTS, 8);
+ piglit_test_min_int(GL_MAX_SAMPLES, 4);
+
+ if (!piglit_check_gl_error(GL_NO_ERROR))
+ piglit_report_result(PIGLIT_FAIL);
+
+ piglit_report_result(piglit_minmax_pass ? PIGLIT_PASS : PIGLIT_FAIL);
+}
--
1.8.3.rc0
More information about the Piglit
mailing list