diff options
author | Ian Romanick <idr@us.ibm.com> | 2005-01-28 17:30:25 +0000 |
---|---|---|
committer | Ian Romanick <idr@us.ibm.com> | 2005-01-28 17:30:25 +0000 |
commit | fdb0527ddce8eb2927631d4fbf38e6625b0af8b1 (patch) | |
tree | a38a60921c3e05664bb5ab5545b4190bedb35259 /src/mesa/glapi/glX_XML.py | |
parent | 1fca5632325e1da42e278909e404dd57e0a62252 (diff) |
Slightly modify the meaning of the 'handcode' attribute in a 'glx' element.
The attribute can now take one of 4 states. "false" (the default value)
means that no handcoding is required for the function. "client" means that
the function must be handcoded on the client-side only. "server" means that
the function must be handcoded on the server-side only. "true" menas that
the function must be handcoded on both the client-side and the server-side.
Version 1.14 of glX_proto_send.py accidentally contained a line of this
change.
Diffstat (limited to 'src/mesa/glapi/glX_XML.py')
-rw-r--r-- | src/mesa/glapi/glX_XML.py | 29 |
1 files changed, 23 insertions, 6 deletions
diff --git a/src/mesa/glapi/glX_XML.py b/src/mesa/glapi/glX_XML.py index df3e6bb1cb..6eb2f553f9 100644 --- a/src/mesa/glapi/glX_XML.py +++ b/src/mesa/glapi/glX_XML.py @@ -328,8 +328,6 @@ class glXFunction(gl_XML.glFunction): glx_doubles_in_order = 0 vectorequiv = None - handcode = 0 - ignore = 0 can_be_large = 0 def __init__(self, context, name, attrs): @@ -340,6 +338,10 @@ class glXFunction(gl_XML.glFunction): self.can_be_large = 0 self.reply_always_array = 0 + self.server_handcode = 0 + self.client_handcode = 0 + self.ignore = 0 + gl_XML.glFunction.__init__(self, context, name, attrs) return @@ -356,10 +358,25 @@ class glXFunction(gl_XML.glFunction): self.glx_sop = int(attrs.get('sop', "0")) self.glx_vendorpriv = int(attrs.get('vendorpriv', "0")) - if attrs.get('handcode', "false") == "true": - self.handcode = 1 + # The 'handcode' attribute can be one of 'true', + # 'false', 'client', or 'server'. + + handcode = attrs.get('handcode', "false") + if handcode == "false": + self.server_handcode = 0 + self.client_handcode = 0 + elif handcode == "true": + self.server_handcode = 1 + self.client_handcode = 1 + elif handcode == "client": + self.server_handcode = 0 + self.client_handcode = 1 + elif handcode == "server": + self.server_handcode = 1 + self.client_handcode = 0 else: - self.handcode = 0 + raise RuntimeError('Invalid handcode mode "%s" in function "%s".' % (handcode, self.name)) + if attrs.get('ignore', "false") == "true": self.ignore = 1 @@ -395,7 +412,7 @@ class glXFunction(gl_XML.glFunction): # This will also mark functions that don't have a # dispatch offset at ignored. - if (self.fn_offset == -1 and not self.fn_alias) or not (self.handcode or self.glx_rop or self.glx_sop or self.glx_vendorpriv or self.vectorequiv or self.fn_alias): + if (self.fn_offset == -1 and not self.fn_alias) or not (self.client_handcode or self.server_handcode or self.glx_rop or self.glx_sop or self.glx_vendorpriv or self.vectorequiv or self.fn_alias): #if not self.ignore: # if self.fn_offset == -1: # print '/* %s ignored becuase no offset assigned. */' % (self.name) |