Re: [Piglit] [PATCH V3] arb_separate_shader_objects: test mixed explicit and non-explicit locations
On Wed, 2015-11-25 at 21:36 +0100, gregory hainaut wrote: > On Wed, 25 Nov 2015 13:45:51 +1100 > Timothy Arceri wrote: > > > From: Timothy Arceri > > > > This tests a bug in Mesa where explicit locations are not taken > > into > > account when assigning varying locations which results in two > > inputs/outputs being given the same location. > > > > Test results: > > Nvidia GeForce 840M - NVIDIA 352.41: pass > > i965 - Mesa 11.1-dev: fail > > > > V3: > > - use helper function to format and link shaders > > - add array and arrays of arrays subtests > > - allow test to be run concurrently > > > > V2: use pick_a_glsl_version() helper > > > > Cc: Gregory Hainaut > > --- > > tests/all.py | 2 + > > .../arb_separate_shader_objects/CMakeLists.gl.txt | 1 + > > .../mixed_explicit_and_non_explicit_locations.c| 343 > > + > > 3 files changed, 346 insertions(+) > > create mode 100644 > > tests/spec/arb_separate_shader_objects/mixed_explicit_and_non_expli > > cit_locations.c > > > > diff --git a/tests/all.py b/tests/all.py > > index 07e3599..7689796 100644 > > --- a/tests/all.py > > +++ b/tests/all.py > > @@ -2161,6 +2161,8 @@ with profile.group_manager( > >'Rendezvous by name') > > g(['arb_separate_shader_object > > -rendezvous_by_name_interpolation'], > >'Rendezvous by name with multiple interpolation qualifier') > > +g(['arb_separate_shader_object > > -mixed_explicit_and_non_explicit_locations'], > > + 'Mixed explicit and non-explicit locations') > > g(['arb_separate_shader_object-rendezvous_by_location', ' > > -fbo'], > >'Rendezvous by location', run_concurrent=False) > > g(['arb_separate_shader_object-rendezvous_by_location-5 > > -stages'], > > diff --git > > a/tests/spec/arb_separate_shader_objects/CMakeLists.gl.txt > > b/tests/spec/arb_separate_shader_objects/CMakeLists.gl.txt > > index b4fce73..8e4011f 100644 > > --- a/tests/spec/arb_separate_shader_objects/CMakeLists.gl.txt > > +++ b/tests/spec/arb_separate_shader_objects/CMakeLists.gl.txt > > @@ -15,6 +15,7 @@ piglit_add_executable (arb_separate_shader_object > > -compat-builtins compat-builtin > > piglit_add_executable (arb_separate_shader_object > > -explicit_locations_and_transform_feedback > > explicit_locations_and_transform_feedback.c) > > piglit_add_executable (arb_separate_shader_object > > -GetProgramPipelineiv GetProgramPipelineiv.c) > > piglit_add_executable (arb_separate_shader_object > > -IsProgramPipeline IsProgramPipeline.c) > > +piglit_add_executable (arb_separate_shader_object > > -mixed_explicit_and_non_explicit_locations > > mixed_explicit_and_non_explicit_locations.c sso-common.c) > > piglit_add_executable (arb_separate_shader_object-ProgramUniform > > -coverage ProgramUniform-coverage.c) > > piglit_add_executable (arb_separate_shader_object > > -rendezvous_by_location rendezvous_by_location.c sso-common.c) > > piglit_add_executable (arb_separate_shader_object > > -rendezvous_by_location-3-stages rendezvous_by_location-3-stages.c) > > diff --git > > a/tests/spec/arb_separate_shader_objects/mixed_explicit_and_non_exp > > licit_locations.c > > b/tests/spec/arb_separate_shader_objects/mixed_explicit_and_non_exp > > licit_locations.c > > new file mode 100644 > > index 000..3bca2bc > > --- /dev/null > > +++ > > b/tests/spec/arb_separate_shader_objects/mixed_explicit_and_non_exp > > licit_locations.c > > @@ -0,0 +1,343 @@ > > +/* > > + * Copyright © 2015 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. > > + */ > > + > > +/** > > + * This tests a bug in Mesa where explicit locations are not taken > > into > > + * account when assigning varying locations which results in two > > + * inputs/outputs being gi
Re: [Piglit] [PATCH V3] arb_separate_shader_objects: test mixed explicit and non-explicit locations
On Wed, 25 Nov 2015 13:45:51 +1100 Timothy Arceri wrote: > From: Timothy Arceri > > This tests a bug in Mesa where explicit locations are not taken into > account when assigning varying locations which results in two > inputs/outputs being given the same location. > > Test results: > Nvidia GeForce 840M - NVIDIA 352.41: pass > i965 - Mesa 11.1-dev: fail > > V3: > - use helper function to format and link shaders > - add array and arrays of arrays subtests > - allow test to be run concurrently > > V2: use pick_a_glsl_version() helper > > Cc: Gregory Hainaut > --- > tests/all.py | 2 + > .../arb_separate_shader_objects/CMakeLists.gl.txt | 1 + > .../mixed_explicit_and_non_explicit_locations.c| 343 > + > 3 files changed, 346 insertions(+) > create mode 100644 > tests/spec/arb_separate_shader_objects/mixed_explicit_and_non_explicit_locations.c > > diff --git a/tests/all.py b/tests/all.py > index 07e3599..7689796 100644 > --- a/tests/all.py > +++ b/tests/all.py > @@ -2161,6 +2161,8 @@ with profile.group_manager( >'Rendezvous by name') > g(['arb_separate_shader_object-rendezvous_by_name_interpolation'], >'Rendezvous by name with multiple interpolation qualifier') > + > g(['arb_separate_shader_object-mixed_explicit_and_non_explicit_locations'], > + 'Mixed explicit and non-explicit locations') > g(['arb_separate_shader_object-rendezvous_by_location', '-fbo'], >'Rendezvous by location', run_concurrent=False) > g(['arb_separate_shader_object-rendezvous_by_location-5-stages'], > diff --git a/tests/spec/arb_separate_shader_objects/CMakeLists.gl.txt > b/tests/spec/arb_separate_shader_objects/CMakeLists.gl.txt > index b4fce73..8e4011f 100644 > --- a/tests/spec/arb_separate_shader_objects/CMakeLists.gl.txt > +++ b/tests/spec/arb_separate_shader_objects/CMakeLists.gl.txt > @@ -15,6 +15,7 @@ piglit_add_executable > (arb_separate_shader_object-compat-builtins compat-builtin > piglit_add_executable > (arb_separate_shader_object-explicit_locations_and_transform_feedback > explicit_locations_and_transform_feedback.c) > piglit_add_executable (arb_separate_shader_object-GetProgramPipelineiv > GetProgramPipelineiv.c) > piglit_add_executable (arb_separate_shader_object-IsProgramPipeline > IsProgramPipeline.c) > +piglit_add_executable > (arb_separate_shader_object-mixed_explicit_and_non_explicit_locations > mixed_explicit_and_non_explicit_locations.c sso-common.c) > piglit_add_executable (arb_separate_shader_object-ProgramUniform-coverage > ProgramUniform-coverage.c) > piglit_add_executable (arb_separate_shader_object-rendezvous_by_location > rendezvous_by_location.c sso-common.c) > piglit_add_executable > (arb_separate_shader_object-rendezvous_by_location-3-stages > rendezvous_by_location-3-stages.c) > diff --git > a/tests/spec/arb_separate_shader_objects/mixed_explicit_and_non_explicit_locations.c > > b/tests/spec/arb_separate_shader_objects/mixed_explicit_and_non_explicit_locations.c > new file mode 100644 > index 000..3bca2bc > --- /dev/null > +++ > b/tests/spec/arb_separate_shader_objects/mixed_explicit_and_non_explicit_locations.c > @@ -0,0 +1,343 @@ > +/* > + * Copyright © 2015 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. > + */ > + > +/** > + * This tests a bug in Mesa where explicit locations are not taken into > + * account when assigning varying locations which results in two > + * inputs/outputs being given the same location. > + */ > +#include "piglit-util-gl.h" > +#include "sso-common.h" > + > +PIGLIT_GL_TEST_CONFIG_BEGIN > + > + config.supports_gl_compat_version = 10; > + config.window_visual = PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE; > + > +PIGLIT_GL_TEST_CONFIG_END > + > +static GLuint pipeline = 0; > +static GLuint pipeline_ar
