[Piglit] [PATCH 3/3] util/waffle: More wisely handle compat context versions > 1.0

[Chad Versace]

On 02/20/2013 04:55 PM, Brian Paul wrote:
> On 02/20/2013 04:03 PM, Chad Versace wrote:
>> The commit below caused many shader_runner tests to skip on drivers that
>> lack GLX_ARB_create_context and EGL_KHR_create_context.  This patch fixes
>> those regressions buy changing the way that Piglit handles requests for
>> compatibility contexts.
>>
>>      commit 3a92ffa0eb1efff8ccbe65b5c51710cea8ef0c5c
>>      Author: Paul Berry<stereotype441 at gmail.com>
>>      Date:   Fri Feb 8 13:04:13 2013 -0800
>>
>>     shader_runner and glslparsertest: choose GL version more accurately.
>>
>> The regressing commit set test_config->supports_gl_compat_version to the
>> least version that is guaranteed to support the GLSL version used by the
>> test. If supports_gl_compat_version>  10, then a code path is taken in
>> Waffle that requires the driver to support GLX_ARB_create_context or
>> EGL_KHR_create_context.
>>
>> This patch changes piglit_wfl_framework to *not* specify a GL version when
>> creating a compatibility waffle_context. If context creation succeeds,
>> Piglit checks that the actual context version satifies the requested
>> version and skips the test accordingly.
>>
>> CC: Paul Berry<stereotype441 at gmail.com>
>> CC: Michel Dänzer<michel at daenzer.net>
>> Signed-off-by: Chad Versace<chad.versace at linux.intel.com>
>> ---
>>   tests/util/piglit-framework-gl.h                   | 26 +++------
>>   .../piglit-framework-gl/piglit_wfl_framework.c     | 68 ++++++++++++++++++----
>>   2 files changed, 65 insertions(+), 29 deletions(-)



>> +        printf("piglit: info: Requested a GL %d.%d compatibility "
>> +               "context, but actual context version is %d.%d\n",
>> +               test_config->supports_gl_compat_version / 10,
>> +               test_config->supports_gl_compat_version % 10,
>> +               actual_version / 10,
>> +               actual_version % 10);
>> +        return false;
>> +      }
>> +    default:
>> +       assert(0);
>> +       return false;
> 
> The indentation looks funny there, but maybe that's just tabs vs. spaces.

There was a real whitespace bug. Not its' fixed.

> LGTM, but others should chime in too.
> 
> Reviewed-by: Brian Paul <brianp at vmware.com>

Thanks for looking at this.