mesa: make texture BorderColor a union of float/int/uint
[mesa.git] / src / mesa / glapi / glX_XML.py
index 44f945a9ee4fa5750a7a585c3eeb86309c3dc296..4c2e0f95bf4ff3a7763cd94a5725b2b172b94d02 100644 (file)
@@ -1,6 +1,6 @@
-#!/usr/bin/python2
+#!/usr/bin/env python
 
-# (C) Copyright IBM Corporation 2004
+# (C) Copyright IBM Corporation 2004, 2005
 # All Rights Reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # Authors:
 #    Ian Romanick <idr@us.ibm.com>
 
-from xml.sax import saxutils
-from xml.sax import make_parser
-from xml.sax.handler import feature_namespaces
-
 import gl_XML
 import license
-import sys, getopt
-
-
-def printPure():
-       print """#  if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96)
-#    define PURE __attribute__((pure))
-#  else
-#    define PURE
-#  endif"""
-
-def printFastcall():
-       print """#  if defined(__i386__) && defined(__GNUC__)
-#    define FASTCALL __attribute__((fastcall))
-#  else
-#    define FASTCALL
-#  endif"""
-
-def printVisibility(S, s):
-       print """#  if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 3)
-#    define %s  __attribute__((visibility("%s")))
-#  else
-#    define %s
-#  endif""" % (S, s, S)
-
-def printNoinline():
-       print """#  if defined(__GNUC__)
-#    define NOINLINE __attribute__((noinline))
-#  else
-#    define NOINLINE
-#  endif"""
-
-
-class glXItemFactory(gl_XML.glItemFactory):
-       """Factory to create GLX protocol oriented objects derived from glItem."""
+import sys, getopt, string
+
+
+class glx_item_factory(gl_XML.gl_item_factory):
+       """Factory to create GLX protocol oriented objects derived from gl_item."""
     
-       def create(self, context, name, attrs):
+       def create_item(self, name, element, context):
                if name == "function":
-                       return glXFunction(context, name, attrs)
+                       return glx_function(element, context)
                elif name == "enum":
-                       return glXEnum(context, name, attrs)
-               elif name == "param":
-                       return glXParameter(context, name, attrs)
+                       return glx_enum(element, context)
+               elif name == "api":
+                       return glx_api(self)
                else:
-                       return gl_XML.glItemFactory.create(self, context, name, attrs)
+                       return gl_XML.gl_item_factory.create_item(self, name, element, context)
 
-class glXEnumFunction:
-       def __init__(self, name):
-               self.name = name
+
+class glx_enum(gl_XML.gl_enum):
+       def __init__(self, element, context):
+               gl_XML.gl_enum.__init__(self, element, context)
                
-               # "enums" is a set of lists.  The element in the set is the
-               # value of the enum.  The list is the list of names for that
-               # value.  For example, [0x8126] = {"POINT_SIZE_MIN",
-               # "POINT_SIZE_MIN_ARB", "POINT_SIZE_MIN_EXT",
-               # "POINT_SIZE_MIN_SGIS"}.
+               self.functions = {}
+
+               child = element.children
+               while child:
+                       if child.type == "element" and child.name == "size":
+                               n = child.nsProp( "name", None )
+                               c = child.nsProp( "count", None )
+                               m = child.nsProp( "mode", None )
+                               
+                               if not c:
+                                       c = self.default_count
+                               else:
+                                       c = int(c)
+
+                               if m == "get":
+                                       mode = 0
+                               else:
+                                       mode = 1
+
+                               if not self.functions.has_key(n):
+                                       self.functions[ n ] = [c, mode]
+
+                       child = child.next
 
-               self.enums = {}
+               return
 
-               # "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] = 
-               # {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).
 
-               self.count = {}
+class glx_function(gl_XML.gl_function):
+       def __init__(self, element, context):
+               self.glx_rop = 0
+               self.glx_sop = 0
+               self.glx_vendorpriv = 0
 
+               self.glx_vendorpriv_names = []
 
-       def append(self, count, value, name):
-               if self.enums.has_key( value ):
-                       self.enums[value].append(name)
-               else:
-                       if not self.count.has_key(count):
-                               self.count[count] = []
+               # If this is set to true, it means that GLdouble parameters should be
+               # written to the GLX protocol packet in the order they appear in the
+               # prototype.  This is different from the "classic" ordering.  In the
+               # classic ordering GLdoubles are written to the protocol packet first,
+               # followed by non-doubles.  NV_vertex_program was the first extension
+               # to break with this tradition.
 
