[Piglit] [PATCH 4/4] gl-3.1/minmax: New test for query minimum requirements.

Jose Fonseca jfonseca at vmware.com
Wed Mar 14 15:51:23 PDT 2012


The series looks good AFAICT.

Thanks for the MSVC cleanup.

BTW, don't forget you can simply use piglit_get_gl_enum_name() instead of c-preprocessor ## operator or hand-written strings.

Jose

----- Original Message -----
> ---
>  tests/all.tests                     |    4 +
>  tests/spec/CMakeLists.txt           |    1 +
>  tests/spec/gl-3.1/CMakeLists.gl.txt |   16 ++
>  tests/spec/gl-3.1/CMakeLists.txt    |    1 +
>  tests/spec/gl-3.1/minmax.c          |  303
>  +++++++++++++++++++++++++++++++++++
>  5 files changed, 325 insertions(+), 0 deletions(-)
>  create mode 100644 tests/spec/gl-3.1/CMakeLists.gl.txt
>  create mode 100644 tests/spec/gl-3.1/CMakeLists.txt
>  create mode 100644 tests/spec/gl-3.1/minmax.c
> 
> diff --git a/tests/all.tests b/tests/all.tests
> index 7a34b87..f961ebc 100644
> --- a/tests/all.tests
> +++ b/tests/all.tests
> @@ -850,6 +850,10 @@ add_concurrent_test(gl30,
> 'gl-3.0-required-sized-texture-formats')
>  add_concurrent_test(gl30,
>  'gl-3.0-required-renderbuffer-attachment-formats')
>  add_concurrent_test(gl30,
>  'gl-3.0-required-texture-attachment-formats')
>  
> +gl31 = Group()
> +spec['!OpenGL 3.1'] = gl31
> +gl31['minmax'] = concurrent_test('gl-3.1-minmax')
> +
>  # Group spec/glsl-1.00
>  spec['glsl-1.00'] = Group()
>  import_glsl_parser_tests(spec['glsl-1.00'],
> diff --git a/tests/spec/CMakeLists.txt b/tests/spec/CMakeLists.txt
> index 230bac0..93f0681 100644
> --- a/tests/spec/CMakeLists.txt
> +++ b/tests/spec/CMakeLists.txt
> @@ -40,6 +40,7 @@ add_subdirectory (glsl-1.30)
>  add_subdirectory (gl-2.0)
>  add_subdirectory (gl-2.1)
>  add_subdirectory (gl-3.0)
> +add_subdirectory (gl-3.1)
>  add_subdirectory (glx_arb_create_context)
>  add_subdirectory (glx_ext_import_context)
>  add_subdirectory (arb_vertex_type_2_10_10_10_rev)
> diff --git a/tests/spec/gl-3.1/CMakeLists.gl.txt
> b/tests/spec/gl-3.1/CMakeLists.gl.txt
> new file mode 100644
> index 0000000..a9876c7
> --- /dev/null
> +++ b/tests/spec/gl-3.1/CMakeLists.gl.txt
> @@ -0,0 +1,16 @@
> +include_directories(
> +	${GLEXT_INCLUDE_DIR}
> +	${OPENGL_INCLUDE_PATH}
> +	${GLUT_INCLUDE_DIR}
> +)
> +
> +link_libraries (
> +	piglitutil
> +	${OPENGL_gl_LIBRARY}
> +	${OPENGL_glu_LIBRARY}
> +	${GLUT_glut_LIBRARY}
> +)
> +
> +add_executable (gl-3.1-minmax minmax.c)
> +
> +# vim: ft=cmake:
> diff --git a/tests/spec/gl-3.1/CMakeLists.txt
> b/tests/spec/gl-3.1/CMakeLists.txt
> new file mode 100644
> index 0000000..4a012b9
> --- /dev/null
> +++ b/tests/spec/gl-3.1/CMakeLists.txt
> @@ -0,0 +1 @@
> +piglit_include_target_api()
> \ No newline at end of file
> diff --git a/tests/spec/gl-3.1/minmax.c b/tests/spec/gl-3.1/minmax.c
> new file mode 100644
> index 0000000..0f80293
> --- /dev/null
> +++ b/tests/spec/gl-3.1/minmax.c
> @@ -0,0 +1,303 @@
> +/* 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.1 spec.
> + */
> +
> +#include "piglit-util.h"
> +
> +int piglit_width = 32;
> +int piglit_height = 32;
> +int piglit_window_mode = GLUT_DOUBLE | GLUT_RGB | GLUT_ALPHA;
> +
> +enum piglit_result
> +piglit_display(void)
> +{
> +	/* UNREACHED */
> +	return PIGLIT_FAIL;
> +}
> +
> +static bool pass = true;
> +
> +static void
> +max_test_i(GLenum token, GLint max, const char *name)
> +{
> +	GLint val = 0;
> +
> +	glGetIntegerv(token, &val);
> +
> +	if (val > max) {
> +		fprintf(stderr, "%-50s %8d %8d (ERROR)\n",
> +			name, max, val);
> +		pass = false;
> +	} else {
> +		printf("%-50s %8d %8d\n", name, max, val);
> +	}
> +}
> +
> +static void
> +min_test_i(GLenum token, GLint min, const char *name)
> +{
> +	GLint val[2] = { 0 };
> +
> +	glGetIntegerv(token, &val);
> +
> +	if (val < min) {
> +		fprintf(stderr, "%-50s %8d %8d (ERROR)\n",
> +			name, min, val);
> +		pass = false;
> +	} else {
> +		printf("%-50s %8d %8d\n", name, min, val);
> +	}
> +}
> +
> +static void
> +min_test_f(GLenum token, GLfloat min, const char *name)
> +{
> +	GLfloat val = 0.0;
> +
> +	glGetFloatv(token, &val);
> +
> +	if (val < min) {
> +		fprintf(stderr, "%-50s %8f %8f (ERROR)\n",
> +			name, min, val);
> +		pass = false;
> +	} else {
> +		printf("%-50s %8f %8f\n", name, min, val);
> +	}
> +}
> +
> +/* All the size requirements happen to only require a range covering
> + * [1.0, 1.0].
> + */
> +static void
> +size_range_test(GLenum token, const char *name)
> +{
> +	GLfloat vals[2];
> +
> +	glGetFloatv(token, vals);
> +
> +	if (vals[0] > 1.0 || vals[1] < 1.0) {
> +		fprintf(stderr, "%-50s %8s  %.1f-%.1f (ERROR)\n",
> +			name, "1-1", vals[0], vals[1]);
> +		pass = false;
> +	} else {
> +		printf("%-50s %8s  %.1f-%.1f\n",
> +		       name, "1-1", vals[0], vals[1]);
> +	}
> +}
> +
> +static void
> +test_oq_bits()
> +{
> +	GLint dims[2];
> +	GLint minbits, oqbits;
> +
> +	/* From the GL 3.0 specification, page 329:
> +	 *
> +	 *     "If pname is QUERY_COUNTER_BITS, the
> +	 *      implementation-dependent number of query counter bits
> +	 *      may be zero, in which case the counter contains no
> +	 *      useful information.
> +	 *
> +	 *      For occlusion queries (SAMPLES PASSED), if the number
> +	 *      of bits is non-zero, the minimum number of bits
> +	 *      allowed is a function of the implementation’s maximum
> +	 *      viewport dimensions (MAX VIEWPORT DIMS). The counter
> +	 *      must be able to represent at least two overdraws for
> +	 *      every pixel in the viewport. The formula to compute
> +	 *      the allowable minimum value (where n is the minimum
> +	 *      number of bits) is
> +	 *
> +	 *      n = min{32, log2(maxViewportWidth ∗ maxViewportHeight * 2}"
> +	 */
> +
> +	glGetIntegerv(GL_MAX_VIEWPORT_DIMS, dims);
> +	minbits = log2((float)dims[0] * dims[1] * 2);
> +	if (minbits > 32)
> +		minbits = 32;
> +
> +	glGetQueryiv(GL_SAMPLES_PASSED, GL_QUERY_COUNTER_BITS, &oqbits);
> +	if (oqbits == 0 || oqbits >= minbits) {
> +		printf("%-50s   0 / %2d %8d\n",
> +		       "GL_QUERY_COUNTER_BITS(GL_SAMPLES_PASSED)",
> +		       minbits, oqbits);
> +	} else {
> +		fprintf(stderr,
> +			"%-50s   0 / %2d %8d\n",
> +			"GL_QUERY_COUNTER_BITS(GL_SAMPLES_PASSED)",
> +			minbits, oqbits);
> +		pass = false;
> +	}
> +}
> +
> +static void
> +test_tf_bits(GLenum target)
> +{
> +	GLint bits = -1;
> +	const char *name;
> +
> +	if (target == GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN)
> +		name = "GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN bits";
> +	else
> +		name = "GL_PRIMITIVES_GENERATED bits";
> +
> +	/* From the GL 3.0 specification, page 329:
> +	 *
> +	 *     "If pname is QUERY_COUNTER_BITS, the
> +	 *      implementation-dependent number of query counter bits
> +	 *      may be zero, in which case the counter contains no
> +	 *      useful information.
> +	 *
> +	 *      For primitive queries (PRIMITIVES GENERATED and
> +	 *      TRANSFORM FEEDBACK PRIMITIVES WRITTEN) if the number
> +	 *      of bits is non-zero, the minimum number of bits
> +	 *      allowed is 32."
> +	 */
> +
> +	glGetQueryiv(target, GL_QUERY_COUNTER_BITS, &bits);
> +	if (bits == 0 || bits >= 32) {
> +		printf("%-50s %8s %8d\n", name, "0 / 32", bits);
> +	} else {
> +		fprintf(stderr, "%-50s %8s %8d (ERROR)\n",
> +			name, "0 / 32", bits);
> +		pass = false;
> +	}
> +}
> +
> +#define MAX_INTEGER_TEST(token, max) max_test_i(token, max, #token)
> +#define MIN_INTEGER_TEST(token, min) min_test_i(token, min, #token)
> +#define MIN_FLOAT_TEST(token, min) min_test_f(token, min, #token)
> +#define TEST_SIZE_RANGE(token) size_range_test(token, #token)
> +
> +void
> +piglit_init(int argc, char **argv)
> +{
> +	int rb_size;
> +	int vuniforms = 0, vblocks = 0;
> +	int funiforms = 0, fblocks = 0;
> +	int blocksize = 0;
> +
> +	piglit_require_gl_version(31);
> +
> +	printf("%-50s %8s %8s\n", "token", "minimum", "value");
> +
> +	/* These should be in the section with "Minimum Value" but
> +	 * appear in the section with "Initial Value".
> +	 */
> +	MIN_INTEGER_TEST(GL_MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS,
> 64);
> +	MIN_INTEGER_TEST(GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS, 4);
> +	MIN_INTEGER_TEST(GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS, 4);
> +
> +	MIN_INTEGER_TEST(GL_MAX_CLIP_DISTANCES, 8);
> +	MIN_INTEGER_TEST(GL_SUBPIXEL_BITS, 4);
> +	MIN_INTEGER_TEST(GL_MAX_3D_TEXTURE_SIZE, 256);
> +	MIN_INTEGER_TEST(GL_MAX_TEXTURE_SIZE, 1024);
> +	MIN_INTEGER_TEST(GL_MAX_ARRAY_TEXTURE_LAYERS, 256);
> +	MIN_FLOAT_TEST(GL_MAX_TEXTURE_LOD_BIAS, 2.0);
> +	MIN_INTEGER_TEST(GL_MAX_CUBE_MAP_TEXTURE_SIZE, 1024);
> +	MIN_INTEGER_TEST(GL_MAX_RENDERBUFFER_SIZE, 1024);
> +
> +	/* FINISHME:
> +	 *
> +	 *     "The maximum viewport dimensions must be greater than
> +	 *      or equal to the larger of the visible dimensions of
> +	 *      the display being rendered to (if a display exists),
> +	 *      and the largest renderbuffer image which can be
> +	 *      successfully created and attached to a framebuffer
> +	 *      object (see chapter 4).  INVALID VALUE is generated if
> +	 *      either w or h is negative."
> +	 *
> +	 * We're only looking at RB limits here.
> +	 */
> +	glGetIntegerv(GL_MAX_RENDERBUFFER_SIZE, &rb_size);
> +	MIN_INTEGER_TEST(GL_MAX_VIEWPORT_DIMS, rb_size);
> +
> +	TEST_SIZE_RANGE(GL_POINT_SIZE_RANGE);
> +	TEST_SIZE_RANGE(GL_ALIASED_LINE_WIDTH_RANGE);
> +	TEST_SIZE_RANGE(GL_SMOOTH_LINE_WIDTH_RANGE);
> +	MIN_INTEGER_TEST(GL_NUM_COMPRESSED_TEXTURE_FORMATS, 4);
> +	MIN_INTEGER_TEST(GL_MAX_TEXTURE_BUFFER_SIZE, 65536);
> +	MIN_INTEGER_TEST(GL_MAX_RECTANGLE_TEXTURE_SIZE, 1024);
> +
> +	test_tf_bits(GL_PRIMITIVES_GENERATED);
> +	test_tf_bits(GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN);
> +	test_oq_bits();
> +
> +	MIN_INTEGER_TEST(GL_MAX_VERTEX_ATTRIBS, 16);
> +	MIN_INTEGER_TEST(GL_MAX_VERTEX_UNIFORM_COMPONENTS, 1024);
> +	MIN_INTEGER_TEST(GL_MAX_VARYING_COMPONENTS, 64);
> +	MIN_INTEGER_TEST(GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS, 32);
> +	MIN_INTEGER_TEST(GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS, 16);
> +	MIN_INTEGER_TEST(GL_MAX_TEXTURE_IMAGE_UNITS, 16);
> +	MIN_INTEGER_TEST(GL_MAX_FRAGMENT_UNIFORM_COMPONENTS, 1024);
> +
> +	MAX_INTEGER_TEST(GL_MIN_PROGRAM_TEXEL_OFFSET, -8);
> +	MIN_INTEGER_TEST(GL_MAX_PROGRAM_TEXEL_OFFSET, 7);
> +
> +	MIN_INTEGER_TEST(GL_MAX_VERTEX_UNIFORM_BLOCKS, 12);
> +	MIN_INTEGER_TEST(GL_MAX_FRAGMENT_UNIFORM_BLOCKS, 12);
> +	MIN_INTEGER_TEST(GL_MAX_COMBINED_UNIFORM_BLOCKS, 24);
> +	MIN_INTEGER_TEST(GL_MAX_UNIFORM_BUFFER_BINDINGS, 24);
> +	MIN_INTEGER_TEST(GL_MAX_UNIFORM_BLOCK_SIZE, 16384);
> +	MIN_INTEGER_TEST(GL_UNIFORM_BUFFER_OFFSET_ALIGNMENT, 1);
> +
> +	glGetIntegerv(GL_MAX_VERTEX_UNIFORM_BLOCKS, &vblocks);
> +	glGetIntegerv(GL_MAX_VERTEX_UNIFORM_COMPONENTS, &vuniforms);
> +	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 existed previously in the table,
> +	 * with realistic minimum values.
> +	 */
> +	/* MIN_INTEGER_TEST(GL_MAX_VERTEX_UNIFORM_COMPONENTS, 1); */
> +	/* MIN_INTEGER_TEST(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"
> +	 */
> +	MIN_INTEGER_TEST(GL_MAX_COMBINED_VERTEX_UNIFORM_COMPONENTS,
> +			 vblocks * blocksize + vuniforms);
> +	MIN_INTEGER_TEST(GL_MAX_COMBINED_FRAGMENT_UNIFORM_COMPONENTS,
> +			 fblocks * blocksize + funiforms);
> +
> +	MIN_INTEGER_TEST(GL_MAX_DRAW_BUFFERS, 8);
> +
> +	MIN_INTEGER_TEST(GL_SAMPLE_BUFFERS, 0);
> +	MIN_INTEGER_TEST(GL_SAMPLES, 0);
> +
> +	MIN_INTEGER_TEST(GL_MAX_COLOR_ATTACHMENTS, 8);
> +	MIN_INTEGER_TEST(GL_MAX_SAMPLES, 4);
> +
> +	if (!piglit_check_gl_error(GL_NO_ERROR))
> +		piglit_report_result(PIGLIT_FAIL);
> +
> +	piglit_report_result(pass ? PIGLIT_PASS : PIGLIT_FAIL);
> +}
> --
> 1.7.9.1
> 
> _______________________________________________
> Piglit mailing list
> Piglit at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/piglit
> 


More information about the Piglit mailing list