diff options
author | marha <marha@users.sourceforge.net> | 2012-10-11 10:09:13 +0200 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2012-10-11 10:09:13 +0200 |
commit | 30c05ead4fe1b6a341d5b585e3a6b5d255edf650 (patch) | |
tree | 932b22aede860e3ab2efe50116ad776f81c04606 /mesalib/src/mapi/glapi/gen/glX_proto_common.py | |
parent | ac799961eb382e48c68ffda1e1a89b346eb97f81 (diff) | |
parent | 8223fb176264123c86c0d3eb845973d00fd62cc2 (diff) | |
download | vcxsrv-30c05ead4fe1b6a341d5b585e3a6b5d255edf650.tar.gz vcxsrv-30c05ead4fe1b6a341d5b585e3a6b5d255edf650.tar.bz2 vcxsrv-30c05ead4fe1b6a341d5b585e3a6b5d255edf650.zip |
Merge remote-tracking branch 'origin/released'
* origin/released:
xwininfo mesa git update 11 oct 2012
Conflicts:
mesalib/src/mapi/glapi/gen/glX_proto_recv.py
mesalib/src/mapi/glapi/gen/glX_proto_size.py
mesalib/src/mapi/glapi/gen/glX_server_table.py
mesalib/src/mapi/glapi/gen/gl_table.py
mesalib/src/mesa/main/.gitignore
Diffstat (limited to 'mesalib/src/mapi/glapi/gen/glX_proto_common.py')
-rw-r--r-- | mesalib/src/mapi/glapi/gen/glX_proto_common.py | 88 |
1 files changed, 44 insertions, 44 deletions
diff --git a/mesalib/src/mapi/glapi/gen/glX_proto_common.py b/mesalib/src/mapi/glapi/gen/glX_proto_common.py index 6f094e22b..86d9189a9 100644 --- a/mesalib/src/mapi/glapi/gen/glX_proto_common.py +++ b/mesalib/src/mapi/glapi/gen/glX_proto_common.py @@ -30,66 +30,66 @@ import string class glx_proto_item_factory(glX_XML.glx_item_factory): - """Factory to create GLX protocol oriented objects derived from gl_item.""" - - def create_item(self, name, element, context): - if name == "type": - return glx_proto_type(element, context) - else: - return glX_XML.glx_item_factory.create_item(self, name, element, context) + """Factory to create GLX protocol oriented objects derived from gl_item.""" + + def create_item(self, name, element, context): + if name == "type": + return glx_proto_type(element, context) + else: + return glX_XML.glx_item_factory.create_item(self, name, element, context) class glx_proto_type(gl_XML.gl_type): - def __init__(self, element, context): - gl_XML.gl_type.__init__(self, element, context) + def __init__(self, element, context): + gl_XML.gl_type.__init__(self, element, context) - self.glx_name = element.nsProp( "glx_name", None ) - return + self.glx_name = element.nsProp( "glx_name", None ) + return class glx_print_proto(gl_XML.gl_print_base): - def size_call(self, func, outputs_also = 0): - """Create C code to calculate 'compsize'. + def size_call(self, func, outputs_also = 0): + """Create C code to calculate 'compsize'. + + Creates code to calculate 'compsize'. If the function does + not need 'compsize' to be calculated, None will be + returned.""" - Creates code to calculate 'compsize'. If the function does - not need 'compsize' to be calculated, None will be - returned.""" - - compsize = None + compsize = None - for param in func.parameterIterator(): - if outputs_also or not param.is_output: - if param.is_image(): - [dim, w, h, d, junk] = param.get_dimensions() + for param in func.parameterIterator(): + if outputs_also or not param.is_output: + if param.is_image(): + [dim, w, h, d, junk] = param.get_dimensions() - compsize = '__glImageSize(%s, %s, %s, %s, %s, %s)' % (w, h, d, param.img_format, param.img_type, param.img_target) - if not param.img_send_null: - compsize = '(%s != NULL) ? %s : 0' % (param.name, compsize) + compsize = '__glImageSize(%s, %s, %s, %s, %s, %s)' % (w, h, d, param.img_format, param.img_type, param.img_target) + if not param.img_send_null: + compsize = '(%s != NULL) ? %s : 0' % (param.name, compsize) - return compsize + return compsize - elif len(param.count_parameter_list): - parameters = string.join( param.count_parameter_list, "," ) - compsize = "__gl%s_size(%s)" % (func.name, parameters) + elif len(param.count_parameter_list): + parameters = string.join( param.count_parameter_list, "," ) + compsize = "__gl%s_size(%s)" % (func.name, parameters) - return compsize + return compsize - return None + return None - def emit_packet_size_calculation(self, f, bias): - # compsize is only used in the command size calculation if - # the function has a non-output parameter that has a non-empty - # counter_parameter_list. + def emit_packet_size_calculation(self, f, bias): + # compsize is only used in the command size calculation if + # the function has a non-output parameter that has a non-empty + # counter_parameter_list. - compsize = self.size_call(f) - if compsize: - print ' const GLuint compsize = %s;' % (compsize) + compsize = self.size_call(f) + if compsize: + print ' const GLuint compsize = %s;' % (compsize) - if bias: - print ' const GLuint cmdlen = %s - %u;' % (f.command_length(), bias) - else: - print ' const GLuint cmdlen = %s;' % (f.command_length()) + if bias: + print ' const GLuint cmdlen = %s - %u;' % (f.command_length(), bias) + else: + print ' const GLuint cmdlen = %s;' % (f.command_length()) - #print '' - return compsize + #print '' + return compsize |