<div dir="ltr"><div>I looked over the specifications and see that the following changes should suffice...<br><br>1) make a call to piglit_require_GLSL before checking for other extensions.<br></div><div>2) check for the GL_ARB_explicit_attrib_location when opengl 3.30 is not found.<br>
</div><div>3) check for GL_ARB_explicit_uniform_location when OpenGL 4.3 is not found.<br></div><div>4) lower the GLSL version requirement to version 1.10<br></div></div><div class="gmail_extra"><br><br><div class="gmail_quote">
On Wed, Sep 3, 2014 at 12:48 AM, Tapani Pälli <span dir="ltr"><<a href="mailto:tapani.palli@intel.com" target="_blank">tapani.palli@intel.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
<div class="HOEnZb"><div class="h5">On 09/03/2014 08:41 AM, Matt Turner wrote:<br>
> On Tue, Sep 2, 2014 at 10:00 PM, Tapani Pälli <<a href="mailto:tapani.palli@intel.com">tapani.palli@intel.com</a>> wrote:<br>
>> On 09/03/2014 01:07 AM, Matt Turner wrote:<br>
>>> On Tue, Sep 2, 2014 at 1:32 AM, Tapani Pälli <<a href="mailto:tapani.palli@intel.com">tapani.palli@intel.com</a>> wrote:<br>
>>>> Signed-off-by: Tapani Pälli <<a href="mailto:tapani.palli@intel.com">tapani.palli@intel.com</a>><br>
>>>> ---<br>
>>>> tests/spec/arb_explicit_uniform_location/array-elements.c | 6 ++++--<br>
>>>> .../spec/arb_explicit_uniform_location/compiler/layout-01.frag | 7 ++++---<br>
>>>> .../spec/arb_explicit_uniform_location/compiler/layout-01.vert | 7 ++++---<br>
>>>> tests/spec/arb_explicit_uniform_location/inactive-uniform.c | 6 ++++--<br>
>>>> .../linker/overlap-array-loc-stages.shader_test | 10 ++++++----<br>
>>>> .../linker/overlap-array-loc.shader_test | 7 ++++---<br>
>>>> .../linker/overlap-location-across-stages.shader_test | 10 ++++++----<br>
>>>> .../linker/set-explicit-location-once-decl-twice.shader_test | 10 ++++++----<br>
>>>> .../linker/set-explicit-location-twice.shader_test | 9 ++++++---<br>
>>>> .../linker/set-location-to-sampler.shader_test | 7 ++++---<br>
>>>> .../linker/set-same-explicit-location-twice.shader_test | 10 ++++++----<br>
>>>> .../linker/unused-uniform-reserve-location.shader_test | 10 ++++++----<br>
>>>> tests/spec/arb_explicit_uniform_location/loc-boundaries.c | 6 ++++--<br>
>>>> .../arb_explicit_uniform_location/preprocessor/define.frag | 7 ++++---<br>
>>>> .../arb_explicit_uniform_location/preprocessor/define.vert | 7 ++++---<br>
>>>> 15 files changed, 72 insertions(+), 47 deletions(-)<br>
>>>><br>
>>>> diff --git a/tests/spec/arb_explicit_uniform_location/array-elements.c b/tests/spec/arb_explicit_uniform_location/array-elements.c<br>
>>>> index 72cb784..1fa91d4 100644<br>
>>>> --- a/tests/spec/arb_explicit_uniform_location/array-elements.c<br>
>>>> +++ b/tests/spec/arb_explicit_uniform_location/array-elements.c<br>
>>>> @@ -34,7 +34,7 @@<br>
>>>><br>
>>>> PIGLIT_GL_TEST_CONFIG_BEGIN<br>
>>>><br>
>>>> - config.supports_gl_core_version = 33;<br>
>>>> + config.supports_gl_compat_version = 20;<br>
>>>> config.window_visual = PIGLIT_GL_VISUAL_RGB;<br>
>>>><br>
>>>> PIGLIT_GL_TEST_CONFIG_END<br>
>>>> @@ -52,7 +52,8 @@ static const char vs_text[] =<br>
>>>> "}";<br>
>>>><br>
>>>> static const char fs_text[] =<br>
>>>> - "#version 330\n"<br>
>>>> + "#version 130\n"<br>
>>> You're asking for only a GL 2.0 version, but a version 130 shader.<br>
>>> Shouldn't you be asking for a GL 3.0 minimum version?<br>
>> Well, it can be changed. It works just fine like it is though, is there<br>
>> supposed to be some errors/warnings with this combination?<br>
> You're testing on a driver that does GL 3.0, so when you ask for a 2.0<br>
> version you silently get 3.0 since it's compatible. If you were to<br>
> test this on a driver that only supports 2.0, the shader would fail to<br>
> compile.<br>
<br>
</div></div>OK, then maybe bump these tests for GL 3.0. I don't have a strong<br>
preference for the version myself, would it be OK for you Chris?<br>
<span class="HOEnZb"><font color="#888888"><br>
// Tapani<br>
</font></span><div class="HOEnZb"><div class="h5"><br>
_______________________________________________<br>
Piglit mailing list<br>
<a href="mailto:Piglit@lists.freedesktop.org">Piglit@lists.freedesktop.org</a><br>
<a href="http://lists.freedesktop.org/mailman/listinfo/piglit" target="_blank">http://lists.freedesktop.org/mailman/listinfo/piglit</a><br>
</div></div></blockquote></div><br></div>