fontconfig libX11 libxcb libxcb/xcb-proto mesa xserver xkbcomp xkeyboard-config git update 29 Nov 2014

xserver          commit c52a2b1ebad56820af932dfbc871701a8b04fd9c
libxcb           commit bbca7b82f803fa13fd30a2891ec06f2a213a28c2
libxcb/xcb-proto commit 691d2b97e5989d6d7006304d81bd8fa128477ca1
xkeyboard-config commit b664d7fb8aab9b0f834dd9c81d273c7809561b34
libX11           commit f3831dde6972e4da9e018c6a5f4013d8756a5e78
xkbcomp          commit 1e8ee9d0aad072f04186df84752f5636340574e0
fontconfig       commit b732bf057f4b3ec3bac539803005e9c42d056b2a
mesa             commit 67c498086d0858a94d53ebb6921cfda847250368

7 files changed, 14 insertions, 662 deletions

diff --git a/mesalib/src/mapi/glapi/SConscript b/mesalib/src/mapi/glapi/SConscript
index bc1c43aa8..97ebfe638 100644
--- a/mesalib/src/mapi/glapi/SConscript
+++ b/mesalib/src/mapi/glapi/SConscript
@@ -16,6 +16,7 @@ if env['platform'] == 'windows':
     env.Append(CPPDEFINES = [
         '_GDI32_', # prevent gl* being declared __declspec(dllimport) in MS headers
         'BUILD_GL32', # declare gl* as __declspec(dllexport) in Mesa headers
+        'KHRONOS_DLL_EXPORTS', # declare gl* as __declspec(dllexport) in Khronos headers
     ])
     if env['gles']:
         env.Append(CPPDEFINES = ['_GLAPI_DLL_EXPORTS'])
diff --git a/mesalib/src/mapi/glapi/gen/KHR_context_flush_control.xml b/mesalib/src/mapi/glapi/gen/KHR_context_flush_control.xml
new file mode 100644
index 000000000..bc724357b
--- /dev/null
+++ b/mesalib/src/mapi/glapi/gen/KHR_context_flush_control.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<!DOCTYPE OpenGLAPI SYSTEM "gl_API.dtd">
+
+<OpenGLAPI>
+
+<category name="GL_KHR_context_flush_control" number="168">
+    <enum name="CONTEXT_RELEASE_BEHAVIOR"            value="0x82FB"/>
+    <enum name="CONTEXT_RELEASE_BEHAVIOR_FLUSH"      value="0x82FC"/>
+</category>
+
+</OpenGLAPI>
diff --git a/mesalib/src/mapi/glapi/gen/Makefile.am b/mesalib/src/mapi/glapi/gen/Makefile.am
index 72e5095ee..7f76f1971 100644
--- a/mesalib/src/mapi/glapi/gen/Makefile.am
+++ b/mesalib/src/mapi/glapi/gen/Makefile.am
@@ -61,12 +61,10 @@ EXTRA_DIST= \
 	$(MESA_GLAPI_DIR)/glapi_x86-64.S \
 	$(MESA_GLAPI_DIR)/glapi_sparc.S \
 	$(COMMON_GLX) \
-	extension_helper.py \
 	gl_apitemp.py \
 	gl_enums.py \
 	gl_genexec.py \
 	gl_gentable.py \
-	gl_offsets.py \
 	gl_procs.py \
 	gl_SPARC_asm.py \
 	gl_table.py \
@@ -76,7 +74,6 @@ EXTRA_DIST= \
 	glX_proto_send.py \
 	glX_proto_size.py \
 	glX_server_table.py \
-	mesadef.py \
 	remap_helper.py \
 	gl_API.dtd
 
