diff options
Diffstat (limited to 'src/mapi')
| -rw-r--r-- | src/mapi/glapi/gen/glX_XML.py | 62 | ||||
| -rw-r--r-- | src/mapi/glapi/gen/glX_proto_common.py | 8 | ||||
| -rw-r--r-- | src/mapi/glapi/gen/glX_proto_recv.py | 40 | ||||
| -rw-r--r-- | src/mapi/glapi/gen/glX_proto_send.py | 40 | ||||
| -rw-r--r-- | src/mapi/glapi/gen/glX_proto_size.py | 85 | ||||
| -rw-r--r-- | src/mapi/glapi/gen/glX_server_table.py | 2 | ||||
| -rw-r--r-- | src/mapi/glapi/gen/gl_XML.py | 186 | ||||
| -rw-r--r-- | src/mapi/glapi/gen/gl_apitemp.py | 20 | ||||
| -rw-r--r-- | src/mapi/glapi/gen/gl_enums.py | 4 | ||||
| -rw-r--r-- | src/mapi/glapi/gen/gl_procs.py | 2 | ||||
| -rw-r--r-- | src/mapi/glapi/gen/gl_x86-64_asm.py | 8 | ||||
| -rw-r--r-- | src/mapi/glapi/gen/static_data.py | 2468 | ||||
| -rw-r--r-- | src/mapi/glapi/gen/typeexpr.py | 52 |
13 files changed, 1488 insertions, 1489 deletions
diff --git a/src/mapi/glapi/gen/glX_XML.py b/src/mapi/glapi/gen/glX_XML.py index ec2e412c21..9090b76c65 100644 --- a/src/mapi/glapi/gen/glX_XML.py +++ b/src/mapi/glapi/gen/glX_XML.py @@ -50,9 +50,9 @@ class glx_enum(gl_XML.gl_enum): for child in element.getchildren(): if child.tag == "size": - n = child.get( "name" ) - c = child.get( "count" ) - m = child.get( "mode", "set" ) + n = child.get("name") + c = child.get("count") + m = child.get("mode", "set") if not c: c = self.default_count @@ -65,7 +65,7 @@ class glx_enum(gl_XML.gl_enum): mode = 1 if not self.functions.has_key(n): - self.functions[ n ] = [c, mode] + self.functions[n] = [c, mode] class glx_function(gl_XML.gl_function): @@ -116,19 +116,19 @@ class glx_function(gl_XML.gl_function): name = element.get("name") if name == self.name: for param in self.parameters: - self.parameters_by_name[ param.name ] = param + self.parameters_by_name[param.name] = param if len(param.count_parameter_list): - self.count_parameter_list.extend( param.count_parameter_list ) + self.count_parameter_list.extend(param.count_parameter_list) if param.counter and param.counter not in self.counter_list: self.counter_list.append(param.counter) for child in element.getchildren(): if child.tag == "glx": - rop = child.get( 'rop' ) - sop = child.get( 'sop' ) - vop = child.get( 'vendorpriv' ) + rop = child.get('rop') + sop = child.get('sop') + vop = child.get('vendorpriv') if rop: self.glx_rop = int(rop) @@ -140,12 +140,12 @@ class glx_function(gl_XML.gl_function): self.glx_vendorpriv = int(vop) self.glx_vendorpriv_names.append(name) - self.img_reset = child.get( 'img_reset' ) + self.img_reset = child.get('img_reset') # The 'handcode' attribute can be one of 'true', # 'false', 'client', or 'server'. - handcode = child.get( 'handcode', 'false' ) + handcode = child.get('handcode', 'false') if handcode == "false": self.server_handcode = 0 self.client_handcode = 0 @@ -161,11 +161,11 @@ class glx_function(gl_XML.gl_function): else: raise RuntimeError('Invalid handcode mode "%s" in function "%s".' % (handcode, self.name)) - self.ignore = gl_XML.is_attr_true( child, 'ignore' ) - self.can_be_large = gl_XML.is_attr_true( child, 'large' ) - self.glx_doubles_in_order = gl_XML.is_attr_true( child, 'doubles_in_order' ) - self.reply_always_array = gl_XML.is_attr_true( child, 'always_array' ) - self.dimensions_in_reply = gl_XML.is_attr_true( child, 'dimensions_in_reply' ) + self.ignore = gl_XML.is_attr_true(child, 'ignore') + self.can_be_large = gl_XML.is_attr_true(child, 'large') + self.glx_doubles_in_order = gl_XML.is_attr_true(child, 'doubles_in_order') + self.reply_always_array = gl_XML.is_attr_true(child, 'always_array') + self.dimensions_in_reply = gl_XML.is_attr_true(child, 'dimensions_in_reply') # Do some validation of the GLX protocol information. As # new tests are discovered, they should be added here. @@ -231,7 +231,7 @@ class glx_function(gl_XML.gl_function): # header used by images with the specified number # of dimensions. - if dim <= 2: + if dim <= 2: offset = 20 elif dim <= 4: offset = 36 @@ -249,43 +249,43 @@ class glx_function(gl_XML.gl_function): if not param.is_variable_length() and not param.is_client_only: offset += param.size() - if self.pad_after( param ): + if self.pad_after(param): offset += 4 self.offsets_calculated = 1 def offset_of(self, param_name): self.calculate_offsets() - return self.parameters_by_name[ param_name ].offset + return self.parameters_by_name[param_name].offset - def parameterIterateGlxSend(self, include_variable_parameters = 1): + def parameterIterateGlxSend(self, include_variable_parameters=1): """Create an iterator for parameters in GLX request order.""" # The parameter lists are usually quite short, so it's easier # (i.e., less code) to just generate a new list with the # required elements than it is to create a new iterator class. - temp = [ [], [], [] ] + temp = [[], [], []] for param in self.parameters: if param.is_output: continue if param.is_variable_length(): - temp[2].append( param ) + temp[2].append(param) elif not self.glx_doubles_in_order and param.is_64_bit(): - temp[0].append( param ) + temp[0].append(param) else: - temp[1].append( param ) + temp[1].append(param) parameters = temp[0] - parameters.extend( temp[1] ) + parameters.extend(temp[1]) if include_variable_parameters: - parameters.extend( temp[2] ) + parameters.extend(temp[2]) return parameters.__iter__() def parameterIterateCounters(self): temp = [] for name in self.counter_list: - temp.append( self.parameters_by_name[ name ] ) + temp.append(self.parameters_by_name[name]) return temp.__iter__() @@ -293,7 +293,7 @@ class glx_function(gl_XML.gl_function): temp = [] for p in self.parameters: if p.is_output: - temp.append( p ) + temp.append(p) return temp @@ -314,7 +314,7 @@ class glx_function(gl_XML.gl_function): else: size += param.size() - if self.pad_after( param ): + if self.pad_after(param): size += 4 for param in self.images: @@ -372,7 +372,7 @@ class glx_function(gl_XML.gl_function): """Get the unique protocol opcode for the glXFunction""" if (self.glx_rop == 0) and self.vectorequiv: - equiv = self.context.functions_by_name[ self.vectorequiv ] + equiv = self.context.functions_by_name[self.vectorequiv] self.glx_rop = equiv.glx_rop if self.glx_rop != 0: @@ -400,7 +400,7 @@ class glx_function(gl_XML.gl_function): """Get the unique protocol enum name for the glXFunction""" if (self.glx_rop == 0) and self.vectorequiv: - equiv = self.context.functions_by_name[ self.vectorequiv ] + equiv = self.context.functions_by_name[self.vectorequiv] self.glx_rop = equiv.glx_rop self.glx_doubles_in_order = equiv.glx_doubles_in_order diff --git a/src/mapi/glapi/gen/glX_proto_common.py b/src/mapi/glapi/gen/glX_proto_common.py index 05102499e7..d27f7848d0 100644 --- a/src/mapi/glapi/gen/glX_proto_common.py +++ b/src/mapi/glapi/gen/glX_proto_common.py @@ -42,12 +42,11 @@ class glx_proto_type(gl_XML.gl_type): def __init__(self, element, context, category): gl_XML.gl_type.__init__(self, element, context, category) - self.glx_name = element.get( "glx_name" ) - return + self.glx_name = element.get("glx_name") class glx_print_proto(gl_XML.gl_print_base): - def size_call(self, func, outputs_also = 0): + def size_call(self, func, outputs_also=0): """Create C code to calculate 'compsize'. Creates code to calculate 'compsize'. If the function does @@ -68,14 +67,13 @@ class glx_print_proto(gl_XML.gl_print_base): return compsize elif len(param.count_parameter_list): - parameters = string.join( param.count_parameter_list, "," ) + parameters = string.join(param.count_parameter_list, ",") compsize = "__gl%s_size(%s)" % (func.name, parameters) return compsize 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 diff --git a/src/mapi/glapi/gen/glX_proto_recv.py b/src/mapi/glapi/gen/glX_proto_recv.py index 148d04d7aa..651ac14177 100644 --- a/src/mapi/glapi/gen/glX_proto_recv.py +++ b/src/mapi/glapi/gen/glX_proto_recv.py @@ -39,7 +39,7 @@ class PrintGlxDispatch_h(gl_XML.gl_print_base): gl_XML.gl_print_base.__init__(self) self.name = "glX_proto_recv.py (from Mesa)" - self.license = license.bsd_license_template % ( "(C) Copyright IBM Corporation 2005", "IBM") + self.license = license.bsd_license_template % ("(C) Copyright IBM Corporation 2005", "IBM") self.header_tag = "_INDIRECT_DISPATCH_H_" @@ -69,9 +69,9 @@ class PrintGlxDispatchFunctions(glX_proto_common.glx_print_proto): def __init__(self, do_swap): gl_XML.gl_print_base.__init__(self) self.name = "glX_proto_recv.py (from Mesa)" - self.license = license.bsd_license_template % ( "(C) Copyright IBM Corporation 2005", "IBM") + self.license = license.bsd_license_template % ("(C) Copyright IBM Corporation 2005", "IBM") - self.real_types = [ '', '', 'uint16_t', '', 'uint32_t', '', '', '', 'uint64_t' ] + self.real_types = ['', '', 'uint16_t', '', 'uint32_t', '', '', '', 'uint64_t'] self.do_swap = do_swap def printRealHeader(self): @@ -107,8 +107,8 @@ class PrintGlxDispatchFunctions(glX_proto_common.glx_print_proto): self.printFunction(func, func.glx_vendorpriv_names[0]) def fptrType(self, name): - fptr = "pfngl" + name + "proc" - return fptr.upper() + fptr = "pfngl" + name + "proc" + return fptr.upper() def printFunction(self, f, name): if (f.glx_sop or f.glx_vendorpriv) and (len(f.get_images()) != 0): @@ -132,7 +132,7 @@ class PrintGlxDispatchFunctions(glX_proto_common.glx_print_proto): if f.glx_rop or f.vectorequiv: self.printRenderFunction(f) elif f.glx_sop or f.glx_vendorpriv: - if len(f.get_images()) == 0: + if len(f.get_images()) == 0: self.printSingleFunction(f, name) else: print "/* Missing GLX protocol for %s. */" % (name) @@ -145,7 +145,7 @@ class PrintGlxDispatchFunctions(glX_proto_common.glx_print_proto): def emit_swap_wrappers(self, api): self.type_map = {} - already_done = [ ] + already_done = [] for t in api.typeIterate(): te = t.get_type_expression() @@ -154,7 +154,7 @@ class PrintGlxDispatchFunctions(glX_proto_common.glx_print_proto): if t_size > 1 and t.glx_name: t_name = "GL" + t.name - self.type_map[ t_name ] = t.glx_name + self.type_map[t_name] = t.glx_name if t.glx_name not in already_done: real_name = self.real_types[t_size] @@ -167,7 +167,7 @@ class PrintGlxDispatchFunctions(glX_proto_common.glx_print_proto): print ' return x.ret;' print '}' print '' - already_done.append( t.glx_name ) + already_done.append(t.glx_name) for bits in [16, 32, 64]: print 'static void *' @@ -191,13 +191,13 @@ class PrintGlxDispatchFunctions(glX_proto_common.glx_print_proto): if self.do_swap and (element_size != 1): if param.is_array(): - real_name = self.real_types[ element_size ] + real_name = self.real_types[element_size] - swap_func = self.swap_name( element_size ) + swap_func = self.swap_name(element_size) return ' (%-8s)%s( (%s *) (pc + %2s), %s )' % (t, swap_func, real_name, o, param.count) else: t_name = param.get_base_type_string() - return ' (%-8s)bswap_%-7s( pc + %2s )' % (t, self.type_map[ t_name ], o) + return ' (%-8s)bswap_%-7s( pc + %2s )' % (t, self.type_map[t_name], o) else: if param.is_array(): return ' (%-8s)(pc + %2u)' % (t, o) @@ -219,7 +219,7 @@ class PrintGlxDispatchFunctions(glX_proto_common.glx_print_proto): else: location = self.fetch_param(param) - list.append( '%s %s' % (indent, location) ) + list.append('%s %s' % (indent, location)) print '%s %s%s%s(%s);' % (indent, retval_assign, prefix, f.name, string.join(list, ',\n')) @@ -250,7 +250,7 @@ class PrintGlxDispatchFunctions(glX_proto_common.glx_print_proto): type_string = param.type_string() if param.is_image(): - offset = f.offset_of( param.name ) + offset = f.offset_of(param.name) print '%s %s const %s = (%s) (%s(pc + %s));' % (indent, type_string, param.name, type_string, cond, offset) @@ -308,10 +308,10 @@ class PrintGlxDispatchFunctions(glX_proto_common.glx_print_proto): # case for glCallLists. if type_size == 1: - x = [] - x.append( [1, ['BYTE', 'UNSIGNED_BYTE', '2_BYTES', '3_BYTES', '4_BYTES']] ) - x.append( [2, ['SHORT', 'UNSIGNED_SHORT']] ) - x.append( [4, ['INT', 'UNSIGNED_INT', 'FLOAT']] ) + x = [] + x.append([1, ['BYTE', 'UNSIGNED_BYTE', '2_BYTES', '3_BYTES', '4_BYTES']]) + x.append([2, ['SHORT', 'UNSIGNED_SHORT']]) + x.append([4, ['INT', 'UNSIGNED_INT', 'FLOAT']]) print ' switch(%s) {' % (param.count_parameter_list[0]) for sub in x: @@ -392,7 +392,7 @@ class PrintGlxDispatchFunctions(glX_proto_common.glx_print_proto): if param.count_parameter_list: print ' const GLuint compsize = %s;' % (self.size_call(f, 1)) print ' %s answerBuffer[200];' % (answer_type) - print ' %s %s = __glXGetAnswerBuffer(cl, compsize%s, answerBuffer, sizeof(answerBuffer), %u);' % (param.type_string(), param.name, size_scale, type_size ) + print ' %s %s = __glXGetAnswerBuffer(cl, compsize%s, answerBuffer, sizeof(answerBuffer), %u);' % (param.type_string(), param.name, size_scale, type_size) answer_string = param.name answer_count = "compsize" @@ -426,7 +426,7 @@ class PrintGlxDispatchFunctions(glX_proto_common.glx_print_proto): type_size = (param.size() / c) if type_size > 1: - swap_name = self.swap_name( type_size ) + swap_name = self.swap_name(type_size) print ' (void) %s( (uint%u_t *) %s, %s );' % (swap_name, 8 * type_size, param.name, answer_count) reply_func = '__glXSendReplySwap' diff --git a/src/mapi/glapi/gen/glX_proto_send.py b/src/mapi/glapi/gen/glX_proto_send.py index c4349ce2c0..8a656c5046 100644 --- a/src/mapi/glapi/gen/glX_proto_send.py +++ b/src/mapi/glapi/gen/glX_proto_send.py @@ -105,7 +105,7 @@ class glx_pixel_function_stub(glX_XML.glx_function): for _p in func.parameterIterator(): p = copy.copy(_p) self.parameters.append(p) - self.parameters_by_name[ p.name ] = p + self.parameters_by_name[p.name] = p if p.is_image(): self.images.append(p) @@ -126,7 +126,7 @@ class glx_pixel_function_stub(glX_XML.glx_function): pad = copy.copy(p) pad.name = pad_name self.parameters.append(pad) - self.parameters_by_name[ pad.name ] = pad + self.parameters_by_name[pad.name] = pad self.return_type = func.return_type @@ -156,7 +156,7 @@ class PrintGlxProtoStubs(glX_proto_common.glx_print_proto): def __init__(self): glX_proto_common.glx_print_proto.__init__(self) self.name = "glX_proto_send.py (from Mesa)" - self.license = license.bsd_license_template % ( "(C) Copyright IBM Corporation 2004, 2005", "IBM") + self.license = license.bsd_license_template % ("(C) Copyright IBM Corporation 2004, 2005", "IBM") self.last_category = "" self.generic_sizes = [3, 4, 6, 8, 12, 16, 24, 32] @@ -335,11 +335,11 @@ class PrintGlxProtoStubs(glX_proto_common.glx_print_proto): if do_it: [h, n] = hash_pixel_function(func) - self.pixel_stubs[ func.name ] = n + self.pixel_stubs[func.name] = n if h not in generated_stubs: generated_stubs.append(h) - fake_func = glx_pixel_function_stub( func, n ) + fake_func = glx_pixel_function_stub(func, n) self.printFunction(fake_func, fake_func.name) self.printFunction(func, func.name) @@ -470,18 +470,18 @@ class PrintGlxProtoStubs(glX_proto_common.glx_print_proto): if p.is_padding: print '(void) memset((void *)(%s + %u), 0, %s);' \ - % (pc, p.offset + adjust, p.size_string() ) + % (pc, p.offset + adjust, p.size_string()) elif not extra_offset: print '(void) memcpy((void *)(%s + %u), (void *)(%s), %s);' \ - % (pc, p.offset + adjust, src_ptr, p.size_string() ) + % (pc, p.offset + adjust, src_ptr, p.size_string()) else: print '(void) memcpy((void *)(%s + %u + %s), (void *)(%s), %s);' \ - % (pc, p.offset + adjust, extra_offset, src_ptr, p.size_string() ) + % (pc, p.offset + adjust, extra_offset, src_ptr, p.size_string()) def common_emit_args(self, f, pc, adjust, skip_vla): extra_offset = None - for p in f.parameterIterateGlxSend( not skip_vla ): + for p in f.parameterIterateGlxSend(not skip_vla): if p.name != f.img_reset: self.common_emit_one_arg(p, pc, adjust, extra_offset) @@ -520,7 +520,7 @@ class PrintGlxProtoStubs(glX_proto_common.glx_print_proto): if param.is_padding: print '(void) memset((void *)(%s + %u), 0, %s);' \ - % (pc, (param.offset - 4) + adjust, param.size_string() ) + % (pc, (param.offset - 4) + adjust, param.size_string()) if param.img_null_flag: if large: @@ -546,7 +546,7 @@ class PrintGlxProtoStubs(glX_proto_common.glx_print_proto): print '__glXSendLargeImage(gc, compsize, %s, %s, %s, %s, %s, %s, %s, %s, %s);' % (dim_str, width, height, depth, param.img_format, param.img_type, param.name, pcPtr, pixHeaderPtr) - def large_emit_begin(self, f, op_name = None): + def large_emit_begin(self, f, op_name=None): if not op_name: op_name = f.opcode_real_name() @@ -596,7 +596,7 @@ class PrintGlxProtoStubs(glX_proto_common.glx_print_proto): condition_list = [] for p in f.parameterIterateCounters(): - condition_list.append( "%s >= 0" % (p.name) ) + condition_list.append("%s >= 0" % (p.name)) # 'counter' parameters cannot be negative print " if (%s < 0) {" % p.name print " __glXSetError(gc, GL_INVALID_VALUE);" @@ -607,7 +607,7 @@ class PrintGlxProtoStubs(glX_proto_common.glx_print_proto): print " }" if skip_condition: - condition_list.append( skip_condition ) + condition_list.append(skip_condition) if len( condition_list ) > 0: if len( condition_list ) > 1: @@ -636,7 +636,7 @@ class PrintGlxProtoStubs(glX_proto_common.glx_print_proto): print ' (void) __glXFlushRenderBuffer(gc, gc->pc);' xcb_name = 'xcb_glx%s' % convertStringForXCB(name) - iparams=[] + iparams = [] extra_iparams = [] output = None for p in f.parameterIterator(): @@ -651,7 +651,7 @@ class PrintGlxProtoStubs(glX_proto_common.glx_print_proto): # Hardcode this in. lsb_first param (apparently always GL_FALSE) # also present in GetPolygonStipple, but taken care of above. - if xcb_name == "xcb_glx_read_pixels": + if xcb_name == "xcb_glx_read_pixels": extra_iparams.append("0") else: iparams.append(p.name) @@ -782,7 +782,7 @@ class PrintGlxProtoStubs(glX_proto_common.glx_print_proto): print ' return%s;' % (return_name) def printPixelFunction(self, f): - if self.pixel_stubs.has_key( f.name ): + if self.pixel_stubs.has_key(f.name): # Normally gl_function::get_parameter_string could be # used. However, this call needs to have the missing # dimensions (e.g., a fake height value for @@ -801,7 +801,7 @@ class PrintGlxProtoStubs(glX_proto_common.glx_print_proto): if f.pad_after(param): p_string += ", 1" - print ' %s(%s, %u%s );' % (self.pixel_stubs[f.name] , f.opcode_name(), dim, p_string) + print ' %s(%s, %u%s );' % (self.pixel_stubs[f.name], f.opcode_name(), dim, p_string) return if self.common_func_print_just_start(f, None): @@ -822,7 +822,7 @@ class PrintGlxProtoStubs(glX_proto_common.glx_print_proto): print 'emit_header(gc->pc, %s, cmdlen);' % (opcode) - self.pixel_emit_args( f, "gc->pc", 0 ) + self.pixel_emit_args(f, "gc->pc", 0) print 'gc->pc += cmdlen;' print 'if (gc->pc > gc->limit) { (void) __glXFlushRenderBuffer(gc, gc->pc); }' @@ -975,7 +975,7 @@ class PrintGlxProtoInit_c(gl_XML.gl_print_base): preamble = None if func.is_abi(): - print ' table[{offset}] = (_glapi_proc) __indirect_gl{name};'.format(name = func.name, offset = func.offset) + print ' table[{offset}] = (_glapi_proc) __indirect_gl{name};'.format(name=func.name, offset=func.offset) else: print ' o = _glapi_get_proc_offset("gl{0}");'.format(func.name) print ' assert(o > 0);' @@ -1086,7 +1086,7 @@ def main(): printer.debug = args.debug api = gl_XML.parse_GL_API(args.filename, glX_XML.glx_item_factory()) - printer.Print( api ) + printer.Print(api) if __name__ == '__main__': diff --git a/src/mapi/glapi/gen/glX_proto_size.py b/src/mapi/glapi/gen/glX_proto_size.py index 0f505a272a..d49929421d 100644 --- a/src/mapi/glapi/gen/glX_proto_size.py +++ b/src/mapi/glapi/gen/glX_proto_size.py @@ -51,7 +51,7 @@ class glx_enum_function(object): # "count" is indexed by count values. Each element of count # is a list of index to "enums" that have that number of - # associated data elements. For example, [4] = + # associated data elements. For example, [4] = # {GL_AMBIENT, GL_DIFFUSE, GL_SPECULAR, GL_EMISSION, # GL_AMBIENT_AND_DIFFUSE} (the enum names are used here, # but the actual hexadecimal values would be in the array). @@ -70,27 +70,27 @@ class glx_enum_function(object): mode_set = 0 for enum_name in enum_dict: - e = enum_dict[ enum_name ] + e = enum_dict[enum_name] - if e.functions.has_key( match_name ): - [count, mode] = e.functions[ match_name ] + if e.functions.has_key(match_name): + [count, mode] = e.functions[match_name] if mode_set and mode != self.mode: raise RuntimeError("Not all enums for %s have the same mode." % (func_name)) self.mode = mode - if self.enums.has_key( e.value ): - if e.name not in self.enums[ e.value ]: - self.enums[ e.value ].append( e ) + if self.enums.has_key(e.value): + if e.name not in self.enums[e.value]: + self.enums[e.value].append(e) else: - if not self.count.has_key( count ): - self.count[ count ] = [] + if not self.count.has_key(count): + self.count[count] = [] - self.enums[ e.value ] = [ e ] - self.count[ count ].append( e.value ) + self.enums[e.value] = [e] + self.count[count].append(e.value) - def signature( self ): + def signature(self): if self.sig == None: self.sig = "" for i in self.count: @@ -103,7 +103,7 @@ class glx_enum_function(object): return self.sig - def is_set( self ): + def is_set(self): return self.mode def PrintUsingTable(self): @@ -160,7 +160,7 @@ class glx_enum_function(object): for e in self.count[c]: i = e & mask enum_obj = self.enums[e][0] - masked_enums[i] = '0x%04x /* %s */' % (e, enum_obj.name ) + masked_enums[i] = '0x%04x /* %s */' % (e, enum_obj.name) masked_count[i] = c print ' static const GLushort a[%u] = {' % (mask + 1) @@ -181,8 +181,7 @@ class glx_enum_function(object): return 0 def PrintUsingSwitch(self, name): - """Emit the body of the __gl*_size function using a - switch-statement.""" + """Emit the body of the __gl*_size function using a switch-statement.""" print ' switch( e ) {' @@ -199,7 +198,7 @@ class glx_enum_function(object): list = {} for enum_obj in self.enums[e]: - list[ enum_obj.priority() ] = enum_obj.name + list[enum_obj.priority()] = enum_obj.name keys = list.keys() keys.sort() @@ -237,7 +236,7 @@ class glx_server_enum_function(glx_enum_function): self.function = func - def signature( self ): + def signature(self): if self.sig == None: sig = glx_enum_function.signature(self) @@ -251,26 +250,26 @@ class glx_server_enum_function(glx_enum_function): def Print(self, name, printer): f = self.function - printer.common_func_print_just_header( f ) + printer.common_func_print_just_header(f) fixup = [] foo = {} for param_name in f.count_parameter_list: - o = f.offset_of( param_name ) + o = f.offset_of(param_name) foo[o] = param_name for param_name in f.counter_list: - o = f.offset_of( param_name ) + o = f.offset_of(param_name) foo[o] = param_name keys = foo.keys() keys.sort() for o in keys: - p = f.parameters_by_name[ foo[o] ] + p = f.parameters_by_name[foo[o]] printer.common_emit_one_arg(p, "pc", 0) - fixup.append( p.name ) + fixup.append(p.name) print ' GLsizei compsize;' print '' @@ -294,7 +293,7 @@ class PrintGlxSizeStubs_common(gl_XML.gl_print_base): gl_XML.gl_print_base.__init__(self) self.name = "glX_proto_size.py (from Mesa)" - self.license = license.bsd_license_template % ( "(C) Copyright IBM Corporation 2004", "IBM") + self.license = license.bsd_license_template % ("(C) Copyright IBM Corporation 2004", "IBM") self.emit_set = ((which_functions & PrintGlxSizeStubs_common.do_set) != 0) self.emit_get = ((which_functions & PrintGlxSizeStubs_common.do_get) != 0) @@ -339,17 +338,17 @@ class PrintGlxSizeStubs_c(PrintGlxSizeStubs_common): aliases = [] for func in api.functionIterateGlx(): - ef = glx_enum_function( func.name, api.enums_by_name ) + ef = glx_enum_function(func.name, api.enums_by_name) if len(ef.enums) == 0: continue if (ef.is_set() and self.emit_set) or (not ef.is_set() and self.emit_get): sig = ef.signature() - if enum_sigs.has_key( sig ): - aliases.append( [func.name, enum_sigs[ sig ]] ) + if enum_sigs.has_key(sig): + aliases.append([func.name, enum_sigs[sig]]) else: - enum_sigs[ sig ] = func.name - ef.Print( func.name ) + enum_sigs[sig] = func.name + ef.Print(func.name) for [alias_name, real_name] in aliases: print 'ALIAS( %s, %s )' % (alias_name, real_name) @@ -375,7 +374,7 @@ class PrintGlxSizeStubs_h(PrintGlxSizeStubs_common): def printBody(self, api): for func in api.functionIterateGlx(): - ef = glx_enum_function( func.name, api.enums_by_name ) + ef = glx_enum_function(func.name, api.enums_by_name) if len(ef.enums) == 0: continue @@ -393,7 +392,7 @@ class PrintGlxReqSize_common(gl_XML.gl_print_base): gl_XML.gl_print_base.__init__(self) self.name = "glX_proto_size.py (from Mesa)" - self.license = license.bsd_license_template % ( "(C) Copyright IBM Corporation 2005", "IBM") + self.license = license.bsd_license_template % ("(C) Copyright IBM Corporation 2005", "IBM") class PrintGlxReqSize_h(PrintGlxReqSize_common): @@ -459,16 +458,16 @@ class PrintGlxReqSize_c(PrintGlxReqSize_common): for func in api.functionIterateGlx(): if not func.has_variable_size_request(): continue - ef = glx_server_enum_function( func, api.enums_by_name ) + ef = glx_server_enum_function(func, api.enums_by_name) if len(ef.enums) == 0: continue sig = ef.signature() if not enum_functions.has_key(func.name): - enum_functions[ func.name ] = sig + enum_functions[func.name] = sig - if not enum_sigs.has_key( sig ): - enum_sigs[ sig ] = ef + if not enum_sigs.has_key(sig): + enum_sigs[sig] = ef for func in api.functionIterateGlx(): # Even though server-handcode fuctions are on "the @@ -483,12 +482,12 @@ class PrintGlxReqSize_c(PrintGlxReqSize_common): if enum_functions.has_key(func.name): sig = enum_functions[func.name] - ef = enum_sigs[ sig ] + ef = enum_sigs[sig] if ef.name != func.name: - aliases.append( [func.name, ef.name] ) + aliases.append([func.name, ef.name]) else: - ef.Print( func.name, self ) + ef.Print(func.name, self) elif func.images: self.printPixelFunction(func) @@ -522,7 +521,7 @@ class PrintGlxReqSize_c(PrintGlxReqSize_common): def printPixelFunction(self, f): self.common_func_print_just_header(f) - f.offset_of( f.parameters[0].name ) + f.offset_of(f.parameters[0].name) [dim, w, h, d, junk] = f.get_images()[0].get_dimensions() print ' GLint row_length = * (GLint *)(pc + 4);' @@ -544,7 +543,7 @@ class PrintGlxReqSize_c(PrintGlxReqSize_common): for p in f.parameterIterateGlxSend(): if p.name in [w, h, d, img.img_format, img.img_type, img.img_target]: self.common_emit_one_arg(p, "pc", 0) - fixup.append( p.name ) + fixup.append(p.name) print '' @@ -556,7 +555,7 @@ class PrintGlxReqSize_c(PrintGlxReqSize_common): print ' return 0;' print '' - print ' return __glXImageSize(%s, %s, %s, %s, %s, %s,' % (img.img_format, img.img_type, img.img_target, w, h, d ) + print ' return __glXImageSize(%s, %s, %s, %s, %s, %s,' % (img.img_format, img.img_type, img.img_target, w, h, d) print ' image_height, row_length, skip_images,' print ' skip_rows, alignment);' print '}' @@ -579,8 +578,8 @@ class PrintGlxReqSize_c(PrintGlxReqSize_common): for p in f.parameterIterateGlxSend(): if p.is_counter: - fixup.append( p.name ) - params.append( p ) + fixup.append(p.name) + params.append(p) elif p.counter: s = p.size() if s == 0: s = 1 diff --git a/src/mapi/glapi/gen/glX_server_table.py b/src/mapi/glapi/gen/glX_server_table.py index b88c5e336b..9d5542649d 100644 --- a/src/mapi/glapi/gen/glX_server_table.py +++ b/src/mapi/glapi/gen/glX_server_table.py @@ -338,7 +338,7 @@ class PrintGlxDispatchTables(glX_proto_common.glx_print_proto): def __init__(self): gl_XML.gl_print_base.__init__(self) self.name = "glX_server_table.py (from Mesa)" - self.license = license.bsd_license_template % ( "(C) Copyright IBM Corporation 2005, 2006", "IBM") + self.license = license.bsd_license_template % ("(C) Copyright IBM Corporation 2005, 2006", "IBM") self.rop_functions = function_table("Render", 1) self.sop_functions = function_table("Single", 0) diff --git a/src/mapi/glapi/gen/gl_XML.py b/src/mapi/glapi/gen/gl_XML.py index 8477341c92..b1f8eccd34 100644 --- a/src/mapi/glapi/gen/gl_XML.py +++ b/src/mapi/glapi/gen/gl_XML.py @@ -39,13 +39,13 @@ import static_data import typeexpr -def parse_GL_API( file_name, factory = None ): +def parse_GL_API(file_name, factory=None): if not factory: factory = gl_item_factory() api = factory.create_api() - api.parse_file( file_name ) + api.parse_file(file_name) # After the XML has been processed, we need to go back and assign # dispatch offsets to the functions that request that their offsets @@ -60,7 +60,7 @@ def parse_GL_API( file_name, factory = None ): return api -def is_attr_true( element, name, default = "false" ): +def is_attr_true(element, name, default="false"): """Read a name value from an element's attributes. The value read from the attribute list must be either 'true' or @@ -68,7 +68,7 @@ def is_attr_true( element, name, default = "false" ): value is 'true', non-zero will be returned. An exception will be raised for any other value.""" - value = element.get( name, default ) + value = element.get(name, default) if value == "true": return 1 elif value == "false": @@ -245,8 +245,8 @@ class gl_print_base(object): def real_function_name(element): - name = element.get( "name" ) - alias = element.get( "alias" ) + name = element.get("name") + alias = element.get("alias") if alias: return alias @@ -275,7 +275,7 @@ def classify_category(name, number): try: core_version = float(name) - except Exception,e: + except Exception, e: core_version = 0.0 if core_version > 0.0: @@ -304,9 +304,9 @@ def create_parameter_string(parameters, include_names): continue if include_names: - list.append( p.string() ) + list.append(p.string()) else: - list.append( p.type_string() ) + list.append(p.type_string()) if len(list) == 0: list = ["void"] @@ -316,23 +316,23 @@ def create_parameter_string(parameters, include_names): class gl_item(object): def __init__(self, element, context, category): self.context = context - self.name = element.get( "name" ) - self.category = real_category_name( category ) + self.name = element.get("name") + self.category = real_category_name(category) -class gl_type( gl_item ): +class gl_type(gl_item): def __init__(self, element, context, category): gl_item.__init__(self, element, context, category) - self.size = int( element.get( "size" ), 0 ) + self.size = int(element.get("size"), 0) - te = typeexpr.type_expression( None ) + te = typeexpr.type_expression(None) tn = typeexpr.type_node() - tn.size = int( element.get( "size" ), 0 ) - tn.integer = not is_attr_true( element, "float" ) - tn.unsigned = is_attr_true( element, "unsigned" ) - tn.pointer = is_attr_true( element, "pointer" ) + tn.size = int(element.get("size"), 0) + tn.integer = not is_attr_true(element, "float") + tn.unsigned = is_attr_true(element, "unsigned") + tn.pointer = is_attr_true(element, "pointer") tn.name = "GL" + self.name - te.set_base_type_node( tn ) + te.set_base_type_node(tn) self.type_expr = te @@ -341,18 +341,18 @@ class gl_type( gl_item ): return self.type_expr -class gl_enum( gl_item ): +class gl_enum(gl_item): def __init__(self, element, context, category): gl_item.__init__(self, element, context, category) - self.value = int( element.get( "value" ), 0 ) + self.value = int(element.get("value"), 0) - temp = element.get( "count" ) + temp = element.get("count") if not temp or temp == "?": self.default_count = -1 else: try: c = int(temp) - except Exception,e: + except Exception, e: raise RuntimeError('Invalid count value "%s" for enum "%s" in function "%s" when an integer was expected.' % (temp, self.name, n)) self.default_count = c @@ -370,16 +370,16 @@ class gl_enum( gl_item ): Vendor extension names are the lowest. """ - if self.name.endswith( "_BIT" ): + if self.name.endswith("_BIT"): bias = 1 else: bias = 0 - if self.category.startswith( "GL_VERSION_" ): + if self.category.startswith("GL_VERSION_"): priority = 0 - elif self.category.startswith( "GL_ARB_" ): + elif self.category.startswith("GL_ARB_"): priority = 2 - elif self.category.startswith( "GL_EXT_" ): + elif self.category.startswith("GL_EXT_"): priority = 4 else: priority = 6 @@ -389,14 +389,14 @@ class gl_enum( gl_item ): class gl_parameter(object): def __init__(self, element, context): - self.name = element.get( "name" ) + self.name = element.get("name") - ts = element.get( "type" ) - self.type_expr = typeexpr.type_expression( ts, context ) + ts = element.get("type") + self.type_expr = typeexpr.type_expression(ts, context) - temp = element.get( "variable_param" ) + temp = element.get("variable_param") if temp: - self.count_parameter_list = temp.split( ' ' ) + self.count_parameter_list = temp.split(' ') else: self.count_parameter_list = [] @@ -405,17 +405,17 @@ class gl_parameter(object): # statement will throw an exception, and the except block will # take over. - c = element.get( "count" ) - try: + c = element.get("count") + try: count = int(c) self.count = count self.counter = None - except Exception,e: + except Exception, e: count = 1 self.count = 0 self.counter = c - self.count_scale = int(element.get( "count_scale", "1" )) + self.count_scale = int(element.get("count_scale", "1")) elements = (count * self.count_scale) if elements == 1: @@ -424,13 +424,13 @@ class gl_parameter(object): #if ts == "GLdouble": # print '/* stack size -> %s = %u (before)*/' % (self.name, self.type_expr.get_stack_size()) # print '/* # elements = %u */' % (elements) - self.type_expr.set_elements( elements ) + self.type_expr.set_elements(elements) #if ts == "GLdouble": # print '/* stack size -> %s = %u (after) */' % (self.name, self.type_expr.get_stack_size()) - self.is_client_only = is_attr_true( element, 'client_only' ) - self.is_counter = is_attr_true( element, 'counter' ) - self.is_output = is_attr_true( element, 'output' ) + self.is_client_only = is_attr_true(element, 'client_only') + self.is_counter = is_attr_true(element, 'counter') + self.is_output = is_attr_true(element, 'output') # Pixel data has special parameters. @@ -448,11 +448,11 @@ class gl_parameter(object): self.img_type = element.get('img_type') self.img_target = element.get('img_target') - self.img_pad_dimensions = is_attr_true( element, 'img_pad_dimensions' ) - self.img_null_flag = is_attr_true( element, 'img_null_flag' ) - self.img_send_null = is_attr_true( element, 'img_send_null' ) + self.img_pad_dimensions = is_attr_true(element, 'img_pad_dimensions') + self.img_null_flag = is_attr_true(element, 'img_null_flag') + self.img_send_null = is_attr_true(element, 'img_send_null') - self.is_padding = is_attr_true( element, 'padding' ) + self.is_padding = is_attr_true(element, 'padding') def compatible(self, other): return 1 @@ -494,7 +494,7 @@ class gl_parameter(object): def get_dimensions(self): if not self.width: - return [ 0, "0", "0", "0", "0" ] + return [0, "0", "0", "0", "0"] dim = 1 w = self.width @@ -514,7 +514,7 @@ class gl_parameter(object): dim = 4 e = self.extent - return [ dim, w, h, d, e ] + return [dim, w, h, d, e] def get_stack_size(self): return self.type_expr.get_stack_size() @@ -532,20 +532,20 @@ class gl_parameter(object): return c - def size_string(self, use_parens = 1): + def size_string(self, use_parens=1): s = self.size() if self.counter or self.count_parameter_list: - list = [ "compsize" ] + list = ["compsize"] if self.counter and self.count_parameter_list: - list.append( self.counter ) + list.append(self.counter) elif self.counter: - list = [ self.counter ] + list = [self.counter] if s > 1: - list.append( str(s) ) + list.append(str(s)) - if len(list) > 1 and use_parens : + if len(list) > 1 and use_parens: return "(%s)" % (string.join(list, " * ")) else: return string.join(list, " * ") @@ -562,7 +562,7 @@ class gl_parameter(object): return self.type_expr.format_string() -class gl_function( gl_item ): +class gl_function(gl_item): def __init__(self, element, context): self.context = context self.name = None @@ -610,16 +610,16 @@ class gl_function( gl_item ): self.entry_point_parameters = {} - self.process_element( element ) + self.process_element(element) def process_element(self, element): - name = element.get( "name" ) - alias = element.get( "alias" ) + name = element.get("name") + alias = element.get("alias") if name in static_data.functions: self.static_entry_points.append(name) - self.entry_points.append( name ) + self.entry_points.append(name) self.entry_point_api_map[name] = {} for api in ('es1', 'es2'): @@ -673,23 +673,23 @@ class gl_function( gl_item ): return_type = "void" for child in element.getchildren(): if child.tag == "return": - return_type = child.get( "type", "void" ) + return_type = child.get("type", "void") elif child.tag == "param": param = self.context.factory.create_parameter(child, self.context) - parameters.append( param ) + parameters.append(param) if self.initialized: if self.return_type != return_type: - raise RuntimeError( "Return type changed in %s. Was %s, now %s." % (name, self.return_type, return_type)) + raise RuntimeError("Return type changed in %s. Was %s, now %s." % (name, self.return_type, return_type)) if len(parameters) != len(self.parameters): - raise RuntimeError( "Parameter count mismatch in %s. Was %d, now %d." % (name, len(self.parameters), len(parameters))) + raise RuntimeError("Parameter count mismatch in %s. Was %d, now %d." % (name, len(self.parameters), len(parameters))) for j in range(0, len(parameters)): p1 = parameters[j] p2 = self.parameters[j] - if not p1.compatible( p2 ): - raise RuntimeError( 'Parameter type mismatch in %s. "%s" was "%s", now "%s".' % (name, p2.name, p2.type_expr.original_string, p1.type_expr.original_string)) + if not p1.compatible(p2): + raise RuntimeError('Parameter type mismatch in %s. "%s" was "%s", now "%s".' % (name, p2.name, p2.type_expr.original_string, p1.type_expr.original_string)) if true_name == name or not self.initialized: self.return_type = return_type @@ -697,7 +697,7 @@ class gl_function( gl_item ): for param in self.parameters: if param.is_image(): - self.images.append( param ) + self.images.append(param) if element.getchildren(): self.initialized = 1 @@ -732,19 +732,19 @@ class gl_function( gl_item ): """Return potentially empty list of input images.""" return self.images - def parameterIterator(self, name = None): + def parameterIterator(self, name=None): if name is not None: return self.entry_point_parameters[name].__iter__() else: return self.parameters.__iter__() - def get_parameter_string(self, entrypoint = None): + def get_parameter_string(self, entrypoint=None): if entrypoint: - params = self.entry_point_parameters[ entrypoint ] + params = self.entry_point_parameters[entrypoint] else: params = self.parameters - return create_parameter_string( params, 1 ) + return create_parameter_string(params, 1) def get_called_parameter_string(self): p_string = "" @@ -776,7 +776,7 @@ class gl_function( gl_item ): else: return "_dispatch_stub_%u" % (self.offset) - def entry_points_for_api_version(self, api, version = None): + def entry_points_for_api_version(self, api, version=None): """Return a list of the entry point names for this function which are supported in the given API (and optionally, version). @@ -837,7 +837,7 @@ class gl_api(object): self.functions_by_name = functions_by_name - def filter_functions_by_api(self, api, version = None): + def filter_functions_by_api(self, api, version=None): """Filter out entry points not in the given API (or optionally, not in the given version of the given API). """ @@ -851,7 +851,7 @@ class gl_api(object): self.functions_by_name = functions_by_name def parse_file(self, file_name): - doc = ET.parse( file_name ) + doc = ET.parse(file_name) self.process_element(file_name, doc) def process_element(self, file_name, doc): @@ -862,46 +862,46 @@ class gl_api(object): def process_OpenGLAPI(self, file_name, element): for child in element.getchildren(): if child.tag == "category": - self.process_category( child ) + self.process_category(child) elif child.tag == "OpenGLAPI": - self.process_OpenGLAPI( file_name, child ) + self.process_OpenGLAPI(file_name, child) elif child.tag == '{http://www.w3.org/2001/XInclude}include': href = child.get('href') href = os.path.join(os.path.dirname(file_name), href) self.parse_file(href) def process_category(self, cat): - cat_name = cat.get( "name" ) - cat_number = cat.get( "number" ) + cat_name = cat.get("name") + cat_number = cat.get("number") [cat_type, key] = classify_category(cat_name, cat_number) self.categories[cat_type][key] = [cat_name, cat_number] for child in cat.getchildren(): if child.tag == "function": - func_name = real_function_name( child ) + func_name = real_function_name(child) - temp_name = child.get( "name" ) - self.category_dict[ temp_name ] = [cat_name, cat_number] + temp_name = child.get("name") + self.category_dict[temp_name] = [cat_name, cat_number] - if self.functions_by_name.has_key( func_name ): - func = self.functions_by_name[ func_name ] - func.process_element( child ) + if self.functions_by_name.has_key(func_name): + func = self.functions_by_name[func_name] + func.process_element(child) else: - func = self.factory.create_function( child, self ) - self.functions_by_name[ func_name ] = func + func = self.factory.create_function(child, self) + self.functions_by_name[func_name] = func if func.offset >= self.next_offset: self.next_offset = func.offset + 1 elif child.tag == "enum": - enum = self.factory.create_enum( child, self, cat_name ) - self.enums_by_name[ enum.name ] = enum + enum = self.factory.create_enum(child, self, cat_name) + self.enums_by_name[enum.name] = enum elif child.tag == "type": - t = self.factory.create_type( child, self, cat_name ) - self.types_by_name[ "GL" + t.name ] = t + t = self.factory.create_type(child, self, cat_name) + self.types_by_name["GL" + t.name] = t - def functionIterateByCategory(self, cat = None): + def functionIterateByCategory(self, cat=None): """Iterate over functions by category. If cat is None, all known functions are iterated in category @@ -946,7 +946,7 @@ class gl_api(object): temp = [None for i in range(0, max_offset + 1)] for func in self.functions_by_name.itervalues(): if func.offset != -1: - temp[ func.offset ] = func + temp[func.offset] = func list = [] for i in range(0, max_offset + 1): @@ -964,7 +964,7 @@ class gl_api(object): list = [] for enum in keys: - list.append( self.enums_by_name[ enum ] ) + list.append(self.enums_by_name[enum]) return list.__iter__() @@ -986,7 +986,7 @@ class gl_api(object): return list.__iter__() - def get_category_for_name( self, name ): + def get_category_for_name(self, name): if self.category_dict.has_key(name): return self.category_dict[name] else: @@ -995,9 +995,9 @@ class gl_api(object): def typeIterate(self): return self.types_by_name.itervalues() - def find_type( self, type_name ): + def find_type(self, type_name): if type_name in self.types_by_name: - return self.types_by_name[ type_name ].type_expr + return self.types_by_name[type_name].type_expr else: print "Unable to find base type matching \"%s\"." % (type_name) return None diff --git a/src/mapi/glapi/gen/gl_apitemp.py b/src/mapi/glapi/gen/gl_apitemp.py index ceede1195d..4b0a37ed11 100644 --- a/src/mapi/glapi/gen/gl_apitemp.py +++ b/src/mapi/glapi/gen/gl_apitemp.py @@ -47,15 +47,15 @@ class PrintGlOffsets(gl_XML.gl_print_base): self.es = es - self.undef_list.append( "KEYWORD1" ) - self.undef_list.append( "KEYWORD1_ALT" ) - self.undef_list.append( "KEYWORD2" ) - self.undef_list.append( "NAME" ) - self.undef_list.append( "DISPATCH" ) - self.undef_list.append( "RETURN_DISPATCH" ) - self.undef_list.append( "DISPATCH_TABLE_NAME" ) - self.undef_list.append( "UNUSED_TABLE_NAME" ) - self.undef_list.append( "TABLE_ENTRY" ) + self.undef_list.append("KEYWORD1") + self.undef_list.append("KEYWORD1_ALT") + self.undef_list.append("KEYWORD2") + self.undef_list.append("NAME") + self.undef_list.append("DISPATCH") + self.undef_list.append("RETURN_DISPATCH") + self.undef_list.append("DISPATCH_TABLE_NAME") + self.undef_list.append("UNUSED_TABLE_NAME") + self.undef_list.append("TABLE_ENTRY") def printFunction(self, f, name): p_string = "" @@ -120,7 +120,7 @@ class PrintGlOffsets(gl_XML.gl_print_base): def printRealHeader(self): print '' - self.printVisibility( "HIDDEN", "hidden" ) + self.printVisibility("HIDDEN", "hidden") print textwrap.dedent("""\ /* * This file is a template which generates the OpenGL API entry point diff --git a/src/mapi/glapi/gen/gl_enums.py b/src/mapi/glapi/gen/gl_enums.py index b2bda99897..28b40aa64a 100644 --- a/src/mapi/glapi/gen/gl_enums.py +++ b/src/mapi/glapi/gen/gl_enums.py @@ -4,7 +4,7 @@ # © Copyright Zack Rusin 2005. All Rights Reserved. # Copyright © 2015 Intel Corporation # Copyright © 2015 Broadcom Corporation -# +# # Permission is hereby granted, free of charge, to any person obtaining a # copy of this software and associated documentation files (the "Software"), # to deal in the Software without restriction, including without limitation @@ -163,7 +163,7 @@ class PrintGlEnums(gl_XML.gl_print_base): print "'%c'," % ch, print "'\\0'," - string_offsets[ enum ] = i + string_offsets[enum] = i i += len(name) + 1 print '};' diff --git a/src/mapi/glapi/gen/gl_procs.py b/src/mapi/glapi/gen/gl_procs.py index eb4e84604b..6c85bb88fa 100644 --- a/src/mapi/glapi/gen/gl_procs.py +++ b/src/mapi/glapi/gen/gl_procs.py @@ -98,7 +98,7 @@ class PrintGlProcs(gl_XML.gl_print_base): for n in func.entry_points: if n != func.name: name = func.dispatch_name() - self.printFunctionString( n ) + self.printFunctionString(n) if func.has_different_protocol(n): alt_name = "gl" + func.static_glx_name(n) diff --git a/src/mapi/glapi/gen/gl_x86-64_asm.py b/src/mapi/glapi/gen/gl_x86-64_asm.py index d0e8f8eaf8..acbeb2fe8e 100644 --- a/src/mapi/glapi/gen/gl_x86-64_asm.py +++ b/src/mapi/glapi/gen/gl_x86-64_asm.py @@ -61,7 +61,7 @@ def save_all_regs(registers): print '\tsubq\t$%u, %%rsp' % (adjust_stack) for [reg, stack_offset] in registers: - save_reg( reg, stack_offset, adjust_stack ) + save_reg(reg, stack_offset, adjust_stack) def restore_all_regs(registers): @@ -194,17 +194,17 @@ class PrintGenericStubs(gl_XML.gl_print_base): if p.is_pointer() or (type_name != "GLfloat" and type_name != "GLdouble"): if int_class < 6: - registers.append( [int_parameters[int_class], stack_offset] ) + registers.append([int_parameters[int_class], stack_offset]) int_class += 1 stack_offset += 8 else: if sse_class < 8: - registers.append( ["%%xmm%u" % (sse_class), stack_offset] ) + registers.append(["%%xmm%u" % (sse_class), stack_offset]) sse_class += 1 stack_offset += 8 if ((int_class & 1) == 0) and (sse_class == 0): - registers.append( ["%rbp", 0] ) + registers.append(["%rbp", 0]) name = f.dispatch_name() diff --git a/src/mapi/glapi/gen/static_data.py b/src/mapi/glapi/gen/static_data.py index 34ed57c33f..9d7156a3e6 100644 --- a/src/mapi/glapi/gen/static_data.py +++ b/src/mapi/glapi/gen/static_data.py @@ -437,1240 +437,1240 @@ offsets = { } functions = [ - "Accum", - "ActiveTexture", - "ActiveTextureARB", - "AlphaFunc", - "AlphaFuncx", - "AreTexturesResident", - "AreTexturesResidentEXT", - "ArrayElement", - "ArrayElementEXT", - "AttachObjectARB", - "AttachShader", - "Begin", - "BeginConditionalRender", - "BeginConditionalRenderNV", - "BeginQuery", - "BeginQueryARB", - "BeginQueryIndexed", - "BeginTransformFeedback", - "BindAttribLocation", - "BindAttribLocationARB", - "BindBuffer", - "BindBufferARB", - "BindBufferBase", - "BindBufferRange", - "BindBuffersBase", - "BindBuffersRange", - "BindFragDataLocation", - "BindFragDataLocationEXT", - "BindFragDataLocationIndexed", - "BindFramebuffer", - "BindFramebufferEXT", - "BindImageTexture", - "BindImageTextures", - "BindProgramARB", - "BindRenderbuffer", - "BindRenderbufferEXT", - "BindSampler", - "BindSamplers", - "BindTexture", - "BindTextureEXT", - "BindTextures", - "BindTransformFeedback", - "BindVertexArray", - "BindVertexBuffer", - "BindVertexBuffers", - "Bitmap", - "BlendColor", - "BlendColorEXT", - "BlendEquation", - "BlendEquationEXT", - "BlendEquationiARB", - "BlendEquationSeparate", - "BlendEquationSeparateiARB", - "BlendFunc", - "BlendFunciARB", - "BlendFuncSeparate", - "BlendFuncSeparateEXT", - "BlendFuncSeparateiARB", - "BlitFramebuffer", - "BufferData", - "BufferDataARB", - "BufferStorage", - "BufferSubData", - "BufferSubDataARB", - "CallList", - "CallLists", - "CheckFramebufferStatus", - "CheckFramebufferStatusEXT", - "ClampColor", - "ClampColorARB", - "Clear", - "ClearAccum", - "ClearBufferData", - "ClearBufferfi", - "ClearBufferfv", - "ClearBufferiv", - "ClearBufferSubData", - "ClearBufferuiv", - "ClearColor", - "ClearColorIiEXT", - "ClearColorIuiEXT", - "ClearColorx", - "ClearDepth", - "ClearDepthf", - "ClearDepthx", - "ClearIndex", - "ClearStencil", - "ClearTexImage", - "ClearTexSubImage", - "ClientActiveTexture", - "ClientActiveTextureARB", - "ClientWaitSync", - "ClipPlane", - "ClipPlanef", - "ClipPlanex", - "Color3b", - "Color3bv", - "Color3d", - "Color3dv", - "Color3f", - "Color3fv", - "Color3i", - "Color3iv", - "Color3s", - "Color3sv", - "Color3ub", - "Color3ubv", - "Color3ui", - "Color3uiv", - "Color3us", - "Color3usv", - "Color4b", - "Color4bv", - "Color4d", - "Color4dv", - "Color4f", - "Color4fv", - "Color4i", - "Color4iv", - "Color4s", - "Color4sv", - "Color4ub", - "Color4ubv", - "Color4ui", - "Color4uiv", - "Color4us", - "Color4usv", - "Color4x", - "ColorMask", - "ColorMaski", - "ColorMaskIndexedEXT", - "ColorMaterial", - "ColorP3ui", - "ColorP3uiv", - "ColorP4ui", - "ColorP4uiv", - "ColorPointer", - "ColorPointerEXT", - "ColorSubTable", - "ColorTable", - "ColorTableParameterfv", - "ColorTableParameteriv", - "CompileShader", - "CompileShaderARB", - "CompressedTexImage1D", - "CompressedTexImage1DARB", - "CompressedTexImage2D", - "CompressedTexImage2DARB", - "CompressedTexImage3D", - "CompressedTexImage3DARB", - "CompressedTexSubImage1D", - "CompressedTexSubImage1DARB", - "CompressedTexSubImage2D", - "CompressedTexSubImage2DARB", - "CompressedTexSubImage3D", - "CompressedTexSubImage3DARB", - "ConvolutionFilter1D", - "ConvolutionFilter2D", - "ConvolutionParameterf", - "ConvolutionParameterfv", - "ConvolutionParameteri", - "ConvolutionParameteriv", - "CopyBufferSubData", - "CopyColorSubTable", - "CopyColorTable", - "CopyConvolutionFilter1D", - "CopyConvolutionFilter2D", - "CopyImageSubData", - "CopyPixels", - "CopyTexImage1D", - "CopyTexImage2D", - "CopyTexSubImage1D", - "CopyTexSubImage2D", - "CopyTexSubImage3D", - "CopyTexSubImage3DEXT", - "CreateProgram", - "CreateProgramObjectARB", - "CreateShader", - "CreateShaderObjectARB", - "CullFace", - "DebugMessageCallback", - "DebugMessageCallbackARB", - "DebugMessageControl", - "DebugMessageControlARB", - "DebugMessageInsert", - "DebugMessageInsertARB", - "DeleteBuffers", - "DeleteBuffersARB", - "DeleteFramebuffers", - "DeleteFramebuffersEXT", - "DeleteLists", - "DeleteObjectARB", - "DeleteProgram", - "DeleteProgramsARB", - "DeleteQueries", - "DeleteQueriesARB", - "DeleteRenderbuffers", - "DeleteRenderbuffersEXT", - "DeleteSamplers", - "DeleteShader", - "DeleteSync", - "DeleteTextures", - "DeleteTexturesEXT", - "DeleteTransformFeedbacks", - "DeleteVertexArrays", - "DepthFunc", - "DepthMask", - "DepthRange", - "DepthRangeArrayv", - "DepthRangef", - "DepthRangeIndexed", - "DepthRangex", - "DetachObjectARB", - "DetachShader", - "Disable", - "DisableClientState", - "Disablei", - "DisableIndexedEXT", - "DisableVertexAttribArray", - "DisableVertexAttribArrayARB", - "DispatchCompute", - "DispatchComputeIndirect", - "DrawArrays", - "DrawArraysEXT", - "DrawArraysIndirect", - "DrawArraysInstanced", - "DrawArraysInstancedARB", - "DrawArraysInstancedBaseInstance", - "DrawArraysInstancedEXT", - "DrawBuffer", - "DrawBuffers", - "DrawBuffersARB", - "DrawBuffersATI", - "DrawElements", - "DrawElementsBaseVertex", - "DrawElementsIndirect", - "DrawElementsInstanced", - "DrawElementsInstancedARB", - "DrawElementsInstancedBaseInstance", - "DrawElementsInstancedBaseVertex", - "DrawElementsInstancedBaseVertexBaseInstance", - "DrawElementsInstancedEXT", - "DrawPixels", - "DrawRangeElements", - "DrawRangeElementsBaseVertex", - "DrawRangeElementsEXT", - "DrawTransformFeedback", - "DrawTransformFeedbackInstanced", - "DrawTransformFeedbackStream", - "DrawTransformFeedbackStreamInstanced", - "EdgeFlag", - "EdgeFlagPointer", - "EdgeFlagPointerEXT", - "EdgeFlagv", - "Enable", - "EnableClientState", - "Enablei", - "EnableIndexedEXT", - "EnableVertexAttribArray", - "EnableVertexAttribArrayARB", - "End", - "EndConditionalRender", - "EndConditionalRenderNV", - "EndList", - "EndQuery", - "EndQueryARB", - "EndQueryIndexed", - "EndTransformFeedback", - "EvalCoord1d", - "EvalCoord1dv", - "EvalCoord1f", - "EvalCoord1fv", - "EvalCoord2d", - "EvalCoord2dv", - "EvalCoord2f", - "EvalCoord2fv", - "EvalMesh1", - "EvalMesh2", - "EvalPoint1", - "EvalPoint2", - "FeedbackBuffer", - "FenceSync", - "Finish", - "Flush", - "FlushMappedBufferRange", - "FogCoordd", - "FogCoorddEXT", - "FogCoorddv", - "FogCoorddvEXT", - "FogCoordf", - "FogCoordfEXT", - "FogCoordfv", - "FogCoordfvEXT", - "FogCoordPointer", - "FogCoordPointerEXT", - "Fogf", - "Fogfv", - "Fogi", - "Fogiv", - "Fogx", - "Fogxv", - "FramebufferRenderbuffer", - "FramebufferRenderbufferEXT", - "FramebufferTexture", - "FramebufferTexture1D", - "FramebufferTexture1DEXT", - "FramebufferTexture2D", - "FramebufferTexture2DEXT", - "FramebufferTexture3D", - "FramebufferTexture3DEXT", - "FramebufferTextureARB", - "FramebufferTextureLayer", - "FramebufferTextureLayerARB", - "FramebufferTextureLayerEXT", - "FrontFace", - "Frustum", - "Frustumf", - "Frustumx", - "GenBuffers", - "GenBuffersARB", - "GenerateMipmap", - "GenerateMipmapEXT", - "GenFramebuffers", - "GenFramebuffersEXT", - "GenLists", - "GenProgramsARB", - "GenQueries", - "GenQueriesARB", - "GenRenderbuffers", - "GenRenderbuffersEXT", - "GenSamplers", - "GenTextures", - "GenTexturesEXT", - "GenTransformFeedbacks", - "GenVertexArrays", - "GetActiveAtomicCounterBufferiv", - "GetActiveAttrib", - "GetActiveAttribARB", - "GetActiveUniform", - "GetActiveUniformARB", - "GetActiveUniformBlockiv", - "GetActiveUniformBlockName", - "GetActiveUniformName", - "GetActiveUniformsiv", - "GetAttachedObjectsARB", - "GetAttachedShaders", - "GetAttribLocation", - "GetAttribLocationARB", - "GetBooleanIndexedvEXT", - "GetBooleani_v", - "GetBooleanv", - "GetBufferParameteri64v", - "GetBufferParameteriv", - "GetBufferParameterivARB", - "GetBufferPointerv", - "GetBufferPointervARB", - "GetBufferSubData", - "GetBufferSubDataARB", - "GetClipPlane", - "GetClipPlanef", - "GetClipPlanex", - "GetColorTable", - "GetColorTableParameterfv", - "GetColorTableParameteriv", - "GetCompressedTexImage", - "GetCompressedTexImageARB", - "GetConvolutionFilter", - "GetConvolutionParameterfv", - "GetConvolutionParameteriv", - "GetDebugMessageLog", - "GetDebugMessageLogARB", - "GetDoublei_v", - "GetDoublev", - "GetError", - "GetFixedv", - "GetFloati_v", - "GetFloatv", - "GetFragDataIndex", - "GetFragDataLocation", - "GetFragDataLocationEXT", - "GetFramebufferAttachmentParameteriv", - "GetFramebufferAttachmentParameterivEXT", - "GetGraphicsResetStatusARB", - "GetHandleARB", - "GetHistogram", - "GetHistogramParameterfv", - "GetHistogramParameteriv", - "GetInfoLogARB", - "GetInteger64i_v", - "GetInteger64v", - "GetIntegerIndexedvEXT", - "GetIntegeri_v", - "GetIntegerv", - "GetLightfv", - "GetLightiv", - "GetLightxv", - "GetMapdv", - "GetMapfv", - "GetMapiv", - "GetMaterialfv", - "GetMaterialiv", - "GetMaterialxv", - "GetMinmax", - "GetMinmaxParameterfv", - "GetMinmaxParameteriv", - "GetMultisamplefv", - "GetnColorTableARB", - "GetnCompressedTexImageARB", - "GetnConvolutionFilterARB", - "GetnHistogramARB", - "GetnMapdvARB", - "GetnMapfvARB", - "GetnMapivARB", - "GetnMinmaxARB", - "GetnPixelMapfvARB", - "GetnPixelMapuivARB", - "GetnPixelMapusvARB", - "GetnPolygonStippleARB", - "GetnSeparableFilterARB", - "GetnTexImageARB", - "GetnUniformdvARB", - "GetnUniformfvARB", - "GetnUniformivARB", - "GetnUniformuivARB", - "GetObjectLabel", - "GetObjectParameterfvARB", - "GetObjectParameterivARB", - "GetObjectPtrLabel", - "GetPixelMapfv", - "GetPixelMapuiv", - "GetPixelMapusv", - "GetPointerv", - "GetPointervEXT", - "GetPolygonStipple", - "GetProgramBinary", - "GetProgramEnvParameterdvARB", - "GetProgramEnvParameterfvARB", - "GetProgramInfoLog", - "GetProgramiv", - "GetProgramivARB", - "GetProgramLocalParameterdvARB", - "GetProgramLocalParameterfvARB", - "GetProgramStringARB", - "GetQueryIndexediv", - "GetQueryiv", - "GetQueryivARB", - "GetQueryObjectiv", - "GetQueryObjectivARB", - "GetQueryObjectuiv", - "GetQueryObjectuivARB", - "GetRenderbufferParameteriv", - "GetRenderbufferParameterivEXT", - "GetSamplerParameterfv", - "GetSamplerParameterIiv", - "GetSamplerParameterIuiv", - "GetSamplerParameteriv", - "GetSeparableFilter", - "GetShaderInfoLog", - "GetShaderiv", - "GetShaderPrecisionFormat", - "GetShaderSource", - "GetShaderSourceARB", - "GetString", - "GetStringi", - "GetSynciv", - "GetTexEnvfv", - "GetTexEnviv", - "GetTexEnvxv", - "GetTexGendv", - "GetTexGenfv", - "GetTexGeniv", - "GetTexImage", - "GetTexLevelParameterfv", - "GetTexLevelParameteriv", - "GetTexParameterfv", - "GetTexParameterIiv", - "GetTexParameterIivEXT", - "GetTexParameterIuiv", - "GetTexParameterIuivEXT", - "GetTexParameteriv", - "GetTexParameterxv", - "GetTransformFeedbackVarying", - "GetUniformBlockIndex", - "GetUniformfv", - "GetUniformfvARB", - "GetUniformIndices", - "GetUniformiv", - "GetUniformivARB", - "GetUniformLocation", - "GetUniformLocationARB", - "GetUniformuiv", - "GetUniformuivEXT", - "GetVertexAttribdv", - "GetVertexAttribdvARB", - "GetVertexAttribfv", - "GetVertexAttribfvARB", - "GetVertexAttribIiv", - "GetVertexAttribIivEXT", - "GetVertexAttribIuiv", - "GetVertexAttribIuivEXT", - "GetVertexAttribiv", - "GetVertexAttribivARB", - "GetVertexAttribPointerv", - "GetVertexAttribPointervARB", - "Hint", - "Histogram", - "Indexd", - "Indexdv", - "Indexf", - "Indexfv", - "Indexi", - "Indexiv", - "IndexMask", - "IndexPointer", - "IndexPointerEXT", - "Indexs", - "Indexsv", - "Indexub", - "Indexubv", - "InitNames", - "InterleavedArrays", - "InvalidateBufferData", - "InvalidateBufferSubData", - "InvalidateFramebuffer", - "InvalidateSubFramebuffer", - "InvalidateTexImage", - "InvalidateTexSubImage", - "IsBuffer", - "IsBufferARB", - "IsEnabled", - "IsEnabledi", - "IsEnabledIndexedEXT", - "IsFramebuffer", - "IsFramebufferEXT", - "IsList", - "IsProgram", - "IsProgramARB", - "IsQuery", - "IsQueryARB", - "IsRenderbuffer", - "IsRenderbufferEXT", - "IsSampler", - "IsShader", - "IsSync", - "IsTexture", - "IsTextureEXT", - "IsTransformFeedback", - "IsVertexArray", - "Lightf", - "Lightfv", - "Lighti", - "Lightiv", - "LightModelf", - "LightModelfv", - "LightModeli", - "LightModeliv", - "LightModelx", - "LightModelxv", - "Lightx", - "Lightxv", - "LineStipple", - "LineWidth", - "LineWidthx", - "LinkProgram", - "LinkProgramARB", - "ListBase", - "LoadIdentity", - "LoadMatrixd", - "LoadMatrixf", - "LoadMatrixx", - "LoadName", - "LoadTransposeMatrixd", - "LoadTransposeMatrixdARB", - "LoadTransposeMatrixf", - "LoadTransposeMatrixfARB", - "LockArraysEXT", - "LogicOp", - "Map1d", - "Map1f", - "Map2d", - "Map2f", - "MapBuffer", - "MapBufferARB", - "MapBufferRange", - "MapGrid1d", - "MapGrid1f", - "MapGrid2d", - "MapGrid2f", - "Materialf", - "Materialfv", - "Materiali", - "Materialiv", - "Materialx", - "Materialxv", - "MatrixMode", - "MemoryBarrier", - "Minmax", - "MinSampleShading", - "MinSampleShadingARB", - "MultiDrawArrays", - "MultiDrawArraysEXT", - "MultiDrawArraysIndirect", - "MultiDrawElements", - "MultiDrawElementsBaseVertex", - "MultiDrawElementsEXT", - "MultiDrawElementsIndirect", - "MultiTexCoord1d", - "MultiTexCoord1dARB", - "MultiTexCoord1dv", - "MultiTexCoord1dvARB", - "MultiTexCoord1f", - "MultiTexCoord1fARB", - "MultiTexCoord1fv", - "MultiTexCoord1fvARB", - "MultiTexCoord1i", - "MultiTexCoord1iARB", - "MultiTexCoord1iv", - "MultiTexCoord1ivARB", - "MultiTexCoord1s", - "MultiTexCoord1sARB", - "MultiTexCoord1sv", - "MultiTexCoord1svARB", - "MultiTexCoord2d", - "MultiTexCoord2dARB", - "MultiTexCoord2dv", - "MultiTexCoord2dvARB", - "MultiTexCoord2f", - "MultiTexCoord2fARB", - "MultiTexCoord2fv", - "MultiTexCoord2fvARB", - "MultiTexCoord2i", - "MultiTexCoord2iARB", - "MultiTexCoord2iv", - "MultiTexCoord2ivARB", - "MultiTexCoord2s", - "MultiTexCoord2sARB", - "MultiTexCoord2sv", - "MultiTexCoord2svARB", - "MultiTexCoord3d", - "MultiTexCoord3dARB", - "MultiTexCoord3dv", - "MultiTexCoord3dvARB", - "MultiTexCoord3f", - "MultiTexCoord3fARB", - "MultiTexCoord3fv", - "MultiTexCoord3fvARB", - "MultiTexCoord3i", - "MultiTexCoord3iARB", - "MultiTexCoord3iv", - "MultiTexCoord3ivARB", - "MultiTexCoord3s", - "MultiTexCoord3sARB", - "MultiTexCoord3sv", - "MultiTexCoord3svARB", - "MultiTexCoord4d", - "MultiTexCoord4dARB", - "MultiTexCoord4dv", - "MultiTexCoord4dvARB", - "MultiTexCoord4f", - "MultiTexCoord4fARB", - "MultiTexCoord4fv", - "MultiTexCoord4fvARB", - "MultiTexCoord4i", - "MultiTexCoord4iARB", - "MultiTexCoord4iv", - "MultiTexCoord4ivARB", - "MultiTexCoord4s", - "MultiTexCoord4sARB", - "MultiTexCoord4sv", - "MultiTexCoord4svARB", - "MultiTexCoord4x", - "MultiTexCoordP1ui", - "MultiTexCoordP1uiv", - "MultiTexCoordP2ui", - "MultiTexCoordP2uiv", - "MultiTexCoordP3ui", - "MultiTexCoordP3uiv", - "MultiTexCoordP4ui", - "MultiTexCoordP4uiv", - "MultMatrixd", - "MultMatrixf", - "MultMatrixx", - "MultTransposeMatrixd", - "MultTransposeMatrixdARB", - "MultTransposeMatrixf", - "MultTransposeMatrixfARB", - "NewList", - "Normal3b", - "Normal3bv", - "Normal3d", - "Normal3dv", - "Normal3f", - "Normal3fv", - "Normal3i", - "Normal3iv", - "Normal3s", - "Normal3sv", - "Normal3x", - "NormalP3ui", - "NormalP3uiv", - "NormalPointer", - "NormalPointerEXT", - "ObjectLabel", - "ObjectPtrLabel", - "Ortho", - "Orthof", - "Orthox", - "PassThrough", - "PauseTransformFeedback", - "PixelMapfv", - "PixelMapuiv", - "PixelMapusv", - "PixelStoref", - "PixelStorei", - "PixelTransferf", - "PixelTransferi", - "PixelZoom", - "PointParameterf", - "PointParameterfARB", - "PointParameterfEXT", - "PointParameterfv", - "PointParameterfvARB", - "PointParameterfvEXT", - "PointParameteri", - "PointParameteriv", - "PointParameterx", - "PointParameterxv", - "PointSize", - "PointSizePointerOES", - "PointSizex", - "PolygonMode", - "PolygonOffset", - "PolygonOffsetx", - "PolygonStipple", - "PopAttrib", - "PopClientAttrib", - "PopDebugGroup", - "PopMatrix", - "PopName", - "PrimitiveRestartIndex", - "PrimitiveRestartIndexNV", - "PrimitiveRestartNV", - "PrioritizeTextures", - "PrioritizeTexturesEXT", - "ProgramBinary", - "ProgramEnvParameter4dARB", - "ProgramEnvParameter4dvARB", - "ProgramEnvParameter4fARB", - "ProgramEnvParameter4fvARB", - "ProgramLocalParameter4dARB", - "ProgramLocalParameter4dvARB", - "ProgramLocalParameter4fARB", - "ProgramLocalParameter4fvARB", - "ProgramParameteri", - "ProgramParameteriARB", - "ProgramStringARB", - "ProvokingVertex", - "ProvokingVertexEXT", - "PushAttrib", - "PushClientAttrib", - "PushDebugGroup", - "PushMatrix", - "PushName", - "RasterPos2d", - "RasterPos2dv", - "RasterPos2f", - "RasterPos2fv", - "RasterPos2i", - "RasterPos2iv", - "RasterPos2s", - "RasterPos2sv", - "RasterPos3d", - "RasterPos3dv", - "RasterPos3f", - "RasterPos3fv", - "RasterPos3i", - "RasterPos3iv", - "RasterPos3s", - "RasterPos3sv", - "RasterPos4d", - "RasterPos4dv", - "RasterPos4f", - "RasterPos4fv", - "RasterPos4i", - "RasterPos4iv", - "RasterPos4s", - "RasterPos4sv", - "ReadBuffer", - "ReadnPixelsARB", - "ReadPixels", - "Rectd", - "Rectdv", - "Rectf", - "Rectfv", - "Recti", - "Rectiv", - "Rects", - "Rectsv", - "ReleaseShaderCompiler", - "RenderbufferStorage", - "RenderbufferStorageEXT", - "RenderbufferStorageMultisample", - "RenderbufferStorageMultisampleEXT", - "RenderMode", - "ResetHistogram", - "ResetMinmax", - "ResumeTransformFeedback", - "Rotated", - "Rotatef", - "Rotatex", - "SampleCoverage", - "SampleCoverageARB", - "SampleCoveragex", - "SampleMaski", - "SamplerParameterf", - "SamplerParameterfv", - "SamplerParameteri", - "SamplerParameterIiv", - "SamplerParameterIuiv", - "SamplerParameteriv", - "Scaled", - "Scalef", - "Scalex", - "Scissor", - "ScissorArrayv", - "ScissorIndexed", - "ScissorIndexedv", - "SecondaryColor3b", - "SecondaryColor3bEXT", - "SecondaryColor3bv", - "SecondaryColor3bvEXT", - "SecondaryColor3d", - "SecondaryColor3dEXT", - "SecondaryColor3dv", - "SecondaryColor3dvEXT", - "SecondaryColor3f", - "SecondaryColor3fEXT", - "SecondaryColor3fv", - "SecondaryColor3fvEXT", - "SecondaryColor3i", - "SecondaryColor3iEXT", - "SecondaryColor3iv", - "SecondaryColor3ivEXT", - "SecondaryColor3s", - "SecondaryColor3sEXT", - "SecondaryColor3sv", - "SecondaryColor3svEXT", - "SecondaryColor3ub", - "SecondaryColor3ubEXT", - "SecondaryColor3ubv", - "SecondaryColor3ubvEXT", - "SecondaryColor3ui", - "SecondaryColor3uiEXT", - "SecondaryColor3uiv", - "SecondaryColor3uivEXT", - "SecondaryColor3us", - "SecondaryColor3usEXT", - "SecondaryColor3usv", - "SecondaryColor3usvEXT", - "SecondaryColorP3ui", - "SecondaryColorP3uiv", - "SecondaryColorPointer", - "SecondaryColorPointerEXT", - "SelectBuffer", - "SeparableFilter2D", - "ShadeModel", - "ShaderBinary", - "ShaderSource", - "ShaderSourceARB", - "StencilFunc", - "StencilFuncSeparate", - "StencilMask", - "StencilMaskSeparate", - "StencilOp", - "StencilOpSeparate", - "TexBuffer", - "TexBufferARB", - "TexBufferRange", - "TexCoord1d", - "TexCoord1dv", - "TexCoord1f", - "TexCoord1fv", - "TexCoord1i", - "TexCoord1iv", - "TexCoord1s", - "TexCoord1sv", - "TexCoord2d", - "TexCoord2dv", - "TexCoord2f", - "TexCoord2fv", - "TexCoord2i", - "TexCoord2iv", - "TexCoord2s", - "TexCoord2sv", - "TexCoord3d", - "TexCoord3dv", - "TexCoord3f", - "TexCoord3fv", - "TexCoord3i", - "TexCoord3iv", - "TexCoord3s", - "TexCoord3sv", - "TexCoord4d", - "TexCoord4dv", - "TexCoord4f", - "TexCoord4fv", - "TexCoord4i", - "TexCoord4iv", - "TexCoord4s", - "TexCoord4sv", - "TexCoordP1ui", - "TexCoordP1uiv", - "TexCoordP2ui", - "TexCoordP2uiv", - "TexCoordP3ui", - "TexCoordP3uiv", - "TexCoordP4ui", - "TexCoordP4uiv", - "TexCoordPointer", - "TexCoordPointerEXT", - "TexEnvf", - "TexEnvfv", - "TexEnvi", - "TexEnviv", - "TexEnvx", - "TexEnvxv", - "TexGend", - "TexGendv", - "TexGenf", - "TexGenfv", - "TexGeni", - "TexGeniv", - "TexImage1D", - "TexImage2D", - "TexImage2DMultisample", - "TexImage3D", - "TexImage3DEXT", - "TexImage3DMultisample", - "TexParameterf", - "TexParameterfv", - "TexParameteri", - "TexParameterIiv", - "TexParameterIivEXT", - "TexParameterIuiv", - "TexParameterIuivEXT", - "TexParameteriv", - "TexParameterx", - "TexParameterxv", - "TexStorage1D", - "TexStorage2D", - "TexStorage2DMultisample", - "TexStorage3D", - "TexStorage3DMultisample", - "TexSubImage1D", - "TexSubImage2D", - "TexSubImage3D", - "TexSubImage3DEXT", - "TextureBarrierNV", - "TextureStorage1DEXT", - "TextureStorage2DEXT", - "TextureStorage3DEXT", - "TextureView", - "TransformFeedbackVaryings", - "Translated", - "Translatef", - "Translatex", - "Uniform1f", - "Uniform1fARB", - "Uniform1fv", - "Uniform1fvARB", - "Uniform1i", - "Uniform1iARB", - "Uniform1iv", - "Uniform1ivARB", - "Uniform1ui", - "Uniform1uiEXT", - "Uniform1uiv", - "Uniform1uivEXT", - "Uniform2f", - "Uniform2fARB", - "Uniform2fv", - "Uniform2fvARB", - "Uniform2i", - "Uniform2iARB", - "Uniform2iv", - "Uniform2ivARB", - "Uniform2ui", - "Uniform2uiEXT", - "Uniform2uiv", - "Uniform2uivEXT", - "Uniform3f", - "Uniform3fARB", - "Uniform3fv", - "Uniform3fvARB", - "Uniform3i", - "Uniform3iARB", - "Uniform3iv", - "Uniform3ivARB", - "Uniform3ui", - "Uniform3uiEXT", - "Uniform3uiv", - "Uniform3uivEXT", - "Uniform4f", - "Uniform4fARB", - "Uniform4fv", - "Uniform4fvARB", - "Uniform4i", - "Uniform4iARB", - "Uniform4iv", - "Uniform4ivARB", - "Uniform4ui", - "Uniform4uiEXT", - "Uniform4uiv", - "Uniform4uivEXT", - "UniformBlockBinding", - "UniformMatrix2fv", - "UniformMatrix2fvARB", - "UniformMatrix2x3fv", - "UniformMatrix2x4fv", - "UniformMatrix3fv", - "UniformMatrix3fvARB", - "UniformMatrix3x2fv", - "UniformMatrix3x4fv", - "UniformMatrix4fv", - "UniformMatrix4fvARB", - "UniformMatrix4x2fv", - "UniformMatrix4x3fv", - "UnlockArraysEXT", - "UnmapBuffer", - "UnmapBufferARB", - "UseProgram", - "UseProgramObjectARB", - "ValidateProgram", - "ValidateProgramARB", - "Vertex2d", - "Vertex2dv", - "Vertex2f", - "Vertex2fv", - "Vertex2i", - "Vertex2iv", - "Vertex2s", - "Vertex2sv", - "Vertex3d", - "Vertex3dv", - "Vertex3f", - "Vertex3fv", - "Vertex3i", - "Vertex3iv", - "Vertex3s", - "Vertex3sv", - "Vertex4d", - "Vertex4dv", - "Vertex4f", - "Vertex4fv", - "Vertex4i", - "Vertex4iv", - "Vertex4s", - "Vertex4sv", - "VertexAttrib1d", - "VertexAttrib1dARB", - "VertexAttrib1dv", - "VertexAttrib1dvARB", - "VertexAttrib1f", - "VertexAttrib1fARB", - "VertexAttrib1fv", - "VertexAttrib1fvARB", - "VertexAttrib1s", - "VertexAttrib1sARB", - "VertexAttrib1sv", - "VertexAttrib1svARB", - "VertexAttrib2d", - "VertexAttrib2dARB", - "VertexAttrib2dv", - "VertexAttrib2dvARB", - "VertexAttrib2f", - "VertexAttrib2fARB", - "VertexAttrib2fv", - "VertexAttrib2fvARB", - "VertexAttrib2s", - "VertexAttrib2sARB", - "VertexAttrib2sv", - "VertexAttrib2svARB", - "VertexAttrib3d", - "VertexAttrib3dARB", - "VertexAttrib3dv", - "VertexAttrib3dvARB", - "VertexAttrib3f", - "VertexAttrib3fARB", - "VertexAttrib3fv", - "VertexAttrib3fvARB", - "VertexAttrib3s", - "VertexAttrib3sARB", - "VertexAttrib3sv", - "VertexAttrib3svARB", - "VertexAttrib4bv", - "VertexAttrib4bvARB", - "VertexAttrib4d", - "VertexAttrib4dARB", - "VertexAttrib4dv", - "VertexAttrib4dvARB", - "VertexAttrib4f", - "VertexAttrib4fARB", - "VertexAttrib4fv", - "VertexAttrib4fvARB", - "VertexAttrib4iv", - "VertexAttrib4ivARB", - "VertexAttrib4Nbv", - "VertexAttrib4NbvARB", - "VertexAttrib4Niv", - "VertexAttrib4NivARB", - "VertexAttrib4Nsv", - "VertexAttrib4NsvARB", - "VertexAttrib4Nub", - "VertexAttrib4NubARB", - "VertexAttrib4Nubv", - "VertexAttrib4NubvARB", - "VertexAttrib4Nuiv", - "VertexAttrib4NuivARB", - "VertexAttrib4Nusv", - "VertexAttrib4NusvARB", - "VertexAttrib4s", - "VertexAttrib4sARB", - "VertexAttrib4sv", - "VertexAttrib4svARB", - "VertexAttrib4ubv", - "VertexAttrib4ubvARB", - "VertexAttrib4uiv", - "VertexAttrib4uivARB", - "VertexAttrib4usv", - "VertexAttrib4usvARB", - "VertexAttribBinding", - "VertexAttribDivisor", - "VertexAttribDivisorARB", - "VertexAttribFormat", - "VertexAttribI1i", - "VertexAttribI1iEXT", - "VertexAttribI1iv", - "VertexAttribI1ivEXT", - "VertexAttribI1ui", - "VertexAttribI1uiEXT", - "VertexAttribI1uiv", - "VertexAttribI1uivEXT", - "VertexAttribI2i", - "VertexAttribI2iEXT", - "VertexAttribI2iv", - "VertexAttribI2ivEXT", - "VertexAttribI2ui", - "VertexAttribI2uiEXT", - "VertexAttribI2uiv", - "VertexAttribI2uivEXT", - "VertexAttribI3i", - "VertexAttribI3iEXT", - "VertexAttribI3iv", - "VertexAttribI3ivEXT", - "VertexAttribI3ui", - "VertexAttribI3uiEXT", - "VertexAttribI3uiv", - "VertexAttribI3uivEXT", - "VertexAttribI4bv", - "VertexAttribI4bvEXT", - "VertexAttribI4i", - "VertexAttribI4iEXT", - "VertexAttribI4iv", - "VertexAttribI4ivEXT", - "VertexAttribI4sv", - "VertexAttribI4svEXT", - "VertexAttribI4ubv", - "VertexAttribI4ubvEXT", - "VertexAttribI4ui", - "VertexAttribI4uiEXT", - "VertexAttribI4uiv", - "VertexAttribI4uivEXT", - "VertexAttribI4usv", - "VertexAttribI4usvEXT", - "VertexAttribIFormat", - "VertexAttribIPointer", - "VertexAttribIPointerEXT", - "VertexAttribLFormat", - "VertexAttribP1ui", - "VertexAttribP1uiv", - "VertexAttribP2ui", - "VertexAttribP2uiv", - "VertexAttribP3ui", - "VertexAttribP3uiv", - "VertexAttribP4ui", - "VertexAttribP4uiv", - "VertexAttribPointer", - "VertexAttribPointerARB", - "VertexBindingDivisor", - "VertexP2ui", - "VertexP2uiv", - "VertexP3ui", - "VertexP3uiv", - "VertexP4ui", - "VertexP4uiv", - "VertexPointer", - "VertexPointerEXT", - "Viewport", - "ViewportArrayv", - "ViewportIndexedf", - "ViewportIndexedfv", - "WaitSync", - "WindowPos2d", - "WindowPos2dARB", - "WindowPos2dv", - "WindowPos2dvARB", - "WindowPos2f", - "WindowPos2fARB", - "WindowPos2fv", - "WindowPos2fvARB", - "WindowPos2i", - "WindowPos2iARB", - "WindowPos2iv", - "WindowPos2ivARB", - "WindowPos2s", - "WindowPos2sARB", - "WindowPos2sv", - "WindowPos2svARB", - "WindowPos3d", - "WindowPos3dARB", - "WindowPos3dv", - "WindowPos3dvARB", - "WindowPos3f", - "WindowPos3fARB", - "WindowPos3fv", - "WindowPos3fvARB", - "WindowPos3i", - "WindowPos3iARB", - "WindowPos3iv", - "WindowPos3ivARB", - "WindowPos3s", - "WindowPos3sARB", - "WindowPos3sv", - "WindowPos3svARB", + "Accum", + "ActiveTexture", + "ActiveTextureARB", + "AlphaFunc", + "AlphaFuncx", + "AreTexturesResident", + "AreTexturesResidentEXT", + "ArrayElement", + "ArrayElementEXT", + "AttachObjectARB", + "AttachShader", + "Begin", + "BeginConditionalRender", + "BeginConditionalRenderNV", + "BeginQuery", + "BeginQueryARB", + "BeginQueryIndexed", + "BeginTransformFeedback", + "BindAttribLocation", + "BindAttribLocationARB", + "BindBuffer", + "BindBufferARB", + "BindBufferBase", + "BindBufferRange", + "BindBuffersBase", + "BindBuffersRange", + "BindFragDataLocation", + "BindFragDataLocationEXT", + "BindFragDataLocationIndexed", + "BindFramebuffer", + "BindFramebufferEXT", + "BindImageTexture", + "BindImageTextures", + "BindProgramARB", + "BindRenderbuffer", + "BindRenderbufferEXT", + "BindSampler", + "BindSamplers", + "BindTexture", + "BindTextureEXT", + "BindTextures", + "BindTransformFeedback", + "BindVertexArray", + "BindVertexBuffer", + "BindVertexBuffers", + "Bitmap", + "BlendColor", + "BlendColorEXT", + "BlendEquation", + "BlendEquationEXT", + "BlendEquationiARB", + "BlendEquationSeparate", + "BlendEquationSeparateiARB", + "BlendFunc", + "BlendFunciARB", + "BlendFuncSeparate", + "BlendFuncSeparateEXT", + "BlendFuncSeparateiARB", + "BlitFramebuffer", + "BufferData", + "BufferDataARB", + "BufferStorage", + "BufferSubData", + "BufferSubDataARB", + "CallList", + "CallLists", + "CheckFramebufferStatus", + "CheckFramebufferStatusEXT", + "ClampColor", + "ClampColorARB", + "Clear", + "ClearAccum", + "ClearBufferData", + "ClearBufferfi", + "ClearBufferfv", + "ClearBufferiv", + "ClearBufferSubData", + "ClearBufferuiv", + "ClearColor", + "ClearColorIiEXT", + "ClearColorIuiEXT", + "ClearColorx", + "ClearDepth", + "ClearDepthf", + "ClearDepthx", + "ClearIndex", + "ClearStencil", + "ClearTexImage", + "ClearTexSubImage", + "ClientActiveTexture", + "ClientActiveTextureARB", + "ClientWaitSync", + "ClipPlane", + "ClipPlanef", + "ClipPlanex", + "Color3b", + "Color3bv", + "Color3d", + "Color3dv", + "Color3f", + "Color3fv", + "Color3i", + "Color3iv", + "Color3s", + "Color3sv", + "Color3ub", + "Color3ubv", + "Color3ui", + "Color3uiv", + "Color3us", + "Color3usv", + "Color4b", + "Color4bv", + "Color4d", + "Color4dv", + "Color4f", + "Color4fv", + "Color4i", + "Color4iv", + "Color4s", + "Color4sv", + "Color4ub", + "Color4ubv", + "Color4ui", + "Color4uiv", + "Color4us", + "Color4usv", + "Color4x", + "ColorMask", + "ColorMaski", + "ColorMaskIndexedEXT", + "ColorMaterial", + "ColorP3ui", + "ColorP3uiv", + "ColorP4ui", + "ColorP4uiv", + "ColorPointer", + "ColorPointerEXT", + "ColorSubTable", + "ColorTable", + "ColorTableParameterfv", + "ColorTableParameteriv", + "CompileShader", + "CompileShaderARB", + "CompressedTexImage1D", + "CompressedTexImage1DARB", + "CompressedTexImage2D", + "CompressedTexImage2DARB", + "CompressedTexImage3D", + "CompressedTexImage3DARB", + "CompressedTexSubImage1D", + "CompressedTexSubImage1DARB", + "CompressedTexSubImage2D", + "CompressedTexSubImage2DARB", + "CompressedTexSubImage3D", + "CompressedTexSubImage3DARB", + "ConvolutionFilter1D", + "ConvolutionFilter2D", + "ConvolutionParameterf", + "ConvolutionParameterfv", + "ConvolutionParameteri", + "ConvolutionParameteriv", + "CopyBufferSubData", + "CopyColorSubTable", + "CopyColorTable", + "CopyConvolutionFilter1D", + "CopyConvolutionFilter2D", + "CopyImageSubData", + "CopyPixels", + "CopyTexImage1D", + "CopyTexImage2D", + "CopyTexSubImage1D", + "CopyTexSubImage2D", + "CopyTexSubImage3D", + "CopyTexSubImage3DEXT", + "CreateProgram", + "CreateProgramObjectARB", + "CreateShader", + "CreateShaderObjectARB", + "CullFace", + "DebugMessageCallback", + "DebugMessageCallbackARB", + "DebugMessageControl", + "DebugMessageControlARB", + "DebugMessageInsert", + "DebugMessageInsertARB", + "DeleteBuffers", + "DeleteBuffersARB", + "DeleteFramebuffers", + "DeleteFramebuffersEXT", + "DeleteLists", + "DeleteObjectARB", + "DeleteProgram", + "DeleteProgramsARB", + "DeleteQueries", + "DeleteQueriesARB", + "DeleteRenderbuffers", + "DeleteRenderbuffersEXT", + "DeleteSamplers", + "DeleteShader", + "DeleteSync", + "DeleteTextures", + "DeleteTexturesEXT", + "DeleteTransformFeedbacks", + "DeleteVertexArrays", + "DepthFunc", + "DepthMask", + "DepthRange", + "DepthRangeArrayv", + "DepthRangef", + "DepthRangeIndexed", + "DepthRangex", + "DetachObjectARB", + "DetachShader", + "Disable", + "DisableClientState", + "Disablei", + "DisableIndexedEXT", + "DisableVertexAttribArray", + "DisableVertexAttribArrayARB", + "DispatchCompute", + "DispatchComputeIndirect", + "DrawArrays", + "DrawArraysEXT", + "DrawArraysIndirect", + "DrawArraysInstanced", + "DrawArraysInstancedARB", + "DrawArraysInstancedBaseInstance", + "DrawArraysInstancedEXT", + "DrawBuffer", + "DrawBuffers", + "DrawBuffersARB", + "DrawBuffersATI", + "DrawElements", + "DrawElementsBaseVertex", + "DrawElementsIndirect", + "DrawElementsInstanced", + "DrawElementsInstancedARB", + "DrawElementsInstancedBaseInstance", + "DrawElementsInstancedBaseVertex", + "DrawElementsInstancedBaseVertexBaseInstance", + "DrawElementsInstancedEXT", + "DrawPixels", + "DrawRangeElements", + "DrawRangeElementsBaseVertex", + "DrawRangeElementsEXT", + "DrawTransformFeedback", + "DrawTransformFeedbackInstanced", + "DrawTransformFeedbackStream", + "DrawTransformFeedbackStreamInstanced", + "EdgeFlag", + "EdgeFlagPointer", + "EdgeFlagPointerEXT", + "EdgeFlagv", + "Enable", + "EnableClientState", + "Enablei", + "EnableIndexedEXT", + "EnableVertexAttribArray", + "EnableVertexAttribArrayARB", + "End", + "EndConditionalRender", + "EndConditionalRenderNV", + "EndList", + "EndQuery", + "EndQueryARB", + "EndQueryIndexed", + "EndTransformFeedback", + "EvalCoord1d", + "EvalCoord1dv", + "EvalCoord1f", + "EvalCoord1fv", + "EvalCoord2d", + "EvalCoord2dv", + "EvalCoord2f", + "EvalCoord2fv", + "EvalMesh1", + "EvalMesh2", + "EvalPoint1", + "EvalPoint2", + "FeedbackBuffer", + "FenceSync", + "Finish", + "Flush", + "FlushMappedBufferRange", + "FogCoordd", + "FogCoorddEXT", + "FogCoorddv", + "FogCoorddvEXT", + "FogCoordf", + "FogCoordfEXT", + "FogCoordfv", + "FogCoordfvEXT", + "FogCoordPointer", + "FogCoordPointerEXT", + "Fogf", + "Fogfv", + "Fogi", + "Fogiv", + "Fogx", + "Fogxv", + "FramebufferRenderbuffer", + "FramebufferRenderbufferEXT", + "FramebufferTexture", + "FramebufferTexture1D", + "FramebufferTexture1DEXT", + "FramebufferTexture2D", + "FramebufferTexture2DEXT", + "FramebufferTexture3D", + "FramebufferTexture3DEXT", + "FramebufferTextureARB", + "FramebufferTextureLayer", + "FramebufferTextureLayerARB", + "FramebufferTextureLayerEXT", + "FrontFace", + "Frustum", + "Frustumf", + "Frustumx", + "GenBuffers", + "GenBuffersARB", + "GenerateMipmap", + "GenerateMipmapEXT", + "GenFramebuffers", + "GenFramebuffersEXT", + "GenLists", + "GenProgramsARB", + "GenQueries", + "GenQueriesARB", + "GenRenderbuffers", + "GenRenderbuffersEXT", + "GenSamplers", + "GenTextures", + "GenTexturesEXT", + "GenTransformFeedbacks", + "GenVertexArrays", + "GetActiveAtomicCounterBufferiv", + "GetActiveAttrib", + "GetActiveAttribARB", + "GetActiveUniform", + "GetActiveUniformARB", + "GetActiveUniformBlockiv", + "GetActiveUniformBlockName", + "GetActiveUniformName", + "GetActiveUniformsiv", + "GetAttachedObjectsARB", + "GetAttachedShaders", + "GetAttribLocation", + "GetAttribLocationARB", + "GetBooleanIndexedvEXT", + "GetBooleani_v", + "GetBooleanv", + "GetBufferParameteri64v", + "GetBufferParameteriv", + "GetBufferParameterivARB", + "GetBufferPointerv", + "GetBufferPointervARB", + "GetBufferSubData", + "GetBufferSubDataARB", + "GetClipPlane", + "GetClipPlanef", + "GetClipPlanex", + "GetColorTable", + "GetColorTableParameterfv", + "GetColorTableParameteriv", + "GetCompressedTexImage", + "GetCompressedTexImageARB", + "GetConvolutionFilter", + "GetConvolutionParameterfv", + "GetConvolutionParameteriv", + "GetDebugMessageLog", + "GetDebugMessageLogARB", + "GetDoublei_v", + "GetDoublev", + "GetError", + "GetFixedv", + "GetFloati_v", + "GetFloatv", + "GetFragDataIndex", + "GetFragDataLocation", + "GetFragDataLocationEXT", + "GetFramebufferAttachmentParameteriv", + "GetFramebufferAttachmentParameterivEXT", + "GetGraphicsResetStatusARB", + "GetHandleARB", + "GetHistogram", + "GetHistogramParameterfv", + "GetHistogramParameteriv", + "GetInfoLogARB", + "GetInteger64i_v", + "GetInteger64v", + "GetIntegerIndexedvEXT", + "GetIntegeri_v", + "GetIntegerv", + "GetLightfv", + "GetLightiv", + "GetLightxv", + "GetMapdv", + "GetMapfv", + "GetMapiv", + "GetMaterialfv", + "GetMaterialiv", + "GetMaterialxv", + "GetMinmax", + "GetMinmaxParameterfv", + "GetMinmaxParameteriv", + "GetMultisamplefv", + "GetnColorTableARB", + "GetnCompressedTexImageARB", + "GetnConvolutionFilterARB", + "GetnHistogramARB", + "GetnMapdvARB", + "GetnMapfvARB", + "GetnMapivARB", + "GetnMinmaxARB", + "GetnPixelMapfvARB", + "GetnPixelMapuivARB", + "GetnPixelMapusvARB", + "GetnPolygonStippleARB", + "GetnSeparableFilterARB", + "GetnTexImageARB", + "GetnUniformdvARB", + "GetnUniformfvARB", + "GetnUniformivARB", + "GetnUniformuivARB", + "GetObjectLabel", + "GetObjectParameterfvARB", + "GetObjectParameterivARB", + "GetObjectPtrLabel", + "GetPixelMapfv", + "GetPixelMapuiv", + "GetPixelMapusv", + "GetPointerv", + "GetPointervEXT", + "GetPolygonStipple", + "GetProgramBinary", + "GetProgramEnvParameterdvARB", + "GetProgramEnvParameterfvARB", + "GetProgramInfoLog", + "GetProgramiv", + "GetProgramivARB", + "GetProgramLocalParameterdvARB", + "GetProgramLocalParameterfvARB", + "GetProgramStringARB", + "GetQueryIndexediv", + "GetQueryiv", + "GetQueryivARB", + "GetQueryObjectiv", + "GetQueryObjectivARB", + "GetQueryObjectuiv", + "GetQueryObjectuivARB", + "GetRenderbufferParameteriv", + "GetRenderbufferParameterivEXT", + "GetSamplerParameterfv", + "GetSamplerParameterIiv", + "GetSamplerParameterIuiv", + "GetSamplerParameteriv", + "GetSeparableFilter", + "GetShaderInfoLog", + "GetShaderiv", + "GetShaderPrecisionFormat", + "GetShaderSource", + "GetShaderSourceARB", + "GetString", + "GetStringi", + "GetSynciv", + "GetTexEnvfv", + "GetTexEnviv", + "GetTexEnvxv", + "GetTexGendv", + "GetTexGenfv", + "GetTexGeniv", + "GetTexImage", + "GetTexLevelParameterfv", + "GetTexLevelParameteriv", + "GetTexParameterfv", + "GetTexParameterIiv", + "GetTexParameterIivEXT", + "GetTexParameterIuiv", + "GetTexParameterIuivEXT", + "GetTexParameteriv", + "GetTexParameterxv", + "GetTransformFeedbackVarying", + "GetUniformBlockIndex", + "GetUniformfv", + "GetUniformfvARB", + "GetUniformIndices", + "GetUniformiv", + "GetUniformivARB", + "GetUniformLocation", + "GetUniformLocationARB", + "GetUniformuiv", + "GetUniformuivEXT", + "GetVertexAttribdv", + "GetVertexAttribdvARB", + "GetVertexAttribfv", + "GetVertexAttribfvARB", + "GetVertexAttribIiv", + "GetVertexAttribIivEXT", + "GetVertexAttribIuiv", + "GetVertexAttribIuivEXT", + "GetVertexAttribiv", + "GetVertexAttribivARB", + "GetVertexAttribPointerv", + "GetVertexAttribPointervARB", + "Hint", + "Histogram", + "Indexd", + "Indexdv", + "Indexf", + "Indexfv", + "Indexi", + "Indexiv", + "IndexMask", + "IndexPointer", + "IndexPointerEXT", + "Indexs", + "Indexsv", + "Indexub", + "Indexubv", + "InitNames", + "InterleavedArrays", + "InvalidateBufferData", + "InvalidateBufferSubData", + "InvalidateFramebuffer", + "InvalidateSubFramebuffer", + "InvalidateTexImage", + "InvalidateTexSubImage", + "IsBuffer", + "IsBufferARB", + "IsEnabled", + "IsEnabledi", + "IsEnabledIndexedEXT", + "IsFramebuffer", + "IsFramebufferEXT", + "IsList", + "IsProgram", + "IsProgramARB", + "IsQuery", + "IsQueryARB", + "IsRenderbuffer", + "IsRenderbufferEXT", + "IsSampler", + "IsShader", + "IsSync", + "IsTexture", + "IsTextureEXT", + "IsTransformFeedback", + "IsVertexArray", + "Lightf", + "Lightfv", + "Lighti", + "Lightiv", + "LightModelf", + "LightModelfv", + "LightModeli", + "LightModeliv", + "LightModelx", + "LightModelxv", + "Lightx", + "Lightxv", + "LineStipple", + "LineWidth", + "LineWidthx", + "LinkProgram", + "LinkProgramARB", + "ListBase", + "LoadIdentity", + "LoadMatrixd", + "LoadMatrixf", + "LoadMatrixx", + "LoadName", + "LoadTransposeMatrixd", + "LoadTransposeMatrixdARB", + "LoadTransposeMatrixf", + "LoadTransposeMatrixfARB", + "LockArraysEXT", + "LogicOp", + "Map1d", + "Map1f", + "Map2d", + "Map2f", + "MapBuffer", + "MapBufferARB", + "MapBufferRange", + "MapGrid1d", + "MapGrid1f", + "MapGrid2d", + "MapGrid2f", + "Materialf", + "Materialfv", + "Materiali", + "Materialiv", + "Materialx", + "Materialxv", + "MatrixMode", + "MemoryBarrier", + "Minmax", + "MinSampleShading", + "MinSampleShadingARB", + "MultiDrawArrays", + "MultiDrawArraysEXT", + "MultiDrawArraysIndirect", + "MultiDrawElements", + "MultiDrawElementsBaseVertex", + "MultiDrawElementsEXT", + "MultiDrawElementsIndirect", + "MultiTexCoord1d", + "MultiTexCoord1dARB", + "MultiTexCoord1dv", + "MultiTexCoord1dvARB", + "MultiTexCoord1f", + "MultiTexCoord1fARB", + "MultiTexCoord1fv", + "MultiTexCoord1fvARB", + "MultiTexCoord1i", + "MultiTexCoord1iARB", + "MultiTexCoord1iv", + "MultiTexCoord1ivARB", + "MultiTexCoord1s", + "MultiTexCoord1sARB", + "MultiTexCoord1sv", + "MultiTexCoord1svARB", + "MultiTexCoord2d", + "MultiTexCoord2dARB", + "MultiTexCoord2dv", + "MultiTexCoord2dvARB", + "MultiTexCoord2f", + "MultiTexCoord2fARB", + "MultiTexCoord2fv", + "MultiTexCoord2fvARB", + "MultiTexCoord2i", + "MultiTexCoord2iARB", + "MultiTexCoord2iv", + "MultiTexCoord2ivARB", + "MultiTexCoord2s", + "MultiTexCoord2sARB", + "MultiTexCoord2sv", + "MultiTexCoord2svARB", + "MultiTexCoord3d", + "MultiTexCoord3dARB", + "MultiTexCoord3dv", + "MultiTexCoord3dvARB", + "MultiTexCoord3f", + "MultiTexCoord3fARB", + "MultiTexCoord3fv", + "MultiTexCoord3fvARB", + "MultiTexCoord3i", + "MultiTexCoord3iARB", + "MultiTexCoord3iv", + "MultiTexCoord3ivARB", + "MultiTexCoord3s", + "MultiTexCoord3sARB", + "MultiTexCoord3sv", + "MultiTexCoord3svARB", + "MultiTexCoord4d", + "MultiTexCoord4dARB", + "MultiTexCoord4dv", + "MultiTexCoord4dvARB", + "MultiTexCoord4f", + "MultiTexCoord4fARB", + "MultiTexCoord4fv", + "MultiTexCoord4fvARB", + "MultiTexCoord4i", + "MultiTexCoord4iARB", + "MultiTexCoord4iv", + "MultiTexCoord4ivARB", + "MultiTexCoord4s", + "MultiTexCoord4sARB", + "MultiTexCoord4sv", + "MultiTexCoord4svARB", + "MultiTexCoord4x", + "MultiTexCoordP1ui", + "MultiTexCoordP1uiv", + "MultiTexCoordP2ui", + "MultiTexCoordP2uiv", + "MultiTexCoordP3ui", + "MultiTexCoordP3uiv", + "MultiTexCoordP4ui", + "MultiTexCoordP4uiv", + "MultMatrixd", + "MultMatrixf", + "MultMatrixx", + "MultTransposeMatrixd", + "MultTransposeMatrixdARB", + "MultTransposeMatrixf", + "MultTransposeMatrixfARB", + "NewList", + "Normal3b", + "Normal3bv", + "Normal3d", + "Normal3dv", + "Normal3f", + "Normal3fv", + "Normal3i", + "Normal3iv", + "Normal3s", + "Normal3sv", + "Normal3x", + "NormalP3ui", + "NormalP3uiv", + "NormalPointer", + "NormalPointerEXT", + "ObjectLabel", + "ObjectPtrLabel", + "Ortho", + "Orthof", + "Orthox", + "PassThrough", + "PauseTransformFeedback", + "PixelMapfv", + "PixelMapuiv", + "PixelMapusv", + "PixelStoref", + "PixelStorei", + "PixelTransferf", + "PixelTransferi", + "PixelZoom", + "PointParameterf", + "PointParameterfARB", + "PointParameterfEXT", + "PointParameterfv", + "PointParameterfvARB", + "PointParameterfvEXT", + "PointParameteri", + "PointParameteriv", + "PointParameterx", + "PointParameterxv", + "PointSize", + "PointSizePointerOES", + "PointSizex", + "PolygonMode", + "PolygonOffset", + "PolygonOffsetx", + "PolygonStipple", + "PopAttrib", + "PopClientAttrib", + "PopDebugGroup", + "PopMatrix", + "PopName", + "PrimitiveRestartIndex", + "PrimitiveRestartIndexNV", + "PrimitiveRestartNV", + "PrioritizeTextures", + "PrioritizeTexturesEXT", + "ProgramBinary", + "ProgramEnvParameter4dARB", + "ProgramEnvParameter4dvARB", + "ProgramEnvParameter4fARB", + "ProgramEnvParameter4fvARB", + "ProgramLocalParameter4dARB", + "ProgramLocalParameter4dvARB", + "ProgramLocalParameter4fARB", + "ProgramLocalParameter4fvARB", + "ProgramParameteri", + "ProgramParameteriARB", + "ProgramStringARB", + "ProvokingVertex", + "ProvokingVertexEXT", + "PushAttrib", + "PushClientAttrib", + "PushDebugGroup", + "PushMatrix", + "PushName", + "RasterPos2d", + "RasterPos2dv", + "RasterPos2f", + "RasterPos2fv", + "RasterPos2i", + "RasterPos2iv", + "RasterPos2s", + "RasterPos2sv", + "RasterPos3d", + "RasterPos3dv", + "RasterPos3f", + "RasterPos3fv", + "RasterPos3i", + "RasterPos3iv", + "RasterPos3s", + "RasterPos3sv", + "RasterPos4d", + "RasterPos4dv", + "RasterPos4f", + "RasterPos4fv", + "RasterPos4i", + "RasterPos4iv", + "RasterPos4s", + "RasterPos4sv", + "ReadBuffer", + "ReadnPixelsARB", + "ReadPixels", + "Rectd", + "Rectdv", + "Rectf", + "Rectfv", + "Recti", + "Rectiv", + "Rects", + "Rectsv", + "ReleaseShaderCompiler", + "RenderbufferStorage", + "RenderbufferStorageEXT", + "RenderbufferStorageMultisample", + "RenderbufferStorageMultisampleEXT", + "RenderMode", + "ResetHistogram", + "ResetMinmax", + "ResumeTransformFeedback", + "Rotated", + "Rotatef", + "Rotatex", + "SampleCoverage", + "SampleCoverageARB", + "SampleCoveragex", + "SampleMaski", + "SamplerParameterf", + "SamplerParameterfv", + "SamplerParameteri", + "SamplerParameterIiv", + "SamplerParameterIuiv", + "SamplerParameteriv", + "Scaled", + "Scalef", + "Scalex", + "Scissor", + "ScissorArrayv", + "ScissorIndexed", + "ScissorIndexedv", + "SecondaryColor3b", + "SecondaryColor3bEXT", + "SecondaryColor3bv", + "SecondaryColor3bvEXT", + "SecondaryColor3d", + "SecondaryColor3dEXT", + "SecondaryColor3dv", + "SecondaryColor3dvEXT", + "SecondaryColor3f", + "SecondaryColor3fEXT", + "SecondaryColor3fv", + "SecondaryColor3fvEXT", + "SecondaryColor3i", + "SecondaryColor3iEXT", + "SecondaryColor3iv", + "SecondaryColor3ivEXT", + "SecondaryColor3s", + "SecondaryColor3sEXT", + "SecondaryColor3sv", + "SecondaryColor3svEXT", + "SecondaryColor3ub", + "SecondaryColor3ubEXT", + "SecondaryColor3ubv", + "SecondaryColor3ubvEXT", + "SecondaryColor3ui", + "SecondaryColor3uiEXT", + "SecondaryColor3uiv", + "SecondaryColor3uivEXT", + "SecondaryColor3us", + "SecondaryColor3usEXT", + "SecondaryColor3usv", + "SecondaryColor3usvEXT", + "SecondaryColorP3ui", + "SecondaryColorP3uiv", + "SecondaryColorPointer", + "SecondaryColorPointerEXT", + "SelectBuffer", + "SeparableFilter2D", + "ShadeModel", + "ShaderBinary", + "ShaderSource", + "ShaderSourceARB", + "StencilFunc", + "StencilFuncSeparate", + "StencilMask", + "StencilMaskSeparate", + "StencilOp", + "StencilOpSeparate", + "TexBuffer", + "TexBufferARB", + "TexBufferRange", + "TexCoord1d", + "TexCoord1dv", + "TexCoord1f", + "TexCoord1fv", + "TexCoord1i", + "TexCoord1iv", + "TexCoord1s", + "TexCoord1sv", + "TexCoord2d", + "TexCoord2dv", + "TexCoord2f", + "TexCoord2fv", + "TexCoord2i", + "TexCoord2iv", + "TexCoord2s", + "TexCoord2sv", + "TexCoord3d", + "TexCoord3dv", + "TexCoord3f", + "TexCoord3fv", + "TexCoord3i", + "TexCoord3iv", + "TexCoord3s", + "TexCoord3sv", + "TexCoord4d", + "TexCoord4dv", + "TexCoord4f", + "TexCoord4fv", + "TexCoord4i", + "TexCoord4iv", + "TexCoord4s", + "TexCoord4sv", + "TexCoordP1ui", + "TexCoordP1uiv", + "TexCoordP2ui", + "TexCoordP2uiv", + "TexCoordP3ui", + "TexCoordP3uiv", + "TexCoordP4ui", + "TexCoordP4uiv", + "TexCoordPointer", + "TexCoordPointerEXT", + "TexEnvf", + "TexEnvfv", + "TexEnvi", + "TexEnviv", + "TexEnvx", + "TexEnvxv", + "TexGend", + "TexGendv", + "TexGenf", + "TexGenfv", + "TexGeni", + "TexGeniv", + "TexImage1D", + "TexImage2D", + "TexImage2DMultisample", + "TexImage3D", + "TexImage3DEXT", + "TexImage3DMultisample", + "TexParameterf", + "TexParameterfv", + "TexParameteri", + "TexParameterIiv", + "TexParameterIivEXT", + "TexParameterIuiv", + "TexParameterIuivEXT", + "TexParameteriv", + "TexParameterx", + "TexParameterxv", + "TexStorage1D", + "TexStorage2D", + "TexStorage2DMultisample", + "TexStorage3D", + "TexStorage3DMultisample", + "TexSubImage1D", + "TexSubImage2D", + "TexSubImage3D", + "TexSubImage3DEXT", + "TextureBarrierNV", + "TextureStorage1DEXT", + "TextureStorage2DEXT", + "TextureStorage3DEXT", + "TextureView", + "TransformFeedbackVaryings", + "Translated", + "Translatef", + "Translatex", + "Uniform1f", + "Uniform1fARB", + "Uniform1fv", + "Uniform1fvARB", + "Uniform1i", + "Uniform1iARB", + "Uniform1iv", + "Uniform1ivARB", + "Uniform1ui", + "Uniform1uiEXT", + "Uniform1uiv", + "Uniform1uivEXT", + "Uniform2f", + "Uniform2fARB", + "Uniform2fv", + "Uniform2fvARB", + "Uniform2i", + "Uniform2iARB", + "Uniform2iv", + "Uniform2ivARB", + "Uniform2ui", + "Uniform2uiEXT", + "Uniform2uiv", + "Uniform2uivEXT", + "Uniform3f", + "Uniform3fARB", + "Uniform3fv", + "Uniform3fvARB", + "Uniform3i", + "Uniform3iARB", + "Uniform3iv", + "Uniform3ivARB", + "Uniform3ui", + "Uniform3uiEXT", + "Uniform3uiv", + "Uniform3uivEXT", + "Uniform4f", + "Uniform4fARB", + "Uniform4fv", + "Uniform4fvARB", + "Uniform4i", + "Uniform4iARB", + "Uniform4iv", + "Uniform4ivARB", + "Uniform4ui", + "Uniform4uiEXT", + "Uniform4uiv", + "Uniform4uivEXT", + "UniformBlockBinding", + "UniformMatrix2fv", + "UniformMatrix2fvARB", + "UniformMatrix2x3fv", + "UniformMatrix2x4fv", + "UniformMatrix3fv", + "UniformMatrix3fvARB", + "UniformMatrix3x2fv", + "UniformMatrix3x4fv", + "UniformMatrix4fv", + "UniformMatrix4fvARB", + "UniformMatrix4x2fv", + "UniformMatrix4x3fv", + "UnlockArraysEXT", + "UnmapBuffer", + "UnmapBufferARB", + "UseProgram", + "UseProgramObjectARB", + "ValidateProgram", + "ValidateProgramARB", + "Vertex2d", + "Vertex2dv", + "Vertex2f", + "Vertex2fv", + "Vertex2i", + "Vertex2iv", + "Vertex2s", + "Vertex2sv", + "Vertex3d", + "Vertex3dv", + "Vertex3f", + "Vertex3fv", + "Vertex3i", + "Vertex3iv", + "Vertex3s", + "Vertex3sv", + "Vertex4d", + "Vertex4dv", + "Vertex4f", + "Vertex4fv", + "Vertex4i", + "Vertex4iv", + "Vertex4s", + "Vertex4sv", + "VertexAttrib1d", + "VertexAttrib1dARB", + "VertexAttrib1dv", + "VertexAttrib1dvARB", + "VertexAttrib1f", + "VertexAttrib1fARB", + "VertexAttrib1fv", + "VertexAttrib1fvARB", + "VertexAttrib1s", + "VertexAttrib1sARB", + "VertexAttrib1sv", + "VertexAttrib1svARB", + "VertexAttrib2d", + "VertexAttrib2dARB", + "VertexAttrib2dv", + "VertexAttrib2dvARB", + "VertexAttrib2f", + "VertexAttrib2fARB", + "VertexAttrib2fv", + "VertexAttrib2fvARB", + "VertexAttrib2s", + "VertexAttrib2sARB", + "VertexAttrib2sv", + "VertexAttrib2svARB", + "VertexAttrib3d", + "VertexAttrib3dARB", + "VertexAttrib3dv", + "VertexAttrib3dvARB", + "VertexAttrib3f", + "VertexAttrib3fARB", + "VertexAttrib3fv", + "VertexAttrib3fvARB", + "VertexAttrib3s", + "VertexAttrib3sARB", + "VertexAttrib3sv", + "VertexAttrib3svARB", + "VertexAttrib4bv", + "VertexAttrib4bvARB", + "VertexAttrib4d", + "VertexAttrib4dARB", + "VertexAttrib4dv", + "VertexAttrib4dvARB", + "VertexAttrib4f", + "VertexAttrib4fARB", + "VertexAttrib4fv", + "VertexAttrib4fvARB", + "VertexAttrib4iv", + "VertexAttrib4ivARB", + "VertexAttrib4Nbv", + "VertexAttrib4NbvARB", + "VertexAttrib4Niv", + "VertexAttrib4NivARB", + "VertexAttrib4Nsv", + "VertexAttrib4NsvARB", + "VertexAttrib4Nub", + "VertexAttrib4NubARB", + "VertexAttrib4Nubv", + "VertexAttrib4NubvARB", + "VertexAttrib4Nuiv", + "VertexAttrib4NuivARB", + "VertexAttrib4Nusv", + "VertexAttrib4NusvARB", + "VertexAttrib4s", + "VertexAttrib4sARB", + "VertexAttrib4sv", + "VertexAttrib4svARB", + "VertexAttrib4ubv", + "VertexAttrib4ubvARB", + "VertexAttrib4uiv", + "VertexAttrib4uivARB", + "VertexAttrib4usv", + "VertexAttrib4usvARB", + "VertexAttribBinding", + "VertexAttribDivisor", + "VertexAttribDivisorARB", + "VertexAttribFormat", + "VertexAttribI1i", + "VertexAttribI1iEXT", + "VertexAttribI1iv", + "VertexAttribI1ivEXT", + "VertexAttribI1ui", + "VertexAttribI1uiEXT", + "VertexAttribI1uiv", + "VertexAttribI1uivEXT", + "VertexAttribI2i", + "VertexAttribI2iEXT", + "VertexAttribI2iv", + "VertexAttribI2ivEXT", + "VertexAttribI2ui", + "VertexAttribI2uiEXT", + "VertexAttribI2uiv", + "VertexAttribI2uivEXT", + "VertexAttribI3i", + "VertexAttribI3iEXT", + "VertexAttribI3iv", + "VertexAttribI3ivEXT", + "VertexAttribI3ui", + "VertexAttribI3uiEXT", + "VertexAttribI3uiv", + "VertexAttribI3uivEXT", + "VertexAttribI4bv", + "VertexAttribI4bvEXT", + "VertexAttribI4i", + "VertexAttribI4iEXT", + "VertexAttribI4iv", + "VertexAttribI4ivEXT", + "VertexAttribI4sv", + "VertexAttribI4svEXT", + "VertexAttribI4ubv", + "VertexAttribI4ubvEXT", + "VertexAttribI4ui", + "VertexAttribI4uiEXT", + "VertexAttribI4uiv", + "VertexAttribI4uivEXT", + "VertexAttribI4usv", + "VertexAttribI4usvEXT", + "VertexAttribIFormat", + "VertexAttribIPointer", + "VertexAttribIPointerEXT", + "VertexAttribLFormat", + "VertexAttribP1ui", + "VertexAttribP1uiv", + "VertexAttribP2ui", + "VertexAttribP2uiv", + "VertexAttribP3ui", + "VertexAttribP3uiv", + "VertexAttribP4ui", + "VertexAttribP4uiv", + "VertexAttribPointer", + "VertexAttribPointerARB", + "VertexBindingDivisor", + "VertexP2ui", + "VertexP2uiv", + "VertexP3ui", + "VertexP3uiv", + "VertexP4ui", + "VertexP4uiv", + "VertexPointer", + "VertexPointerEXT", + "Viewport", + "ViewportArrayv", + "ViewportIndexedf", + "ViewportIndexedfv", + "WaitSync", + "WindowPos2d", + "WindowPos2dARB", + "WindowPos2dv", + "WindowPos2dvARB", + "WindowPos2f", + "WindowPos2fARB", + "WindowPos2fv", + "WindowPos2fvARB", + "WindowPos2i", + "WindowPos2iARB", + "WindowPos2iv", + "WindowPos2ivARB", + "WindowPos2s", + "WindowPos2sARB", + "WindowPos2sv", + "WindowPos2svARB", + "WindowPos3d", + "WindowPos3dARB", + "WindowPos3dv", + "WindowPos3dvARB", + "WindowPos3f", + "WindowPos3fARB", + "WindowPos3fv", + "WindowPos3fvARB", + "WindowPos3i", + "WindowPos3iARB", + "WindowPos3iv", + "WindowPos3ivARB", + "WindowPos3s", + "WindowPos3sARB", + "WindowPos3sv", + "WindowPos3svARB", ] """Functions that need dispatch slots but are not used diff --git a/src/mapi/glapi/gen/typeexpr.py b/src/mapi/glapi/gen/typeexpr.py index 75fb9d9785..199dfeed41 100644 --- a/src/mapi/glapi/gen/typeexpr.py +++ b/src/mapi/glapi/gen/typeexpr.py @@ -71,11 +71,11 @@ class type_table(object): self.types_by_name = {} def add_type(self, type_expr): - self.types_by_name[ type_expr.get_base_name() ] = type_expr + self.types_by_name[type_expr.get_base_name()] = type_expr def find_type(self, name): if name in self.types_by_name: - return self.types_by_name[ name ] + return self.types_by_name[name] else: return None @@ -83,15 +83,17 @@ class type_table(object): def create_initial_types(): tt = type_table() + # pylint: disable=bad-whitespace basic_types = [ - ("char", 1, 1), - ("short", 2, 1), - ("int", 4, 1), - ("long", 4, 1), - ("float", 4, 0), - ("double", 8, 0), - ("enum", 4, 1) + ("char", 1, 1), + ("short", 2, 1), + ("int", 4, 1), + ("long", 4, 1), + ("float", 4, 0), + ("double", 8, 0), + ("enum", 4, 1) ] + # pylint: enable=bad-whitespace for (type_name, type_size, integer) in basic_types: te = type_expression(None) @@ -100,7 +102,7 @@ def create_initial_types(): tn.size = type_size tn.integer = integer te.expr.append(tn) - tt.add_type( te ) + tt.add_type(te) type_expression.built_in_types = tt @@ -108,7 +110,7 @@ def create_initial_types(): class type_expression(object): built_in_types = None - def __init__(self, type_string, extra_types = None): + def __init__(self, type_string, extra_types=None): self.expr = [] if not type_string: @@ -121,7 +123,7 @@ class type_expression(object): # Replace '*' with ' * ' in type_string. Then, split the string # into tokens, separated by spaces. - tokens = string.split( string.replace( type_string, "*", " * " ) ) + tokens = string.split(string.replace(type_string, "*", " * ")) const = 0 t = None @@ -145,7 +147,7 @@ class type_expression(object): # same as "unsigned int". if unsigned: - self.set_base_type( "int", signed, unsigned, const, extra_types ) + self.set_base_type("int", signed, unsigned, const, extra_types) const = 0 signed = 0 unsigned = 0 @@ -158,12 +160,12 @@ class type_expression(object): t = type_node() t.pointer = 1 - self.expr.append( t ) + self.expr.append(t) else: if self.expr: raise RuntimeError('Invalid type expression (garbage after pointer qualifier -> "%s")' % (self.original_string)) - self.set_base_type( i, signed, unsigned, const, extra_types ) + self.set_base_type(i, signed, unsigned, const, extra_types) const = 0 signed = 0 unsigned = 0 @@ -181,16 +183,16 @@ class type_expression(object): raise RuntimeError("Invalid type expression (dangling unsigned)") def set_base_type(self, type_name, signed, unsigned, const, extra_types): - te = type_expression.built_in_types.find_type( type_name ) + te = type_expression.built_in_types.find_type(type_name) if not te: - te = extra_types.find_type( type_name ) + te = extra_types.find_type(type_name) if not te: raise RuntimeError('Unknown base type "%s".' % (type_name)) self.expr = copy.deepcopy(te.expr) - t = self.expr[ len(self.expr) - 1 ] + t = self.expr[len(self.expr) - 1] t.const = const if signed: t.signed = 1 @@ -234,7 +236,7 @@ class type_expression(object): return tn.elements def get_stack_size(self): - tn = self.expr[ -1 ] + tn = self.expr[-1] if tn.elements or tn.pointer: return 4 @@ -244,11 +246,11 @@ class type_expression(object): return 4 def is_pointer(self): - tn = self.expr[ -1 ] + tn = self.expr[-1] return tn.pointer def format_string(self): - tn = self.expr[ -1 ] + tn = self.expr[-1] if tn.pointer: return "%p" elif not tn.integer: @@ -259,13 +261,13 @@ class type_expression(object): if __name__ == '__main__': - types_to_try = [ "int", "int *", "const int *", "int * const", "const int * const", \ - "unsigned * const *", \ - "float", "const double", "double * const"] + types_to_try = ["int", "int *", "const int *", "int * const", "const int * const", + "unsigned * const *", + "float", "const double", "double * const"] create_initial_types() for t in types_to_try: print 'Trying "%s"...' % (t) - te = type_expression( t ) + te = type_expression(t) print 'Got "%s" (%u, %u).' % (te.string(), te.get_stack_size(), te.get_element_size()) |