[Piglit] [PATCH] GL 3.2: Test validity of GL_DEPTH_CLAMP state

[Brian Paul]

On 08/15/2013 12:39 PM, Nicholas Mack wrote:
> V2: Restructure depth-clamp.c and move it to its own folder. Also add tests for
> other glGet queries.
> ---
>   tests/spec/CMakeLists.txt                    |   1 +
>   tests/spec/arb_depth_clamp/CMakeLists.gl.txt |  14 ++++
>   tests/spec/arb_depth_clamp/CMakeLists.txt    |   1 +
>   tests/spec/arb_depth_clamp/depth-clamp.c     | 104 +++++++++++++++++++++++++++
>   4 files changed, 120 insertions(+)
>   create mode 100644 tests/spec/arb_depth_clamp/CMakeLists.gl.txt
>   create mode 100644 tests/spec/arb_depth_clamp/CMakeLists.txt
>   create mode 100644 tests/spec/arb_depth_clamp/depth-clamp.c
>
> diff --git a/tests/spec/CMakeLists.txt b/tests/spec/CMakeLists.txt
> index 96987cf..327780f 100644
> --- a/tests/spec/CMakeLists.txt
> +++ b/tests/spec/CMakeLists.txt
> @@ -1,6 +1,7 @@
>   add_subdirectory (amd_performance_monitor)
>   add_subdirectory (arb_color_buffer_float)
>   add_subdirectory (arb_debug_output)
> +add_subdirectory (arb_depth_clamp)
>   add_subdirectory (arb_draw_instanced)
>   add_subdirectory (arb_es2_compatibility)
>   add_subdirectory (arb_framebuffer_object)
> diff --git a/tests/spec/arb_depth_clamp/CMakeLists.gl.txt b/tests/spec/arb_depth_clamp/CMakeLists.gl.txt
> new file mode 100644
> index 0000000..f3a6ee4
> --- /dev/null
> +++ b/tests/spec/arb_depth_clamp/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-arb-depth-clamp depth-clamp.c)
> +
> +# vim: ft=cmake:
> diff --git a/tests/spec/arb_depth_clamp/CMakeLists.txt b/tests/spec/arb_depth_clamp/CMakeLists.txt
> new file mode 100644
> index 0000000..4a012b9
> --- /dev/null
> +++ b/tests/spec/arb_depth_clamp/CMakeLists.txt
> @@ -0,0 +1 @@
> +piglit_include_target_api()
> \ No newline at end of file
> diff --git a/tests/spec/arb_depth_clamp/depth-clamp.c b/tests/spec/arb_depth_clamp/depth-clamp.c
> new file mode 100644
> index 0000000..e334965
> --- /dev/null
> +++ b/tests/spec/arb_depth_clamp/depth-clamp.c
> @@ -0,0 +1,104 @@
> +/**
> + * Copyright © 2013 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.
> + */
> +
> +/**
> + * Test that GL_DEPTH_CLAMP is a valid state
> + *
> + * Table 6.8 (Transformation state) of OpenGL 3.2 Core added DEPTH_CLAMP
> + *
> + */
> +
> +#include "piglit-util-gl-common.h"
> +
> +PIGLIT_GL_TEST_CONFIG_BEGIN
> +
> +	config.supports_gl_compat_version = 32;
> +	config.supports_gl_core_version = 32;
> +
> +PIGLIT_GL_TEST_CONFIG_END
> +
> +void
> +piglit_init(int argc, char **argv)
> +{
> +	bool pass = true;
> +	GLint a;
> +	GLfloat b;
> +	GLboolean c;
> +	GLdouble d;

How about boolean b, float f, int i, etc?


> +
> +	/* Check that GL_DEPTH_CLAMP was initialized to TRUE */
> +	if (glIsEnabled(GL_DEPTH_CLAMP)) {
> +		printf("GL_DEPTH_CLAMP was not initialized to FALSE\n");
> +		pass = false;
> +	}
> +	pass = piglit_check_gl_error(GL_NO_ERROR) && pass;
> +
> +	/* Test that GL_DEPTH_CLAMP is enable/disabled correctly */
> +	glEnable(GL_DEPTH_CLAMP);
> +	if (!glIsEnabled(GL_DEPTH_CLAMP)) {
> +		printf("GL_DEPTH_CLAMP was not enabled properly\n");
> +		pass = false;
> +	}
> +	pass = piglit_check_gl_error(GL_NO_ERROR) && pass;
> +
> +	glDisable(GL_DEPTH_CLAMP);
> +	if (glIsEnabled(GL_DEPTH_CLAMP)) {
> +		printf("GL_DEPTH_CLAMP was not disabled properly\n");
> +		pass = false;
> +	}
> +	pass = piglit_check_gl_error(GL_NO_ERROR) && pass;
> +
> +	/* Test that GL_DEPTH_CLAMP status is returned from glGet calls */
> +	glGetIntegerv(GL_DEPTH_CLAMP, &a);
> +	if(a != false) {

if (a != 0) {


> +		printf("a expected to be 0, but returned %d\n", (int)a);

Unneeded (int) cast.


> +		pass = false;
> +	}
> +	pass = piglit_check_gl_error(GL_NO_ERROR) && pass;
> +	glGetFloatv(GL_DEPTH_CLAMP, &b);
> +	if(b != false) {

the test should probably be "if (a != 0.0f)".  Otherwise, more finicky 
compilers like MSVC will probably warn about different types in the 
comparison.


> +		printf("b expected to be 0, but returned %d\n", (int)b);

print %f and remove cast.


> +		pass = false;
> +	}
> +	pass = piglit_check_gl_error(GL_NO_ERROR) && pass;
> +	glGetBooleanv(GL_DEPTH_CLAMP, &c);
> +	if(c != false) {

if (c != GL_FALSE)


> +		printf("c expected to be 0, but returned %d\n", (int)c);
> +		pass = false;
> +	}
> +	pass = piglit_check_gl_error(GL_NO_ERROR) && pass;
> +	glGetDoublev(GL_DEPTH_CLAMP, &d);
> +	if(d != false) {
> +		printf("d expected to be 0, but returned %d\n", (int)d);

print %f and remove cast.


> +		pass = false;
> +	}
> +	pass = piglit_check_gl_error(GL_NO_ERROR) && pass;
> +

You might also test the glGet functions when GL_DEPTH_CLAMP is enabled 
to be sure they return 1 and 1.0.


> +	piglit_report_result(pass ? PIGLIT_PASS : PIGLIT_FAIL);
> +}
> +
> +enum piglit_result
> +piglit_display(void)
> +{
> +	return PIGLIT_FAIL;
> +}
>

-Brian