-                       self.enums[value] = []
-                       self.enums[value].append(name)
-                       self.count[count].append(value)
+               self.glx_doubles_in_order = 0
 
+               self.vectorequiv = None
+               self.output = None
+               self.can_be_large = 0
+               self.reply_always_array = 0
+               self.dimensions_in_reply = 0
+               self.img_reset = None
 
-       def signature( self ):
-               sig = ""
-               for i in self.count:
-                       for e in self.count[i]:
-                               sig += "%04x,%u," % (e, i)
-       
-               return sig;
+               self.server_handcode = 0
+               self.client_handcode = 0
+               self.ignore = 0
 
+               self.count_parameter_list = []
+               self.counter_list = []
+               self.parameters_by_name = {}
+               self.offsets_calculated = 0
 
-       def PrintUsingTable(self):
-               """Emit the body of the __gl*_size function using a pair
-               of look-up tables and a mask.  The mask is calculated such
-               that (e & mask) is unique for all the valid values of e for
-               this function.  The result of (e & mask) is used as an index
-               into the first look-up table.  If it matches e, then the
-               same entry of the second table is returned.  Otherwise zero
-               is returned.
-               
-               It seems like this should cause better code to be generated.
-               However, on x86 at least, the resulting .o file is about 20%
-               larger then the switch-statment version.  I am leaving this
-               code in because the results may be different on other
-               platforms (e.g., PowerPC or x86-64)."""
+               gl_XML.gl_function.__init__(self, element, context)
+               return
 
-               return 0
-               count = 0
-               for a in self.enums:
-                       count += 1
-
-               # Determine if there is some mask M, such that M = (2^N) - 1,
-               # that will generate unique values for all of the enums.
-
-               mask = 0
-               for i in [1, 2, 3, 4, 5, 6, 7, 8]:
-                       mask = (1 << i) - 1
-
-                       fail = 0;
-                       for a in self.enums:
-                               for b in self.enums:
-                                       if a != b:
-                                               if (a & mask) == (b & mask):
-                                                       fail = 1;
-
-                       if not fail:
-                               break;
-                       else:
-                               mask = 0
 
-               if (mask != 0) and (mask < (2 * count)):
-                       masked_enums = {}
-                       masked_count = {}
+       def process_element(self, element):
+               gl_XML.gl_function.process_element(self, element)
 
-                       for i in range(0, mask + 1):
-                               masked_enums[i] = "0";
-                               masked_count[i] = 0;
+               # If the function already has a vector equivalent set, don't
+               # set it again.  This can happen if an alias to a function
+               # appears after the function that it aliases.
 
-                       for c in self.count:
-                               for e in self.count[c]:
-                                       i = e & mask
-                                       masked_enums[i] = '0x%04x /* %s */' % (e, self.enums[e][0])
-                                       masked_count[i] = c
+               if not self.vectorequiv:
+                       self.vectorequiv = element.nsProp("vectorequiv", None)
 
 
-                       print '    static const GLushort a[%u] = {' % (mask + 1)
-                       for e in masked_enums:
-                               print '        %s, ' % (masked_enums[e])
-                       print '    };'
+               name = element.nsProp("name", None)
+               if name == self.name:
+                       for param in self.parameters:
+                               self.parameters_by_name[ param.name ] = param
+                               
+                               if len(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)
 
-                       print '    static const GLubyte b[%u] = {' % (mask + 1)
-                       for c in masked_count:
-                               print '        %u, ' % (masked_count[c])
-                       print '    };'
 
-                       print '    const unsigned idx = (e & 0x%02xU);' % (mask)
-                       print ''
-                       print '    return (e == a[idx]) ? (GLint) b[idx] : 0;'
-                       return 1;
-               else:
-                       return 0;
-
-       def PrintUsingSwitch(self):
-               """Emit the body of the __gl*_size function using a 
-               switch-statement."""
-
-               print '    switch( e ) {'
-
-               for c in self.count:
-                       for e in self.count[c]:
-                               first = 1
-
-                               # There may be multiple enums with the same
-                               # value.  This happens has extensions are
-                               # promoted from vendor-specific or EXT to
-                               # ARB and to the core.  Emit the first one as
-                               # a case label, and emit the others as
-                               # commented-out case labels.
-
-                               for j in self.enums[e]:
-                                       if first:
-                                               print '        case %s:' % (j)
-                                               first = 0
-                                       else:
-                                               print '/*      case %s:*/' % (j)
-                                       
-                       print '            return %u;' % (c)
-                                       
-               print '        default: return 0;'
-               print '    }'
+               child = element.children
+               while child:
+                       if child.type == "element" and child.name == "glx":
+                               rop = child.nsProp( 'rop', None )
+                               sop = child.nsProp( 'sop', None )
+                               vop = child.nsProp( 'vendorpriv', None )
 
