[Piglit] [PATCH 1/6] shader_runner: Check feature support before querying GL_MAX_*.

[Matt Turner]

On Wed, Nov 11, 2015 at 6:44 AM, Ilia Mirkin <imirkin at alum.mit.edu> wrote:
> On Wed, Nov 11, 2015 at 1:46 AM, Matt Turner <mattst88 at gmail.com> wrote:
>> Otherwise, these will generate an error (to be noticed sometime later
>> when glGetError() is called), often resulting in a test failure.
>> ---
>>  tests/shaders/shader_runner.c | 18 ++++++++++++------
>>  1 file changed, 12 insertions(+), 6 deletions(-)
>>
>> diff --git a/tests/shaders/shader_runner.c b/tests/shaders/shader_runner.c
>> index 32ac7bd..4597b46 100644
>> --- a/tests/shaders/shader_runner.c
>> +++ b/tests/shaders/shader_runner.c
>> @@ -3111,12 +3111,18 @@ piglit_init(int argc, char **argv)
>>         if (piglit_get_gl_version() >= 32)
>>                 glGetIntegerv(GL_MAX_VERTEX_OUTPUT_COMPONENTS,
>>                               &gl_max_vertex_output_components);
>> -       glGetIntegerv(GL_MAX_FRAGMENT_UNIFORM_COMPONENTS,
>> -                     &gl_max_fragment_uniform_components);
>> -       glGetIntegerv(GL_MAX_VERTEX_UNIFORM_COMPONENTS,
>> -                     &gl_max_vertex_uniform_components);
>> -       glGetIntegerv(GL_MAX_VARYING_COMPONENTS,
>> -                     &gl_max_varying_components);
>> +       if (piglit_get_gl_version() >= 20 ||
>> +           piglit_is_extension_supported("GL_ARB_fragment_shader"))
>> +               glGetIntegerv(GL_MAX_FRAGMENT_UNIFORM_COMPONENTS,
>> +                             &gl_max_fragment_uniform_components);
>> +       if (piglit_get_gl_version() >= 20 ||
>> +           piglit_is_extension_supported("GL_ARB_vertex_shader"))
>> +               glGetIntegerv(GL_MAX_VERTEX_UNIFORM_COMPONENTS,
>> +                             &gl_max_vertex_uniform_components);
>> +       if (piglit_get_gl_version() >= 30 ||
>> +           piglit_is_extension_supported("GL_EXT_geometry_shader4"))
>
> I'll admit to not having gone to check the specs, but you almost
> certainly mean GL_EXT_gpu_shader4 here, no?

I don't think so. I just looked at what defines
GL_MAX_VARYING_COMPONENTS{,_EXT} in GL/glext.h and it's GL 3.0 or
GL_EXT_geometry_shader4. GL_EXT_geometry_shader4's spec confirms it,
and GL_EXT_gpu_shader4 does not define MAX_VARYING_COMPONENTS.