Mesa (master): glapi: Add positional argument specifier.
Vinson Lee
vlee at kemper.freedesktop.org
Thu May 7 06:40:29 UTC 2015
Module: Mesa
Branch: master
Commit: cf5e015f71496e0626cd5c6262af1c5099391850
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=cf5e015f71496e0626cd5c6262af1c5099391850
Author: Vinson Lee <vlee at freedesktop.org>
Date: Wed May 6 12:39:09 2015 -0700
glapi: Add positional argument specifier.
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>
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>
---
src/mapi/glapi/gen/gl_genexec.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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:
More information about the mesa-commit
mailing list