[Mesa-dev] [PATCH] glapi: Add positional argument specifier.

[Vinson Lee]

On Wed, May 6, 2015 at 4:35 PM, Ian Romanick <idr at freedesktop.org> wrote:
> On 05/06/2015 03:45 PM, Kenneth Graunke wrote:
>> On Wednesday, May 06, 2015 12:48:30 PM Vinson Lee wrote:
>>> Fix build error introduced with commit 1c5a57a "glapi/es3.1: Add support
>>> for GLES versions > 3.0" with Python < 2.7.
>>>
>>>   File "src/mapi/glapi/gen/gl_genexec.py", line 230, in <module>
>>>     printer.Print(api)
>>>   File "src/mapi/glapi/gen/gl_XML.py", line 120, in Print
>>>     self.printBody(api)
>>>   File "src/mapi/glapi/gen/gl_genexec.py", line 187, in printBody
>>>     condition_parts.append('(ctx->API == API_OPENGLES2 && ctx->Version >= {})'.format(int(f.api_map['es2'] * 10)))
>>> ValueError: zero length field name in format
>>>
>>> Signed-off-by: Vinson Lee <vlee at freedesktop.org>
>>> ---
>>>  src/mapi/glapi/gen/gl_genexec.py |    2 +-
>>>  1 files changed, 1 insertions(+), 1 deletions(-)
>>>
>>> diff --git a/src/mapi/glapi/gen/gl_genexec.py b/src/mapi/glapi/gen/gl_genexec.py
>>> index e58cdfc..4e76fe3 100644
>>> --- a/src/mapi/glapi/gen/gl_genexec.py
>>> +++ b/src/mapi/glapi/gen/gl_genexec.py
>>> @@ -184,7 +184,7 @@ class PrintCode(gl_XML.gl_print_base):
>>>                  condition_parts.append('ctx->API == API_OPENGLES')
>>>              if 'es2' in f.api_map:
>>>                  if f.api_map['es2'] > 2.0:
>>> -                    condition_parts.append('(ctx->API == API_OPENGLES2 && ctx->Version >= {})'.format(int(f.api_map['es2'] * 10)))
>>> +                    condition_parts.append('(ctx->API == API_OPENGLES2 && ctx->Version >= {0})'.format(int(f.api_map['es2'] * 10)))
>>>                  else:
>>>                      condition_parts.append('ctx->API == API_OPENGLES2')
>>>              if not condition_parts:
>>>
>>
>> Do we actually care at this point?
>
> Depends on whether or not you care about CentOS 6 or whatever version
> RHEL it is based on. :(
>
> https://bugs.freedesktop.org/show_bug.cgi?id=90346
>

This patch does not fix bug 90346. DispatchSanity_test.GLES2 still
fails on CentOS 6.

>> Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
>>
>> _______________________________________________
>> mesa-dev mailing list
>> mesa-dev at lists.freedesktop.org
>> http://lists.freedesktop.org/mailman/listinfo/mesa-dev
>
>