+                               if rop:
+                                       self.glx_rop = int(rop)
 
-       def Print(self, name):
-               print 'INTERNAL PURE FASTCALL GLint'
-               print '__gl%s_size( GLenum e )' % (name)
-               print '{'
+                               if sop:
+                                       self.glx_sop = int(sop)
 
-               if not self.PrintUsingTable():
-                       self.PrintUsingSwitch()
+                               if vop:
+                                       self.glx_vendorpriv = int(vop)
+                                       self.glx_vendorpriv_names.append(name)
 
-               print '}'
-               print ''
+                               self.img_reset = child.nsProp( 'img_reset', None )
 
+                               # The 'handcode' attribute can be one of 'true',
+                               # 'false', 'client', or 'server'.
 
+                               handcode = child.nsProp( 'handcode', None )
+                               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:
+                                       raise RuntimeError('Invalid handcode mode "%s" in function "%s".' % (handcode, self.name))
 
-class glXEnum(gl_XML.glEnum):
-       def __init__(self, context, name, attrs):
-               gl_XML.glEnum.__init__(self, context, name, attrs)
-               self.glx_functions = []
+                               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' )
 
-       def startElement(self, name, attrs):
-               if name == "size":
-                       n = attrs.get('name', None)
-                       if not self.context.glx_enum_functions.has_key( n ):
-                               f = glXEnumFunction( n )
-                               self.context.glx_enum_functions[ f.name ] = f
+                       child = child.next
 
-                       temp = attrs.get('count', None)
-                       try:
-                               c = int(temp)
-                       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.context.glx_enum_functions[ n ].append( c, self.value, self.name )
-               else:
-                       gl_XML.glEnum.startElement(self, context, name, attrs)
+               # Do some validation of the GLX protocol information.  As
+               # new tests are discovered, they should be added here.
+
+               for param in self.parameters:
+                       if param.is_output and self.glx_rop != 0:
+                               raise RuntimeError("Render / RenderLarge commands cannot have outputs (%s)." % (self.name))
+
                return
 
 
-class glXParameter(gl_XML.glParameter):
-       def __init__(self, context, name, attrs):
-               self.order = 1;
-               gl_XML.glParameter.__init__(self, context, name, attrs);
+       def has_variable_size_request(self):
+               """Determine if the GLX request packet is variable sized.
 
+               The GLX request packet is variable sized in several common
+               situations.
+               
+               1. The function has a non-output parameter that is counted
+                  by another parameter (e.g., the 'textures' parameter of
+                  glDeleteTextures).
+                  
+               2. The function has a non-output parameter whose count is
+                  determined by another parameter that is an enum (e.g., the
+                  'params' parameter of glLightfv).
+                  
+               3. The function has a non-output parameter that is an
+                  image.
+
+               4. The function must be hand-coded on the server.
+               """
+
+               if self.glx_rop == 0:
+                       return 0
+
+               if self.server_handcode or self.images:
+                       return 1
+
+               for param in self.parameters:
+                       if not param.is_output:
+                               if param.counter or len(param.count_parameter_list):
+                                       return 1
 
-class glXFunction(gl_XML.glFunction):
-       glx_rop = 0
-       glx_sop = 0
-       glx_vendorpriv = 0
+               return 0
 
-       # If this is set to true, it means that GLdouble parameters should be
-       # written to the GLX protocol packet in the order they appear in the
-       # prototype.  This is different from the "classic" ordering.  In the
-       # classic ordering GLdoubles are written to the protocol packet first,
-       # followed by non-doubles.  NV_vertex_program was the first extension
-       # to break with this tradition.
 
-       glx_doubles_in_order = 0
+       def variable_length_parameter(self):
+               for param in self.parameters:
+                       if not param.is_output:
+                               if param.counter or len(param.count_parameter_list):
+                                       return param
+                               
+               return None
 
-       vectorequiv = None
-       handcode = 0
-       ignore = 0
-       can_be_large = 0
 
