diff options
Diffstat (limited to 'src/mapi/glapi')
| -rw-r--r-- | src/mapi/glapi/gen/gl_XML.py | 14 | ||||
| -rw-r--r-- | src/mapi/glapi/gen/gl_gentable.py | 4 |
2 files changed, 9 insertions, 9 deletions
diff --git a/src/mapi/glapi/gen/gl_XML.py b/src/mapi/glapi/gen/gl_XML.py index 9a3a0507b81..20057cf9c4f 100644 --- a/src/mapi/glapi/gen/gl_XML.py +++ b/src/mapi/glapi/gen/gl_XML.py @@ -834,7 +834,7 @@ class gl_function( gl_item ): versions. """ result = [] - for entry_point, api_to_ver in self.entry_point_api_map.iteritems(): + for entry_point, api_to_ver in self.entry_point_api_map.items(): if api not in api_to_ver: continue if version is not None and version < api_to_ver[api]: @@ -881,7 +881,7 @@ class gl_api(object): def filter_functions(self, entry_point_list): """Filter out entry points not in entry_point_list.""" functions_by_name = {} - for func in self.functions_by_name.itervalues(): + for func in self.functions_by_name.values(): entry_points = [ent for ent in func.entry_points if ent in entry_point_list] if entry_points: func.filter_entry_points(entry_points) @@ -894,7 +894,7 @@ class gl_api(object): optionally, not in the given version of the given API). """ functions_by_name = {} - for func in self.functions_by_name.itervalues(): + for func in self.functions_by_name.values(): entry_points = func.entry_points_for_api_version(api, version) if entry_points: func.filter_entry_points(entry_points) @@ -1003,13 +1003,13 @@ class gl_api(object): def functionIterateByOffset(self): max_offset = -1 - for func in self.functions_by_name.itervalues(): + for func in self.functions_by_name.values(): if func.offset > max_offset: max_offset = func.offset temp = [None for i in range(0, max_offset + 1)] - for func in self.functions_by_name.itervalues(): + for func in self.functions_by_name.values(): if func.offset != -1: temp[ func.offset ] = func @@ -1023,7 +1023,7 @@ class gl_api(object): def functionIterateAll(self): - return self.functions_by_name.itervalues() + return self.functions_by_name.values() def enumIterateByName(self): @@ -1064,7 +1064,7 @@ class gl_api(object): def typeIterate(self): - return self.types_by_name.itervalues() + return self.types_by_name.values() def find_type( self, type_name ): diff --git a/src/mapi/glapi/gen/gl_gentable.py b/src/mapi/glapi/gen/gl_gentable.py index 73fa6c6daac..49206b11671 100644 --- a/src/mapi/glapi/gen/gl_gentable.py +++ b/src/mapi/glapi/gen/gl_gentable.py @@ -202,13 +202,13 @@ class PrintCode(gl_XML.gl_print_base): # Determine how many functions have a defined offset. func_count = 0 - for f in api.functions_by_name.itervalues(): + for f in api.functions_by_name.values(): if f.offset != -1: func_count += 1 # Build the mapping from offset to function name. funcnames = [None] * func_count - for f in api.functions_by_name.itervalues(): + for f in api.functions_by_name.values(): if f.offset != -1: if not (funcnames[f.offset] is None): raise Exception("Function table has more than one function with same offset (offset %d, func %s)" % (f.offset, f.name)) |