[Piglit] [PATCH] arb_explicit_uniform_location: lower GL and GLSL requirements

[Ken Phillis Jr]

I looked over the specifications and see that the following changes should
suffice...

1) make a call to piglit_require_GLSL before checking for other extensions.
2) check for the GL_ARB_explicit_attrib_location when opengl 3.30 is not
found.
3) check for GL_ARB_explicit_uniform_location when OpenGL 4.3 is not found.
4) lower the GLSL version requirement to version 1.10


On Wed, Sep 3, 2014 at 12:48 AM, Tapani Pälli <tapani.palli at intel.com>
wrote:

> On 09/03/2014 08:41 AM, Matt Turner wrote:
> > On Tue, Sep 2, 2014 at 10:00 PM, Tapani Pälli <tapani.palli at intel.com>
> wrote:
> >> On 09/03/2014 01:07 AM, Matt Turner wrote:
> >>> On Tue, Sep 2, 2014 at 1:32 AM, Tapani Pälli <tapani.palli at intel.com>
> wrote:
> >>>> Signed-off-by: Tapani Pälli <tapani.palli at intel.com>
> >>>> ---
> >>>>  tests/spec/arb_explicit_uniform_location/array-elements.c      |  6
> ++++--
> >>>>  .../spec/arb_explicit_uniform_location/compiler/layout-01.frag |  7
> ++++---
> >>>>  .../spec/arb_explicit_uniform_location/compiler/layout-01.vert |  7
> ++++---
> >>>>  tests/spec/arb_explicit_uniform_location/inactive-uniform.c    |  6
> ++++--
> >>>>  .../linker/overlap-array-loc-stages.shader_test                | 10
> ++++++----
> >>>>  .../linker/overlap-array-loc.shader_test                       |  7
> ++++---
> >>>>  .../linker/overlap-location-across-stages.shader_test          | 10
> ++++++----
> >>>>  .../linker/set-explicit-location-once-decl-twice.shader_test   | 10
> ++++++----
> >>>>  .../linker/set-explicit-location-twice.shader_test             |  9
> ++++++---
> >>>>  .../linker/set-location-to-sampler.shader_test                 |  7
> ++++---
> >>>>  .../linker/set-same-explicit-location-twice.shader_test        | 10
> ++++++----
> >>>>  .../linker/unused-uniform-reserve-location.shader_test         | 10
> ++++++----
> >>>>  tests/spec/arb_explicit_uniform_location/loc-boundaries.c      |  6
> ++++--
> >>>>  .../arb_explicit_uniform_location/preprocessor/define.frag     |  7
> ++++---
> >>>>  .../arb_explicit_uniform_location/preprocessor/define.vert     |  7
> ++++---
> >>>>  15 files changed, 72 insertions(+), 47 deletions(-)
> >>>>
> >>>> diff --git
> a/tests/spec/arb_explicit_uniform_location/array-elements.c
> b/tests/spec/arb_explicit_uniform_location/array-elements.c
> >>>> index 72cb784..1fa91d4 100644
> >>>> --- a/tests/spec/arb_explicit_uniform_location/array-elements.c
> >>>> +++ b/tests/spec/arb_explicit_uniform_location/array-elements.c
> >>>> @@ -34,7 +34,7 @@
> >>>>
> >>>>  PIGLIT_GL_TEST_CONFIG_BEGIN
> >>>>
> >>>> -       config.supports_gl_core_version = 33;
> >>>> +       config.supports_gl_compat_version = 20;
> >>>>         config.window_visual = PIGLIT_GL_VISUAL_RGB;
> >>>>
> >>>>  PIGLIT_GL_TEST_CONFIG_END
> >>>> @@ -52,7 +52,8 @@ static const char vs_text[] =
> >>>>         "}";
> >>>>
> >>>>  static const char fs_text[] =
> >>>> -       "#version 330\n"
> >>>> +       "#version 130\n"
> >>> You're asking for only a GL 2.0 version, but a version 130 shader.
> >>> Shouldn't you be asking for a GL 3.0 minimum version?
> >> Well, it can be changed. It works just fine like it is though, is there
> >> supposed to be some errors/warnings with this combination?
> > You're testing on a driver that does GL 3.0, so when you ask for a 2.0
> > version you silently get 3.0 since it's compatible. If you were to
> > test this on a driver that only supports 2.0, the shader would fail to
> > compile.
>
> OK, then maybe bump these tests for GL 3.0. I don't have a strong
> preference for the version myself, would it be OK for you Chris?
>
> // Tapani
>
> _______________________________________________
> 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/20140903/3d3d309d/attachment.html>