diff --git a/mesalib/src/mapi/glapi/gen/extension_helper.py b/mesalib/src/mapi/glapi/gen/extension_helper.py
deleted file mode 100644
index da633dc61..000000000
--- a/mesalib/src/mapi/glapi/gen/extension_helper.py
+++ /dev/null
@@ -1,324 +0,0 @@
-#!/usr/bin/env python
-
-# (C) Copyright IBM Corporation 2005
-# All Rights Reserved.
-#
-# 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
-# on the rights to use, copy, modify, merge, publish, distribute, sub
-# license, and/or sell copies of the Software, and to permit persons to whom
-# the Software is furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice (including the next
-# paragraph) shall be included in all copies or substantial portions of the
-# Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.  IN NO EVENT SHALL
-# IBM AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-# IN THE SOFTWARE.
-#
-# Authors:
-#    Ian Romanick <idr@us.ibm.com>
-
-import gl_XML
-import license
-import sys, getopt, string
-
-vtxfmt = [
-    "ArrayElement", \
-    "Color3f", \
-    "Color3fv", \
-    "Color4f", \
-    "Color4fv", \
-    "EdgeFlag", \
-    "EdgeFlagv", \
-    "EvalCoord1f", \
-    "EvalCoord1fv", \
-    "EvalCoord2f", \
-    "EvalCoord2fv", \
-    "EvalPoint1", \
-    "EvalPoint2", \
-    "FogCoordfEXT", \
-    "FogCoordfvEXT", \
-    "Indexf", \
-    "Indexfv", \
-    "Materialfv", \
-    "MultiTexCoord1fARB", \
-    "MultiTexCoord1fvARB", \
-    "MultiTexCoord2fARB", \
-    "MultiTexCoord2fvARB", \
-    "MultiTexCoord3fARB", \
-    "MultiTexCoord3fvARB", \
-    "MultiTexCoord4fARB", \
-    "MultiTexCoord4fvARB", \
-    "Normal3f", \
-    "Normal3fv", \
-    "SecondaryColor3fEXT", \
-    "SecondaryColor3fvEXT", \
-    "TexCoord1f", \
-    "TexCoord1fv", \
-    "TexCoord2f", \
-    "TexCoord2fv", \
-    "TexCoord3f", \
-    "TexCoord3fv", \
-    "TexCoord4f", \
-    "TexCoord4fv", \
-    "Vertex2f", \
-    "Vertex2fv", \
-    "Vertex3f", \
-    "Vertex3fv", \
-    "Vertex4f", \
-    "Vertex4fv", \
-    "CallList", \
-    "CallLists", \
-    "Begin", \
-    "End", \
-    "VertexAttrib1fNV", \
-    "VertexAttrib1fvNV", \
-    "VertexAttrib2fNV", \
-    "VertexAttrib2fvNV", \
-    "VertexAttrib3fNV", \
-    "VertexAttrib3fvNV", \
-    "VertexAttrib4fNV", \
-    "VertexAttrib4fvNV", \
-    "VertexAttrib1fARB", \
-    "VertexAttrib1fvARB", \
-    "VertexAttrib2fARB", \
-    "VertexAttrib2fvARB", \
-    "VertexAttrib3fARB", \
-    "VertexAttrib3fvARB", \
-    "VertexAttrib4fARB", \
-    "VertexAttrib4fvARB", \
-    "Rectf", \
-    "DrawArrays", \
-    "DrawElements", \
-    "DrawRangeElements", \
-    "EvalMesh1", \
-    "EvalMesh2", \
-]
-
-def all_entrypoints_in_abi(f, abi, api):
-    for n in f.entry_points:
-        [category, num] = api.get_category_for_name( n )
-        if category not in abi:
-            return 0
-
-    return 1
-
-
-def any_entrypoints_in_abi(f, abi, api):
-    for n in f.entry_points:
-        [category, num] = api.get_category_for_name( n )
-        if category in abi:
-            return 1
-
-    return 0
-
-
-def condition_for_function(f, abi, all_not_in_ABI):
-    """Create a C-preprocessor condition for the function.
-
-    There are two modes of operation.  If all_not_in_ABI is set, a
-    condition is only created is all of the entry-point names for f are
-    not in the selected ABI.  If all_not_in_ABI is not set, a condition
-    is created if any entryp-point name is not in the selected ABI.
-    """
-
-    condition = []
-    for n in f.entry_points:
-        [category, num] = api.get_category_for_name( n )
-        if category not in abi:
-            condition.append( 'defined(need_%s)' % (gl_XML.real_category_name( category )) )
-        elif all_not_in_ABI:
-            return []
-
-    return condition
-
-
-class PrintGlExtensionGlue(gl_XML.gl_print_base):
-    def __init__(self):
-        gl_XML.gl_print_base.__init__(self)
-
-        self.name = "extension_helper.py (from Mesa)"
-        self.license = license.bsd_license_template % ("(C) Copyright IBM Corporation 2005", "IBM")
-        return
-
-
-    def printRealHeader(self):
-        print '#include "utils.h"'
-        print '#include "main/dispatch.h"'
-        print ''
-        return
-
-
-    def printBody(self, api):
-        abi = [ "1.0", "1.1", "1.2", "GL_ARB_multitexture" ]
-
-        category_list = {}
-
-        print '#ifndef NULL'
-        print '# define NULL 0'
-        print '#endif'
-        print ''
-
-        for f in api.functionIterateAll():
-            condition = condition_for_function(f, abi, 0)
-            if len(condition):
-                print '#if %s' % (string.join(condition, " || "))
-                print 'static const char %s_names[] =' % (f.name)
-
-                parameter_signature = ''
-                for p in f.parameterIterator():
-                    if p.is_padding:
-                        continue
-
-                    # FIXME: This is a *really* ugly hack. :(
-
-                    tn = p.type_expr.get_base_type_node()
-                    if p.is_pointer():
-                        parameter_signature += 'p'
-                    elif tn.integer:
-                        parameter_signature += 'i'
-                    elif tn.size == 4:
-                        parameter_signature += 'f'
-                    else:
-                        parameter_signature += 'd'
-
-                print '    "%s\\0" /* Parameter signature */' % (parameter_signature)
-
-                for n in f.entry_points:
-                    print '    "gl%s\\0"' % (n)
-
-                    [category, num] = api.get_category_for_name( n )
-                    if category not in abi:
-                        c = gl_XML.real_category_name(category)
-                        if not category_list.has_key(c):
-                            category_list[ c ] = []
-
-                        category_list[ c ].append( f )
-
-                print '    "";'
-                print '#endif'
-                print ''
-
-        keys = category_list.keys()
-        keys.sort()
-
-        for category in keys:
-            print '#if defined(need_%s)' % (category)
-            print 'static const struct dri_extension_function %s_functions[] = {' % (category)
-
-            for f in category_list[ category ]:
-                # A function either has an offset that is
-                # assigned by the ABI, or it has a remap
-                # index.
-                if any_entrypoints_in_abi(f, abi, api):
-                    index_name = "-1"
-                    offset = f.offset
-                else:
-                    index_name = "%s_remap_index" % (f.name)
-                    offset = -1
-
-                print '    { %s_names, %s, %d },' % (f.name, index_name, offset)
-
-
-            print '    { NULL, 0, 0 }'
-            print '};'
-            print '#endif'
-            print ''
-
-        return
-
-
-class PrintInitDispatch(gl_XML.gl_print_base):
-    def __init__(self):
-        gl_XML.gl_print_base.__init__(self)
-
-        self.name = "extension_helper.py (from Mesa)"
-        self.license = license.bsd_license_template % ("(C) Copyright IBM Corporation 2005", "IBM")
-        return
-
-
-    def do_function_body(self, api, abi, vtxfmt_only):
-        last_condition_string = None
-        for f in api.functionIterateByOffset():
-            if (f.name in vtxfmt) and not vtxfmt_only:
-                continue
-
-            if (f.name not in vtxfmt) and vtxfmt_only:
-                continue
-
-            condition = condition_for_function(f, abi, 1)
-            condition_string = string.join(condition, " || ")
-
-            if condition_string != last_condition_string:
-                if last_condition_string:
-                    print '#endif /* %s */' % (last_condition_string)
-
-                if condition_string:
-                    print '#if %s' % (condition_string)
-
-            if vtxfmt_only:
-                print '   disp->%s = vfmt->%s;' % (f.name, f.name)
-            else:
-                print '   disp->%s = _mesa_%s;' % (f.name, f.name)
-
-            last_condition_string = condition_string
-
-        if last_condition_string:
-            print '#endif /* %s */' % (last_condition_string)
-
-
-
-    def printBody(self, api):
-        abi = [ "1.0", "1.1", "1.2", "GL_ARB_multitexture" ]
-
-        print 'void driver_init_exec_table(struct _glapi_table *disp)'
-        print '{'
-        self.do_function_body(api, abi, 0)
-        print '}'
-        print ''
-        print 'void driver_install_vtxfmt(struct _glapi_table *disp, const GLvertexformat *vfmt)'
-        print '{'
-        self.do_function_body(api, abi, 1)
-        print '}'
-
-        return
-
-
-def show_usage():
-    print "Usage: %s [-f input_file_name] [-m output_mode]" % sys.argv[0]
-    print "    -m output_mode   Output mode can be one of 'extensions' or 'exec_init'."
-    sys.exit(1)
-
-if __name__ == '__main__':
-    file_name = "gl_API.xml"
-
-    try:
-        (args, trail) = getopt.getopt(sys.argv[1:], "f:m:")
-    except Exception,e:
-        show_usage()
-
-    mode = "extensions"
-    for (arg,val) in args:
-        if arg == "-f":
-            file_name = val
-        if arg == '-m':
-            mode = val
-
-
-    api = gl_XML.parse_GL_API( file_name )
-
-    if mode == "extensions":
-        printer = PrintGlExtensionGlue()
-    elif mode == "exec_init":
-        printer = PrintInitDispatch()
-    else:
-        show_usage()
-
-    printer.Print( api )
diff --git a/mesalib/src/mapi/glapi/gen/gl_API.xml b/mesalib/src/mapi/glapi/gen/gl_API.xml
index 534e6a0b4..e1b12462e 100644
--- a/mesalib/src/mapi/glapi/gen/gl_API.xml
+++ b/mesalib/src/mapi/glapi/gen/gl_API.xml
@@ -8379,6 +8379,8 @@
 
 <xi:include href="ARB_texture_barrier.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 
