glthread: sync in glFlush for multiple contexts

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

diff --git a/src/mapi/glapi/gen/glX_XML.py b/src/mapi/glapi/gen/glX_XML.py
index c659e931b49c1e8d9c1f5855f24ffb10e24b7f7a..3b54a967fdcb255ed7e4e37ff367b340bec43ce1 100644 (file)
--- a/src/mapi/glapi/gen/glX_XML.py
+++ b/src/mapi/glapi/gen/glX_XML.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 
 # (C) Copyright IBM Corporation 2004, 2005
 # All Rights Reserved.
@@ -49,7 +48,7 @@ class glx_enum(gl_XML.gl_enum):
 
         self.functions = {}
 
-        for child in element.getchildren():
+        for child in element:
             if child.tag == "size":
                 n = child.get( "name" )
                 c = child.get( "count" )
@@ -65,7 +64,7 @@ class glx_enum(gl_XML.gl_enum):
                 else:
                     mode = 1
 
-                if not self.functions.has_key(n):
+                if n not in self.functions:
                     self.functions[ n ] = [c, mode]
 
         return
@@ -131,7 +130,7 @@ class glx_function(gl_XML.gl_function):
                     self.counter_list.append(param.counter)
 
 
-        for child in element.getchildren():
+        for child in element:
             if child.tag == "glx":
                 rop = child.get( 'rop' )
                 sop = child.get( 'sop' )
@@ -297,7 +296,7 @@ class glx_function(gl_XML.gl_function):
         parameters.extend( temp[1] )
         if include_variable_parameters:
             parameters.extend( temp[2] )
-        return parameters.__iter__()
+        return iter(parameters)
 
 
     def parameterIterateCounters(self):
@@ -305,7 +304,7 @@ class glx_function(gl_XML.gl_function):
         for name in self.counter_list:
             temp.append( self.parameters_by_name[ name ] )
 
-        return temp.__iter__()
+        return iter(temp)
 
 
     def parameterIterateOutputs(self):
@@ -471,7 +470,7 @@ class glx_function(gl_XML.gl_function):
     def needs_reply(self):
         try:
             x = self._needs_reply
-        except Exception, e:
+        except Exception:
             x = 0
             if self.return_type != 'void':
                 x = 1
@@ -548,13 +547,14 @@ class glx_function_iterator(object):
         return self
 
 
-    def next(self):
-        f = self.iterator.next()
+    def __next__(self):
+        while True:
+            f = next(self.iterator)
 
-        if f.client_supported_for_indirect():
-            return f
-        else:
-            return self.next()
+            if f.client_supported_for_indirect():
+                return f
+
+    next = __next__
 
 
 class glx_api(gl_XML.gl_api):