git update 19 nov 2012

fontconfig: c20ac78b01df3f0919352bba16b5b48b3b5d4d6d
libxcb: 76a2166de9c80b35f987fdc3f3a228bafa0de94e
mesa: ddb901fbf4489ffcd85d3320f23913eb1d4fbdfe
pixman: 44dd746bb68625b2f6be77c3f80292b45defe9d7
xserver: 6a6c3afe71ac82a93d9fd0034dd5bbdcf0eae1ea
xkeyboard-config: 709e05c069428236ca2567e784c9971eecc8ca50

1 files changed, 2 insertions, 50 deletions

diff --git a/mesalib/src/mapi/glapi/gen/gl_XML.py b/mesalib/src/mapi/glapi/gen/gl_XML.py
index 47f8dd5b9..227e9fcd9 100644
--- a/mesalib/src/mapi/glapi/gen/gl_XML.py
+++ b/mesalib/src/mapi/glapi/gen/gl_XML.py
@@ -594,47 +594,6 @@ class gl_parameter(object):
             return self.type_expr.format_string()
 
 
-# Regular expression used to parse "mesa_name" attributes.  A
-# mesa_name attribute describes how to adjust a GL function name
-# suffix to obtain the name of the function in Mesa that implements
-# the functionality.  The attribute string consists of a part preceded
-# by a "-", indicating the suffix to remove, and a part preceded by a
-# "+" indicating the suffix to add.  Either part is optional.
-#
-# For example:
-#
-#   <function name="EnableIndexedEXT" mesa_name="-EXT">...</function>
-#   <function name="IsProgramNV" mesa_name="-NV+ARB">...</function>
-#
-# means that EnableIndexedEXT is implemented by a Mesa function called
-# _mesa_EnableIndexed, and IsProgramNV is implemented by a Mesa function
-# called _mesa_IsProgramARB.
-#
-# Note: the prefix "_mesa_" is handled separately, by the "exec"
-# attribute.
-name_modification_regexp = re.compile(
-    r'^(-(?P<minus>[a-zA-Z0-9_]+))?(\+(?P<plus>[a-zA-Z0-9_]+))?$')
-
-
-# Interpret a "mesa_name" attribute (see above) to determine the
-# appropriate suffix for the Mesa function implementing a piece of GL
-# functionality, and return the properly suffixed name.
-def interpret_name_modification(name, mod):
-    m = name_modification_regexp.match(mod)
-    if m is None:
-        raise Exception('Unintelligible mesa_name property: {0!r}'.format(mod))
-    new_name = name
-    if m.group('minus'):
-        if not new_name.endswith(m.group('minus')):
-            raise Exception(
-                'Cannot subtract suffix {0!r} from function {1}'.format(
-                    m.group('minus'), name))
-        new_name = new_name[:-len(m.group('minus'))]
-    if m.group('plus'):
-        new_name += m.group('plus')
-    return new_name
-
-
 class gl_function( gl_item ):
     def __init__(self, element, context):
         self.context = context
@@ -649,7 +608,6 @@ class gl_function( gl_item ):
         self.exec_flavor = 'mesa'
         self.desktop = True
         self.deprecated = None
-        self.mesa_name = None
 
         # self.entry_point_api_map[name][api] is a decimal value
         # indicating the earliest version of the given API in which
@@ -725,8 +683,8 @@ class gl_function( gl_item ):
         else:
             true_name = name
 
-            # Only try to set the offset and mesa_name when a
-            # non-alias entry-point is being processed.
+            # Only try to set the offset when a non-alias entry-point
+            # is being processed.
 
             offset = element.nsProp( "offset", None )
             if offset:
@@ -738,12 +696,6 @@ class gl_function( gl_item ):
                     if offset == "assign":
                         self.assign_offset = 1
 
-            mesa_name = element.nsProp('mesa_name', None)
-            if mesa_name is None:
-                self.mesa_name = name
-            else:
-                self.mesa_name = interpret_name_modification(name, mesa_name)
-
 
         if not self.name:
             self.name = true_name