-       def __init__(self, context, name, attrs):
-               self.vectorequiv = attrs.get('vectorequiv', None)
-               self.count_parameters = None
-               self.counter = None
-               self.output = None
-               self.can_be_large = 0
-               self.reply_always_array = 0
+       def calculate_offsets(self):
+               if not self.offsets_calculated:
+                       # Calculate the offset of the first function parameter
+                       # in the GLX command packet.  This byte offset is
+                       # measured from the end of the Render / RenderLarge
+                       # header.  The offset for all non-pixel commends is
+                       # zero.  The offset for pixel commands depends on the
+                       # number of dimensions of the pixel data.
+
+                       if len(self.images) and not self.images[0].is_output:
+                               [dim, junk, junk, junk, junk] = self.images[0].get_dimensions()
+
+                               # The base size is the size of the pixel pack info
+                               # header used by images with the specified number
+                               # of dimensions.
+
+                               if dim <=  2:
+                                       offset = 20
+                               elif dim <= 4:
+                                       offset = 36
+                               else:
+                                       raise RuntimeError('Invalid number of dimensions %u for parameter "%s" in function "%s".' % (dim, self.image.name, self.name))
+                       else:
+                               offset = 0
+
+                       for param in self.parameterIterateGlxSend():
+                               if param.img_null_flag:
+                                       offset += 4
 
-               gl_XML.glFunction.__init__(self, context, name, attrs)
+                               if param.name != self.img_reset:
+                                       param.offset = offset
+                                       if not param.is_variable_length() and not param.is_client_only:
+                                               offset += param.size()
+                                       
+                               if self.pad_after( param ):
+                                       offset += 4
+
+
+                       self.offsets_calculated = 1
                return
 
-       def startElement(self, name, attrs):
-               """Process elements within a function that are specific to GLX."""
 
-               if name == "glx":
-                       self.glx_rop = int(attrs.get('rop', "0"))
-                       self.glx_sop = int(attrs.get('sop', "0"))
-                       self.glx_vendorpriv = int(attrs.get('vendorpriv', "0"))
+       def offset_of(self, param_name):
+               self.calculate_offsets()
+               return self.parameters_by_name[ param_name ].offset
 
-                       if attrs.get('handcode', "false") == "true":
-                               self.handcode = 1
-                       else:
-                               self.handcode = 0
 
-                       if attrs.get('ignore', "false") == "true":
-                               self.ignore = 1
-                       else:
-                               self.ignore = 0
+       def parameterIterateGlxSend(self, include_variable_parameters = 1):
+               """Create an iterator for parameters in GLX request order."""
 
-                       if attrs.get('large', "false") == "true":
-                               self.can_be_large = 1
+               # 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 = [ [],  [], [] ]
+               for param in self.parameters:
+                       if param.is_output: continue
+
+                       if param.is_variable_length():
+                               temp[2].append( param )
+                       elif not self.glx_doubles_in_order and param.is_64_bit():
+                               temp[0].append( param )
                        else:
-                               self.can_be_large = 0
+                               temp[1].append( param )
 
-                       if attrs.get('doubles_in_order', "false") == "true":
-                               self.glx_doubles_in_order = 1
-                       else:
-                               self.glx_doubles_in_order = 0
+               parameters = temp[0]
+               parameters.extend( temp[1] )
+               if include_variable_parameters:
+                       parameters.extend( temp[2] )
+               return parameters.__iter__()
 
-                       if attrs.get('always_array', "false") == "true":
-                               self.reply_always_array = 1
-                       else:
-                               self.reply_always_array = 0
 
-               else:
-                       gl_XML.glFunction.startElement(self, name, attrs)
+       def parameterIterateCounters(self):
+               temp = []
+               for name in self.counter_list:
+                       temp.append( self.parameters_by_name[ name ] )
 
+               return temp.__iter__()
 
-       def append(self, tag_name, p):
-               gl_XML.glFunction.append(self, tag_name, p)
 
-               if p.is_variable_length_array():
-                       p.order = 2;
-               elif not self.glx_doubles_in_order and p.p_type.size == 8:
-                       p.order = 0;
+       def parameterIterateOutputs(self):
+               temp = []
+               for p in self.parameters:
+                       if p.is_output:
+                               temp.append( p )
 
-               if p.p_count_parameters != None:
-                       self.count_parameters = p.p_count_parameters
-               
-               if p.is_counter:
-                       self.counter = p.name
-                       
-               if p.is_output:
-                       self.output = p
+               return temp
 
-               return
 
