[Piglit] [PATCH] gl3.2/glsl1.50: test that uniform variables in a named uniform block cannot be accessed or modified by glUniform* commands

Paul Berry stereotype441 at gmail.com
Mon Oct 7 21:03:02 CEST 2013


On 17 September 2013 09:42, Steve Miller <dervishx at gmail.com> wrote:

> Section 2.11.4 (Uniform Variables) of the GL 3.2 spec says:
>  "Uniforms in a named uniform block are not assigned a location and may
>   not be modified using the Uniform* commands."
>

Thanks, Steve.  I've made some minor corrections and pushed the patch with
my reviewed-by.


> ---
>  tests/all.tests                                    |   1 +
>  tests/spec/glsl-1.50/execution/CMakeLists.gl.txt   |   1 +
>  .../glsl-1.50/execution/vs-named-block-no-modify.c | 152
> +++++++++++++++++++++
>  3 files changed, 154 insertions(+)
>  create mode 100644
> tests/spec/glsl-1.50/execution/vs-named-block-no-modify.c
>
> diff --git a/tests/all.tests b/tests/all.tests
> index 7057134..51671b5 100644
> --- a/tests/all.tests
> +++ b/tests/all.tests
> @@ -942,6 +942,7 @@ add_shader_test_dir(spec['glsl-1.50'],
>                     recursive=True)
>  spec['glsl-1.50']['execution']['get-active-attrib-array'] =
> concurrent_test('glsl-1.50-get-active-attrib-array')
>  spec['glsl-1.50']['execution']['vs-input-arrays'] =
> concurrent_test('glsl-1.50-vs-input-arrays')
> +spec['glsl-1.50']['execution']['vs-named-block-no-modify'] =
> concurrent_test('vs-named-block-no-modify')
>  for draw in ['', 'indexed']:
>      for prim in ['GL_LINES_ADJACENCY', 'GL_LINE_STRIP_ADJACENCY',
>                   'GL_TRIANGLES_ADJACENCY', 'GL_TRIANGLE_STRIP_ADJACENCY']:
> diff --git a/tests/spec/glsl-1.50/execution/CMakeLists.gl.txt
> b/tests/spec/glsl-1.50/execution/CMakeLists.gl.txt
> index 67a5e00..693f69a 100644
> --- a/tests/spec/glsl-1.50/execution/CMakeLists.gl.txt
> +++ b/tests/spec/glsl-1.50/execution/CMakeLists.gl.txt
> @@ -12,3 +12,4 @@ ${OPENGL_glu_LIBRARY}
>
>  piglit_add_executable (glsl-1.50-vs-input-arrays vs-input-arrays.c)
>  piglit_add_executable (glsl-1.50-get-active-attrib-array
> get-active-attrib-array.c)
> +piglit_add_executable (glsl-1.50-vs-named-block-no-modify
> vs-named-block-no-modify.c)
> diff --git a/tests/spec/glsl-1.50/execution/vs-named-block-no-modify.c
> b/tests/spec/glsl-1.50/execution/vs-named-block-no-modify.c
> new file mode 100644
> index 0000000..f25cfd0
> --- /dev/null
> +++ b/tests/spec/glsl-1.50/execution/vs-named-block-no-modify.c
> @@ -0,0 +1,152 @@
> +/*
> + * 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.
> + */
> +
> +
> +/**
> + * \file named-block-no-modify.c
> + *
> + * Test that uniform variables containted within a named uniform block
> cannot be
> + * accessed by the glUniform* commands.
> + *
> + * Section 2.11.4 (Uniform Variables) of the GL 3.2 spec says:
> + *  "Uniforms in a named uniform block are not assigned a location and may
> + *   not be modified using the Uniform* commands."
> + *
> + * Test relies on the behavior of glGetUniform returning -1 for uniforms
> + * that have not been assigned a location, such as those in a named
> uniform
> + * block.
> +*/
> +
> +#include "piglit-util-gl-common.h"
> +
> +PIGLIT_GL_TEST_CONFIG_BEGIN
> +
> +       config.supports_gl_core_version = 32;
> +
> +PIGLIT_GL_TEST_CONFIG_END
> +
> +/* the operations in this shader are not strictly relevant, only that they
> + * do not get discarded */
> +static const char vs_text[] =
> +       "#version 150\n"
> +       "\n"
> +       "in vec4 piglit_vertex;\n"
> +       "\n"
> +       "uniform testBlock {\n"
> +       "       int a;\n"
> +       "       float b;\n"
> +       "       mat4 c;\n"
> +       "};\n"
> +       "\n"
> +       "flat out int oa;\n"
> +       "out float ob;\n"
> +       "out mat4 oc;\n"
> +       "\n"
> +       "void main() {\n"
> +       "       gl_Position = piglit_vertex;\n"
> +       "       oa = a + 1;\n"
> +       "       ob = b * 2;\n"
> +       "       oc[0] = c[0] * 1;\n"
> +       "       oc[1] = c[1] * 2;\n"
> +       "       oc[2] = c[2] * 3;\n"
> +       "       oc[3] = c[3] * 4;\n"
> +       "}\n";
> +
> +/* again, operations are just to touch data */
> +static const char fs_text[] =
> +       "#version 150\n"
> +       "\n"
> +       "flat in int oa;\n"
> +       "in float ob;\n"
> +       "in mat4 oc;\n"
> +       "out vec4 FragColor;\n"
> +       "\n"
> +       "void main() {\n"
> +       "       FragColor = vec4(float(oa) * oc[0][0],\n"
> +       "                           ob * oc[1][1],\n"
> +       "                           oc[2][2],\n"
> +       "                           oc[3][3]);\n"
> +       "}\n";
> +
> +static GLuint prog;
> +
> +static int uniform_int = 2;
> +static float uniform_float = 4.0;
> +static float uniform_mat4[16] = {
> +       0., 1., 2., 3.,
> +       4., 5., 6., 7.,
> +       8., 9., 10., 11.,
> +       12., 13., 14., 15.
> +};
> +
> +void
> +piglit_init(int argc, char **argv)
> +{
> +       bool pass = true;
> +
> +       int a_loc = -2;
> +       int b_loc = -3;
> +       int c_loc = -4;
> +
> +       prog = piglit_build_simple_program(vs_text, fs_text);
> +
> +       glUseProgram(prog);
> +
> +       /* get uniforms, locations should be -1 if glGetUniformLocation
> +        * can't retrieve their location */
> +
> +       a_loc = glGetUniformLocation(prog, "a");
> +       if(a_loc != -1) {
> +               printf("a_loc incorrectly assigned a location: %d", a_loc);
> +               pass = false;
> +       }
> +
> +       b_loc = glGetUniformLocation(prog, "b");
> +       if(b_loc != -1) {
> +               printf("b_loc incorrectly assigned a location: %d", b_loc);
> +               pass = false;
> +       }
> +
> +        c_loc = glGetUniformLocation(prog, "c");
> +       if(c_loc != -1) {
> +               printf("c_loc incorrectly assigned a location: %d", c_loc);
> +               pass = false;
> +       }
> +
> +       /* try to use our uniforms, should be silently ignored */
> +       glUniform1i(a_loc, uniform_int);
> +       glUniform1f(b_loc, uniform_float);
> +       glUniformMatrix4fv(c_loc, 1, false, &uniform_mat4[0]);
> +       if(!piglit_check_gl_error(GL_NO_ERROR)) {
> +               pass = false;
> +       }
> +
> +       piglit_report_result(pass ? PIGLIT_PASS : PIGLIT_FAIL);
> +}
> +
> +enum piglit_result
> +piglit_display(void)
> +{
> +       /* should not reach */
> +       return PIGLIT_FAIL;
> +}
> --
> 1.8.3.1
>
> _______________________________________________
> Piglit mailing list
> Piglit at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/piglit
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.freedesktop.org/archives/piglit/attachments/20131007/181f4cb8/attachment.html>


More information about the Piglit mailing list