[Piglit] [PATCH 1/8] shader_runner: Clamp the SIZE directive to the platform's minimum size.

[Ilia Mirkin]

On Sat, Aug 30, 2014 at 4:19 PM, Eric Anholt <eric at anholt.net> wrote:
> Ilia Mirkin <imirkin at alum.mit.edu> writes:
>
>> On Fri, Aug 29, 2014 at 5:41 PM, Eric Anholt <eric at anholt.net> wrote:
>>> I want to start declaring small sizes in shader_runner tests, but we
>>> need to avoid angering win8.
>>
>> Can I put in a good word for POT sizes?
>
> You've got shader-capable hardware that's also POT-only?  I'm pretty
> sure your driver should be hiding that from people :(

I actually realized after I sent it that this was only for
shader_runner, so it won't affect nouveau_vieux. However nv3x (GeForce
FX 5000-series) can only do POT as well...

>
>>> diff --git a/tests/shaders/shader_runner.c b/tests/shaders/shader_runner.c
>>> index 82b834d..b2bde04 100644
>>> --- a/tests/shaders/shader_runner.c
>>> +++ b/tests/shaders/shader_runner.c
>>> @@ -1121,9 +1121,17 @@ get_required_config(const char *script_name,
>>>         parse_required_config(&parse_results, script_name);
>>>         choose_required_gl_version(&parse_results, &required_gl_version);
>>>
>>> +       /* If the shader has a SIZE directive, then make the window
>>> +        * only that big (but constrained by whatever the platform's
>>> +        * limits on window size are).
>>> +        */
>>>         if (parse_results.found_size) {
>>>                 config->window_width = parse_results.size[0];
>>>                 config->window_height = parse_results.size[1];
>>> +#if defined(_WIN32)
>>> +                config.window_width = MAX2(config.window_width, 160);
>>
>> Surely you meant config->window_width/height?
>>
>>> +                config.window_height = MAX2(config.window_height, 160);
>>> +#endif
>
> Thanks.