-       def variable_length_parameter(self):
-               for param in self.fn_parameters:
-                       if param.is_variable_length_array():
-                               return param
-                       
-               return None
+       def command_fixed_length(self):
+               """Return the length, in bytes as an integer, of the
+               fixed-size portion of the command."""
 
+               if len(self.parameters) == 0:
+                       return 0
+               
+               self.calculate_offsets()
 
-       def command_payload_length(self):
                size = 0
+               for param in self.parameterIterateGlxSend(0):
+                       if param.name != self.img_reset and not param.is_client_only:
+                               if size == 0:
+                                       size = param.offset + param.size()
+                               else:
+                                       size += param.size()
+
+                               if self.pad_after( param ):
+                                       size += 4
+
+               for param in self.images:
+                       if param.img_null_flag or param.is_output:
+                               size += 4
+
+               return size
+
+
+       def command_variable_length(self):
+               """Return the length, as a string, of the variable-sized
+               portion of the command."""
+
                size_string = ""
-               for p in self:
-                       if p.is_output: continue
-                       temp = p.size_string()
-                       try:
-                               s = int(temp)
-                               size += s
-                       except Exception,e:
-                               size_string = size_string + " + __GLX_PAD(%s)" % (temp)
+               for p in self.parameterIterateGlxSend():
+                       if (not p.is_output) and (p.is_variable_length() or p.is_image()):
+                               # FIXME Replace the 1 in the size_string call
+                               # FIXME w/0 to eliminate some un-needed parnes
+                               # FIXME This would already be done, but it
+                               # FIXME adds some extra diffs to the generated
+                               # FIXME code.
+
+                               size_string = size_string + " + __GLX_PAD(%s)" % (p.size_string(1))
+
+               return size_string
 
-               return [size, size_string]
 
        def command_length(self):
-               [size, size_string] = self.command_payload_length()
+               size = self.command_fixed_length()
 
                if self.glx_rop != 0:
                        size += 4
 
                size = ((size + 3) & ~3)
-               return "%u%s" % (size, size_string)
+               return "%u%s" % (size, self.command_variable_length())
 
 
        def opcode_real_value(self):
+               """Get the true numeric value of the GLX opcode
+               
+               Behaves similarly to opcode_value, except for
+               X_GLXVendorPrivate and X_GLXVendorPrivateWithReply commands.
+               In these cases the value for the GLX opcode field (i.e.,
+               16 for X_GLXVendorPrivate or 17 for
+               X_GLXVendorPrivateWithReply) is returned.  For other 'single'
+               commands, the opcode for the command (e.g., 101 for
+               X_GLsop_NewList) is returned."""
+
                if self.glx_vendorpriv != 0:
                        if self.needs_reply():
                                return 17
@@ -390,7 +398,15 @@ class glXFunction(gl_XML.glFunction):
                else:
                        return self.opcode_value()
 
+
        def opcode_value(self):
+               """Get the unique protocol opcode for the glXFunction"""
+
+               if (self.glx_rop == 0) and self.vectorequiv:
+                       equiv = self.context.functions_by_name[ self.vectorequiv ]
+                       self.glx_rop = equiv.glx_rop
+
+
                if self.glx_rop != 0:
                        return self.glx_rop
                elif self.glx_sop != 0:
@@ -400,13 +416,29 @@ class glXFunction(gl_XML.glFunction):
                else:
                        return -1
        
+
        def opcode_rop_basename(self):
+               """Return either the name to be used for GLX protocol enum.
+               
+               Returns either the name of the function or the name of the
+               name of the equivalent vector (e.g., glVertex3fv for
+               glVertex3f) function."""
+
                if self.vectorequiv == None:
                        return self.name
                else:
                        return self.vectorequiv
 
+
        def opcode_name(self):
