[Piglit] [PATCH] arb_gpu_shader_fp64: test Uniform*d can't be used for bool uniforms
Tapani
tapani.palli at intel.com
Tue Aug 26 02:04:59 PDT 2014
Reviewed-by: Tapani Pälli <tapani.palli at intel.com>
On 08/25/2014 03:36 AM, Dave Airlie wrote:
> From: Dave Airlie <airlied at redhat.com>
>
> The fp64 spec doesn't allow bool uniforms to be initialised with
> doubles.
>
> Signed-off-by: Dave Airlie <airlied at redhat.com>
> ---
> tests/spec/CMakeLists.txt | 1 +
> tests/spec/arb_gpu_shader_fp64/CMakeLists.gl.txt | 12 +++
> tests/spec/arb_gpu_shader_fp64/CMakeLists.txt | 1 +
> .../arb_gpu_shader_fp64/double_in_bool_uniform.c | 87 ++++++++++++++++++++++
> 4 files changed, 101 insertions(+)
> create mode 100644 tests/spec/arb_gpu_shader_fp64/CMakeLists.gl.txt
> create mode 100644 tests/spec/arb_gpu_shader_fp64/CMakeLists.txt
> create mode 100644 tests/spec/arb_gpu_shader_fp64/double_in_bool_uniform.c
>
> diff --git a/tests/spec/CMakeLists.txt b/tests/spec/CMakeLists.txt
> index c448fd4..12c9e5d 100644
> --- a/tests/spec/CMakeLists.txt
> +++ b/tests/spec/CMakeLists.txt
> @@ -19,6 +19,7 @@ add_subdirectory (arb_framebuffer_srgb)
> add_subdirectory (arb_geometry_shader4)
> add_subdirectory (arb_get_program_binary)
> add_subdirectory (arb_gpu_shader5)
> +add_subdirectory (arb_gpu_shader_fp64)
> add_subdirectory (arb_instanced_arrays)
> add_subdirectory (arb_internalformat_query)
> add_subdirectory (arb_map_buffer_alignment)
> diff --git a/tests/spec/arb_gpu_shader_fp64/CMakeLists.gl.txt b/tests/spec/arb_gpu_shader_fp64/CMakeLists.gl.txt
> new file mode 100644
> index 0000000..03d2273
> --- /dev/null
> +++ b/tests/spec/arb_gpu_shader_fp64/CMakeLists.gl.txt
> @@ -0,0 +1,12 @@
> +include_directories(
> + ${GLEXT_INCLUDE_DIR}
> + ${OPENGL_INCLUDE_PATH}
> +)
> +
> +link_libraries (
> + piglitutil_${piglit_target_api}
> + ${OPENGL_gl_LIBRARY}
> + ${OPENGL_glu_LIBRARY}
> +)
> +
> +piglit_add_executable (arb_gpu_shader_fp64-double_in_bool_uniform double_in_bool_uniform.c)
> diff --git a/tests/spec/arb_gpu_shader_fp64/CMakeLists.txt b/tests/spec/arb_gpu_shader_fp64/CMakeLists.txt
> new file mode 100644
> index 0000000..144a306
> --- /dev/null
> +++ b/tests/spec/arb_gpu_shader_fp64/CMakeLists.txt
> @@ -0,0 +1 @@
> +piglit_include_target_api()
> diff --git a/tests/spec/arb_gpu_shader_fp64/double_in_bool_uniform.c b/tests/spec/arb_gpu_shader_fp64/double_in_bool_uniform.c
> new file mode 100644
> index 0000000..7a109c5
> --- /dev/null
> +++ b/tests/spec/arb_gpu_shader_fp64/double_in_bool_uniform.c
> @@ -0,0 +1,87 @@
> +/*
> + * Copyright © 2014 Red Hat
> + *
> + * 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 double_in_bool_uniform.c
> + *
> + * Tests that glUniform works as specified for trying to using the double
> + * interfaces with a bool uniform.
> + *
> + * The GL_ARB_gpu_shader_fp64 specification says in the Issues section:
> + * "(15) Can the 64-bit uniform APIs be used to load values for uniforms of
> + * type "bool", "bvec2", "bvec3", or "bvec4"?
> + * RESOLVED: No. OpenGL 2.0 and beyond did allow "bool" variable to be
> + * set with Uniform*i* and Uniform*f APIs, and OpenGL 3.0 extended that
> + * support to Uniform*ui* for orthogonality. But it seems pointless to
> + * extended this capability forward to 64-bit Uniform APIs as well."
> + */
> +#include "piglit-util-gl.h"
> +
> +PIGLIT_GL_TEST_CONFIG_BEGIN
> +
> + config.supports_gl_core_version = 33;
> + config.window_visual = PIGLIT_GL_VISUAL_RGB;
> +
> +PIGLIT_GL_TEST_CONFIG_END
> +
> +enum piglit_result
> +piglit_display(void)
> +{
> + return PIGLIT_FAIL;
> +}
> +
> +static const char vs_text[] =
> + "vec4 vertex;\n"
> + "void main() {\n"
> + "gl_Position = vertex;\n"
> + "}";
> +
> +static const char fs_text[] =
> + "#version 330\n"
> + "uniform bool var;\n"
> + "void main() {\n"
> + "gl_FragColor = vec4(float(var), 0.0, 1.0, 1.0);\n"
> + "}";
> +
> +void
> +piglit_init(int argc, char **argv)
> +{
> + GLuint prog;
> + GLint loc;
> + piglit_require_extension("GL_ARB_gpu_shader_fp64");
> +
> + prog = piglit_build_simple_program(vs_text, fs_text);
> +
> + glUseProgram(prog);
> +
> + loc = glGetUniformLocation(prog, "var");
> +
> + /* verify that glUniform1d generates an error */
> + glUniform1d(loc, 0.1);
> +
> + if (!piglit_check_gl_error(GL_INVALID_OPERATION))
> + piglit_report_result(PIGLIT_FAIL);
> +
> + glDeleteProgram(prog);
> + piglit_report_result(PIGLIT_PASS);
> +}
More information about the Piglit
mailing list