+<xi:include href="KHR_context_flush_control.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+
 <!-- Non-ARB extensions sorted by extension number. -->
 
 <category name="GL_EXT_blend_color" number="2">
diff --git a/mesalib/src/mapi/glapi/gen/gl_offsets.py b/mesalib/src/mapi/glapi/gen/gl_offsets.py
deleted file mode 100644
index 897ac18ae..000000000
--- a/mesalib/src/mapi/glapi/gen/gl_offsets.py
+++ /dev/null
@@ -1,120 +0,0 @@
-#!/usr/bin/env python
-
-# (C) Copyright IBM Corporation 2004, 2005
-# All Rights Reserved.
-#
-# 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
-# on the rights to use, copy, modify, merge, publish, distribute, sub
-# license, and/or sell copies of the Software, and to permit persons to whom
-# the Software is furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice (including the next
-# paragraph) shall be included in all copies or substantial portions of the
-# Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.  IN NO EVENT SHALL
-# IBM AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-# IN THE SOFTWARE.
-#
-# Authors:
-#    Ian Romanick <idr@us.ibm.com>
-
-import gl_XML
-import license
-import sys, getopt
-
-class PrintGlOffsets(gl_XML.gl_print_base):
-    def __init__(self, es=False):
-        gl_XML.gl_print_base.__init__(self)
-
-        self.es = es
-        self.name = "gl_offsets.py (from Mesa)"
-        self.header_tag = '_GLAPI_OFFSETS_H_'
-        self.license = license.bsd_license_template % ( \
-"""Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
-(C) Copyright IBM Corporation 2004""", "BRIAN PAUL, IBM")
-        return
-
-    def printBody(self, api):
-        print '/* this file should not be included directly in mesa */'
-        print ''
-
-        functions = []
-        abi_functions = []
-        alias_functions = []
-        count = 0
-        for f in api.functionIterateByOffset():
-            if not f.is_abi():
-                functions.append( [f, count] )
-                count += 1
-            else:
-                abi_functions.append( f )
-
-            if self.es:
-                # remember functions with aliases
-                if len(f.entry_points) > 1:
-                    alias_functions.append(f)
-
-        for f in abi_functions:
-            print '#define _gloffset_%s %d' % (f.name, f.offset)
-            last_static = f.offset
-
-        print ''
-        print '#if !defined(_GLAPI_USE_REMAP_TABLE)'
-        print ''
-
-        for [f, index] in functions:
-            print '#define _gloffset_%s %d' % (f.name, f.offset)
-
-        print '#define _gloffset_FIRST_DYNAMIC %d' % (api.next_offset)
-
-        print ''
-        print '#else'
-        print ''
-
-        for [f, index] in functions:
-            print '#define _gloffset_%s driDispatchRemapTable[%s_remap_index]' % (f.name, f.name)
-
-        print ''
-        print '#endif /* !defined(_GLAPI_USE_REMAP_TABLE) */'
-
-        if alias_functions:
-            print ''
-            print '/* define aliases for compatibility */'
-            for f in alias_functions:
-                for name in f.entry_points:
-                    if name != f.name:
-                        print '#define _gloffset_%s _gloffset_%s' % (name, f.name)
-        return
-
-
-def show_usage():
-    print "Usage: %s [-f input_file_name] [-c]" % sys.argv[0]
-    print "    -c        Enable compatibility with OpenGL ES."
-    sys.exit(1)
-
-if __name__ == '__main__':
-    file_name = "gl_API.xml"
-
-    try:
-        (args, trail) = getopt.getopt(sys.argv[1:], "f:c")
-    except Exception,e:
-        show_usage()
-
-    es = False
-    for (arg,val) in args:
-        if arg == "-f":
-            file_name = val
-        elif arg == "-c":
-            es = True
-
-    api = gl_XML.parse_GL_API( file_name )
-
-    printer = PrintGlOffsets(es)
-    printer.Print( api )
diff --git a/mesalib/src/mapi/glapi/gen/mesadef.py b/mesalib/src/mapi/glapi/gen/mesadef.py
deleted file mode 100644
index 77cc4a350..000000000
--- a/mesalib/src/mapi/glapi/gen/mesadef.py
+++ /dev/null
@@ -1,215 +0,0 @@
-#!/usr/bin/env python
-
-
-# Mesa 3-D graphics library
-# 
-# Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
-# 
-# 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
-# the rights to use, copy, modify, merge, publish, distribute, sublicense,
-# and/or sell copies of the Software, and to permit persons to whom the
-# Software is furnished to do so, subject to the following conditions:
-# 
-# The above copyright notice and this permission notice shall be included
-# in all copies or substantial portions of the Software.
-# 
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
-# OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-# ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-# OTHER DEALINGS IN THE SOFTWARE.
-
-
-# Generate the mesa.def file for Windows.
-#
-# Usage:
-#    mesadef.py >mesa.def
-#    Then copy to src/mesa/drivers/windows/gdi
-#
-# Dependencies:
-#    The apispec file must be in the current directory.
-
-
-
-import apiparser
-import string
-
-
-def PrintHead():
-    print '; DO NOT EDIT - This file generated automatically by mesadef.py script'
-    print 'DESCRIPTION \'Mesa (OpenGL work-alike) for Win32\''
-    print 'VERSION 6.0'
-    print ';'
-    print '; Module definition file for Mesa (OPENGL32.DLL)'
-    print ';'
-    print '; Note: The OpenGL functions use the STDCALL'
-    print '; function calling convention.  Microsoft\'s'
-    print '; OPENGL32 uses this convention and so must the'
-    print '; Mesa OPENGL32 so that the Mesa DLL can be used'
-    print '; as a drop-in replacement.'
-    print ';'
-    print '; The linker exports STDCALL entry points with'
-    print '; \'decorated\' names; e.g., _glBegin@0, where the'
-    print '; trailing number is the number of bytes of '
-    print '; parameter data pushed onto the stack.  The'
-    print '; callee is responsible for popping this data'
-    print '; off the stack, usually via a RETF n instruction.'
-    print ';'
-    print '; However, the Microsoft OPENGL32.DLL does not export'
-    print '; the decorated names, even though the calling convention'
-    print '; is STDCALL.  So, this module definition file is'
-    print '; needed to force the Mesa OPENGL32.DLL to export the'
-    print '; symbols in the same manner as the Microsoft DLL.'
-    print '; Were it not for this problem, this file would not'
-    print '; be needed (for the gl* functions) since the entry'
-    print '; points are compiled with dllexport declspec.'
-    print ';'
-    print '; However, this file is still needed to export "internal"'
-    print '; Mesa symbols for the benefit of the OSMESA32.DLL.'
-    print ';'
-    print 'EXPORTS'
-    return
-#enddef
-
-
-def PrintTail():
-    print ';'
-    print '; WGL API'
-    print '\twglChoosePixelFormat'
-    print '\twglCopyContext'
-    print '\twglCreateContext'
-    print '\twglCreateLayerContext'
-    print '\twglDeleteContext'
-    print '\twglDescribeLayerPlane'
-    print '\twglDescribePixelFormat'
-    print '\twglGetCurrentContext'
-    print '\twglGetCurrentDC'
-    print '\twglGetExtensionsStringARB'
-    print '\twglGetLayerPaletteEntries'
-    print '\twglGetPixelFormat'
-    print '\twglGetProcAddress'
-    print '\twglMakeCurrent'
-    print '\twglRealizeLayerPalette'
-    print '\twglSetLayerPaletteEntries'
-    print '\twglSetPixelFormat'
-    print '\twglShareLists'
-    print '\twglSwapBuffers'
-    print '\twglSwapLayerBuffers'
-    print '\twglUseFontBitmapsA'
-    print '\twglUseFontBitmapsW'
-    print '\twglUseFontOutlinesA'
-    print '\twglUseFontOutlinesW'
-    print ';'
-    print '; Mesa internals - mostly for OSMESA'
-    print '\t_ac_CreateContext'
-    print '\t_ac_DestroyContext'
-    print '\t_ac_InvalidateState'
-    print '\t_glapi_get_context'
-    print '\t_glapi_get_proc_address'
-    print '\t_mesa_buffer_data'
-    print '\t_mesa_buffer_map'
-    print '\t_mesa_buffer_subdata'
-    print '\t_mesa_choose_tex_format'
-    print '\t_mesa_compressed_texture_size'
-    print '\t_mesa_create_framebuffer'
-    print '\t_mesa_create_visual'
-    print '\t_mesa_delete_buffer_object'
-    print '\t_mesa_delete_texture_object'
-    print '\t_mesa_destroy_framebuffer'
-    print '\t_mesa_destroy_visual'
-    print '\t_mesa_enable_1_3_extensions'
-    print '\t_mesa_enable_1_4_extensions'
-    print '\t_mesa_enable_1_5_extensions'
-    print '\t_mesa_enable_sw_extensions'
-    print '\t_mesa_error'
-    print '\t_mesa_free_context_data'
-    print '\t_mesa_get_current_context'
-    print '\t_mesa_init_default_imports'
-    print '\t_mesa_initialize_context'
-    print '\t_mesa_make_current'
-    print '\t_mesa_new_buffer_object'
-    print '\t_mesa_new_texture_object'
-    print '\t_mesa_problem'
-    print '\t_mesa_store_compressed_teximage1d'
-    print '\t_mesa_store_compressed_teximage2d'
-    print '\t_mesa_store_compressed_teximage3d'
-    print '\t_mesa_store_compressed_texsubimage1d'
-    print '\t_mesa_store_compressed_texsubimage2d'
-    print '\t_mesa_store_compressed_texsubimage3d'
-    print '\t_mesa_store_teximage1d'
-    print '\t_mesa_store_teximage2d'
-    print '\t_mesa_store_teximage3d'
-    print '\t_mesa_store_texsubimage1d'
-    print '\t_mesa_store_texsubimage2d'
-    print '\t_mesa_store_texsubimage3d'
-    print '\t_mesa_test_proxy_teximage'
-    print '\t_mesa_Viewport'
-    print '\t_mesa_meta_CopyColorSubTable'
-    print '\t_mesa_meta_CopyColorTable'
-    print '\t_mesa_meta_CopyConvolutionFilter1D'
-    print '\t_mesa_meta_CopyConvolutionFilter2D'
-    print '\t_mesa_meta_CopyTexImage1D'
-    print '\t_mesa_meta_CopyTexImage2D'
-    print '\t_mesa_meta_CopyTexSubImage1D'
-    print '\t_mesa_meta_CopyTexSubImage2D'
-    print '\t_mesa_meta_CopyTexSubImage3D'
-    print '\t_swrast_Accum'
-    print '\t_swrast_alloc_buffers'
-    print '\t_swrast_Bitmap'
-    print '\t_swrast_CopyPixels'
-    print '\t_swrast_DrawPixels'
-    print '\t_swrast_GetDeviceDriverReference'
-    print '\t_swrast_Clear'
-    print '\t_swrast_choose_line'
-    print '\t_swrast_choose_triangle'
-    print '\t_swrast_CreateContext'
-    print '\t_swrast_DestroyContext'
-    print '\t_swrast_InvalidateState'
-    print '\t_swrast_ReadPixels'
-    print '\t_swrast_zbuffer_address'
-    print '\t_swsetup_Wakeup'
-    print '\t_swsetup_CreateContext'
-    print '\t_swsetup_DestroyContext'
-    print '\t_swsetup_InvalidateState'
-    print '\t_tnl_CreateContext'
-    print '\t_tnl_DestroyContext'
-    print '\t_tnl_InvalidateState'
-    print '\t_tnl_MakeCurrent'
-    print '\t_tnl_run_pipeline'
-#enddef
-
-
-records = []
-
-def FindOffset(funcName):
-    for (name, alias, offset) in records:
-        if name == funcName:
-            return offset
-        #endif
-    #endfor
-    return -1
-#enddef
-
-
-def EmitEntry(name, returnType, argTypeList, argNameList, alias, offset):
-    if alias == '':
-        dispatchName = name
-    else:
-        dispatchName = alias
-    if offset < 0:
-        offset = FindOffset(dispatchName)
-    if offset >= 0 and string.find(name, "unused") == -1:
-        print '\tgl%s' % (name)
-        # save this info in case we need to look up an alias later
-        records.append((name, dispatchName, offset))
-
-#enddef
-
-
-PrintHead()
-apiparser.ProcessSpecFile("APIspec", EmitEntry)
-PrintTail()