glthread: sync in glFlush for multiple contexts

[mesa.git] / src / mapi / glapi / gen / glX_proto_common.py

diff --git a/src/mapi/glapi/gen/glX_proto_common.py b/src/mapi/glapi/gen/glX_proto_common.py
index 6f094e22b3174437ac00ad7a0358422b685e957e..0559dd160910fd95f4147100743a8fadccde7c65 100644 (file)
--- a/src/mapi/glapi/gen/glX_proto_common.py
+++ b/src/mapi/glapi/gen/glX_proto_common.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 
 # (C) Copyright IBM Corporation 2004, 2005
 # All Rights Reserved.
@@ -25,71 +24,69 @@
 # Authors:
 #    Ian Romanick <idr@us.ibm.com>
 
+from __future__ import print_function
+
 import gl_XML, glX_XML
-import string
 
 
 class glx_proto_item_factory(glX_XML.glx_item_factory):
-       """Factory to create GLX protocol oriented objects derived from gl_item."""
-    
-       def create_item(self, name, element, context):
-               if name == "type":
-                       return glx_proto_type(element, context)
-               else:
-                       return glX_XML.glx_item_factory.create_item(self, name, element, context)
+    """Factory to create GLX protocol oriented objects derived from gl_item."""
+
+    def create_type(self, element, context, category):
+        return glx_proto_type(element, context, category)
 
 
 class glx_proto_type(gl_XML.gl_type):
-       def __init__(self, element, context):
-               gl_XML.gl_type.__init__(self, element, context)
+    def __init__(self, element, context, category):
+        gl_XML.gl_type.__init__(self, element, context, category)
 
-               self.glx_name = element.nsProp( "glx_name", None )
-               return
+        self.glx_name = element.get( "glx_name" )
+        return
 
 
 class glx_print_proto(gl_XML.gl_print_base):
-       def size_call(self, func, outputs_also = 0):
-               """Create C code to calculate 'compsize'.
+    def size_call(self, func, outputs_also = 0):
+        """Create C code to calculate 'compsize'.
+
+        Creates code to calculate 'compsize'.  If the function does
+        not need 'compsize' to be calculated, None will be
+        returned."""
 
-               Creates code to calculate 'compsize'.  If the function does
-               not need 'compsize' to be calculated, None will be
-               returned."""
-       
-               compsize = None
+        compsize = None
 
-               for param in func.parameterIterator():
-                       if outputs_also or not param.is_output:
-                               if param.is_image():
-                                       [dim, w, h, d, junk] = param.get_dimensions()
+        for param in func.parameterIterator():
+            if outputs_also or not param.is_output:
+                if param.is_image():
+                    [dim, w, h, d, junk] = param.get_dimensions()
 
-                                       compsize = '__glImageSize(%s, %s, %s, %s, %s, %s)' % (w, h, d, param.img_format, param.img_type, param.img_target)
-                                       if not param.img_send_null:
-                                               compsize = '(%s != NULL) ? %s : 0' % (param.name, compsize)
+                    compsize = '__glImageSize(%s, %s, %s, %s, %s, %s)' % (w, h, d, param.img_format, param.img_type, param.img_target)
+                    if not param.img_send_null:
+                        compsize = '(%s != NULL) ? %s : 0' % (param.name, compsize)
 
-                                       return compsize
+                    return compsize
 
-                               elif len(param.count_parameter_list):
-                                       parameters = string.join( param.count_parameter_list, "," )
-                                       compsize = "__gl%s_size(%s)" % (func.name, parameters)
+                elif len(param.count_parameter_list):
+                    parameters = ",".join( param.count_parameter_list )
+                    compsize = "__gl%s_size(%s)" % (func.name, parameters)
 
-                                       return compsize
+                    return compsize
 
-               return None
+        return None
 
 
-       def emit_packet_size_calculation(self, f, bias):
-               # compsize is only used in the command size calculation if
-               # the function has a non-output parameter that has a non-empty
-               # counter_parameter_list.
+    def emit_packet_size_calculation(self, f, bias):
+        # compsize is only used in the command size calculation if
+        # the function has a non-output parameter that has a non-empty
+        # counter_parameter_list.
 
-               compsize = self.size_call(f)
-               if compsize:
-                       print '    const GLuint compsize = %s;' % (compsize)
+        compsize = self.size_call(f)
+        if compsize:
+            print('    const GLuint compsize = %s;' % (compsize))
 
-               if bias:
-                       print '    const GLuint cmdlen = %s - %u;' % (f.command_length(), bias)
-               else:
-                       print '    const GLuint cmdlen = %s;' % (f.command_length())
+        if bias:
+            print('    const GLuint cmdlen = %s - %u;' % (f.command_length(), bias))
+        else:
+            print('    const GLuint cmdlen = %s;' % (f.command_length()))
 
-               #print ''
-               return compsize
+        #print ''
+        return compsize