On Thu, Mar 13, 2014 at 5:41 AM, Tapani Pälli <[email protected]> wrote: > Signed-off-by: Tapani Pälli <[email protected]> > --- > tests/all.py | 1 + > .../CMakeLists.gl.txt | 1 + > .../arb_explicit_uniform_location/array-overlap.c | 98 > ++++++++++++++++++++++ > 3 files changed, 100 insertions(+) > create mode 100644 tests/spec/arb_explicit_uniform_location/array-overlap.c > > diff --git a/tests/all.py b/tests/all.py > index 8f074c7..0cfffc2 100644 > --- a/tests/all.py > +++ b/tests/all.py > @@ -1928,6 +1928,7 @@ add_plain_test(arb_explicit_uniform_location, > 'arb_explicit_uniform_location-min > add_plain_test(arb_explicit_uniform_location, > 'arb_explicit_uniform_location-boundaries') > add_plain_test(arb_explicit_uniform_location, > 'arb_explicit_uniform_location-array-elements') > add_plain_test(arb_explicit_uniform_location, > 'arb_explicit_uniform_location-array-toobig') > +add_plain_test(arb_explicit_uniform_location, > 'arb_explicit_uniform_location-array-overlap') > > arb_texture_buffer_object = Group() > spec['ARB_texture_buffer_object'] = arb_texture_buffer_object > diff --git a/tests/spec/arb_explicit_uniform_location/CMakeLists.gl.txt > b/tests/spec/arb_explicit_uniform_location/CMakeLists.gl.txt > index 90d15f9..3ca4018 100644 > --- a/tests/spec/arb_explicit_uniform_location/CMakeLists.gl.txt > +++ b/tests/spec/arb_explicit_uniform_location/CMakeLists.gl.txt > @@ -13,3 +13,4 @@ piglit_add_executable (arb_explicit_uniform_location-minmax > minmax.c) > piglit_add_executable (arb_explicit_uniform_location-boundaries loc-minmax.c) > piglit_add_executable (arb_explicit_uniform_location-array-elements > array-elements.c) > piglit_add_executable (arb_explicit_uniform_location-array-toobig > array-toobig.c) > +piglit_add_executable (arb_explicit_uniform_location-array-overlap > array-overlap.c) > diff --git a/tests/spec/arb_explicit_uniform_location/array-overlap.c > b/tests/spec/arb_explicit_uniform_location/array-overlap.c > new file mode 100644 > index 0000000..570cc70 > --- /dev/null > +++ b/tests/spec/arb_explicit_uniform_location/array-overlap.c > @@ -0,0 +1,98 @@ > +/* > + * Copyright © 2014 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 array-overlap.c > + * > + * Tests overlapping uniform location with array. Note that this test does > + * not include testing for overlaps with unused uniform locations. > + * > + * https://www.opengl.org/registry/specs/ARB/explicit_uniform_location.txt > + * > + * Specification states : "No two default-block uniform variables in the > + * program can have the same location, even if they > are > + * unused, otherwise a compiler or linker error > will be > + * generated." > + */ > +#include "piglit-util-gl-common.h" > + > +PIGLIT_GL_TEST_CONFIG_BEGIN > + > + config.supports_gl_compat_version = 20; > + config.window_visual = PIGLIT_GL_VISUAL_RGB; > + > +PIGLIT_GL_TEST_CONFIG_END > + > +enum piglit_result > +piglit_display(void) > +{ > + return PIGLIT_FAIL; > +} > + > +const char v_sha[] = > +"vec4 vertex;\n" > +"void main() {\n" > +"gl_Position = vertex;\n" > +"}"; > + > +const char fshader_main[] = > +"#extension GL_ARB_explicit_uniform_location: require\n" > +"layout(location = %d) uniform float a[%d];\n" > +"layout(location = %d) uniform float r;\n" > +"layout(location = %d) uniform float g;\n" > +"layout(location = %d) uniform float b;\n" > +"void main() {\n" > +"gl_FragColor = vec4(r, g, b, a[%d]);\n" > +"}"; > + > +static bool > +test() > +{ > + GLuint prog; > + GLint link_status; > + char f_sha[512]; > + > + snprintf(f_sha, 512, fshader_main, > + 0, /* array location */ > + 16, > + 2, /* overlaps with array */ > + 42, > + 43, > + 15); > + > + prog = piglit_build_simple_program_unlinked(v_sha, f_sha); > + > + glLinkProgram(prog); > + glGetProgramiv(prog, GL_LINK_STATUS, &link_status); > + glDeleteProgram(prog); > + > + /* link_status is expected to be GL_FALSE */ > + return !link_status; > +} > + > +void > +piglit_init(int argc, char **argv) > +{ > + piglit_require_extension("GL_ARB_explicit_uniform_location"); > + piglit_report_result(test() ? PIGLIT_PASS : PIGLIT_FAIL); > +} Indentation issues, might use asprintf() in place of snprintf(). otherwise test looks fine.
> -- > 1.8.3.1 > > _______________________________________________ > Piglit mailing list > [email protected] > http://lists.freedesktop.org/mailman/listinfo/piglit _______________________________________________ Piglit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/piglit