+               """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 ]
+                       self.glx_rop = equiv.glx_rop
+                       self.glx_doubles_in_order = equiv.glx_doubles_in_order
+
+
                if self.glx_rop != 0:
                        return "X_GLrop_%s" % (self.opcode_rop_basename())
                elif self.glx_sop != 0:
@@ -414,9 +446,26 @@ class glXFunction(gl_XML.glFunction):
                elif self.glx_vendorpriv != 0:
                        return "X_GLvop_%s" % (self.name)
                else:
-                       return "ERROR"
+                       raise RuntimeError('Function "%s" has no opcode.' % (self.name))
+
+
+       def opcode_vendor_name(self, name):
+               if name in self.glx_vendorpriv_names:
+                       return "X_GLvop_%s" % (name)
+               else:
+                       raise RuntimeError('Function "%s" has no VendorPrivate opcode.' % (name))
+
 
        def opcode_real_name(self):
+               """Get the true protocol enum name for the GLX opcode
+               
+               Behaves similarly to opcode_name, except for
+               X_GLXVendorPrivate and X_GLXVendorPrivateWithReply commands.
+               In these cases the string 'X_GLXVendorPrivate' or
+               'X_GLXVendorPrivateWithReply' is returned.  For other
+               single or render commands 'X_GLsop' or 'X_GLrop' plus the
+               name of the function returned."""
+
                if self.glx_vendorpriv != 0:
                        if self.needs_reply():
                                return "X_GLXVendorPrivateWithReply"
@@ -426,41 +475,96 @@ class glXFunction(gl_XML.glFunction):
                        return self.opcode_name()
 
 
-       def return_string(self):
-               if self.fn_return_type != 'void':
-                       return "return retval;"
-               else:
-                       return "return;"
+       def needs_reply(self):
+               try:
+                       x = self._needs_reply
+               except Exception, e:
+                       x = 0
+                       if self.return_type != 'void':
+                               x = 1
+
+                       for param in self.parameters:
+                               if param.is_output:
+                                       x = 1
+                                       break
+
+                       self._needs_reply = x
+
+               return x
+
+
+       def pad_after(self, p):
+               """Returns the name of the field inserted after the
+               specified field to pad out the command header."""
+
+               for image in self.images:
+                       if image.img_pad_dimensions:
+                               if not image.height:
+                                       if p.name == image.width:
+                                               return "height"
+                                       elif p.name == image.img_xoff:
+                                               return "yoffset"
+                               elif not image.extent:
+                                       if p.name == image.depth:
+                                               # Should this be "size4d"?
+                                               return "extent"
+                                       elif p.name == image.img_zoff:
+                                               return "woffset"
 
+               return None
 
-       def needs_reply(self):
-               return self.fn_return_type != 'void' or self.output != None
 
+       def has_different_protocol(self, name):
+               """Returns true if the named version of the function uses different protocol from the other versions.
+               
+               Some functions, such as glDeleteTextures and
+               glDeleteTexturesEXT are functionally identical, but have
+               different protocol.  This function returns true if the
+               named function is an alias name and that named version uses
+               different protocol from the function that is aliased.
+               """
 
-class GlxProto(gl_XML.FilterGLAPISpecBase):
-       name = "glX_proto_send.py (from Mesa)"
+               return (name in self.glx_vendorpriv_names) and self.glx_sop
 
-       def __init__(self):
-               gl_XML.FilterGLAPISpecBase.__init__(self)
-               self.factory = glXItemFactory()
-               self.glx_enum_functions = {}
 
+       def static_glx_name(self, name):
+               if self.has_different_protocol(name):
+                       for n in self.glx_vendorpriv_names:
+                               if n in self.static_entry_points:
+                                       return n
+                               
+               return self.static_name(name)
 
-       def endElement(self, name):
-               if name == 'OpenGLAPI':
-                       # Once all the parsing is done, we have to go back and
-                       # fix-up some cross references between different
-                       # functions.
 
-                       for k in self.functions:
-                               f = self.functions[k]
-                               if f.vectorequiv != None:
-                                       equiv = self.find_function(f.vectorequiv)
-                                       if equiv != None:
-                                               f.glx_doubles_in_order = equiv.glx_doubles_in_order
-                                               f.glx_rop = equiv.glx_rop
-                                       else:
-                                               raise RuntimeError("Could not find the vector equiv. function %s for %s!" % (f.name, f.vectorequiv))
-               else:
-                       gl_XML.FilterGLAPISpecBase.endElement(self, name)
+       def client_supported_for_indirect(self):
+               """Returns true if the function is supported on the client
+               side for indirect rendering."""
+
+               return not self.ignore and (self.offset != -1) and (self.glx_rop or self.glx_sop or self.glx_vendorpriv or self.vectorequiv or self.client_handcode)
+
+
+class glx_function_iterator:
+       """Class to iterate over a list of glXFunctions"""
+
+       def __init__(self, context):
+               self.iterator = context.functionIterateByOffset()
                return
+
+
+       def __iter__(self):
+               return self
+
+
+       def next(self):
+               f = self.iterator.next()
+
+               if f.client_supported_for_indirect():
+                       return f
+               else:
+                       return self.next()
+
+
+class glx_api(gl_XML.gl_api):
+       def functionIterateGlx(self):
+               return glx_function_iterator(self)
+