--- mesa-7.7.1.orig/src/mesa/glapi/gl_apitemp.py
+++ mesa-7.7.1/src/mesa/glapi/gl_apitemp.py
@@ -0,0 +1,253 @@
+#!/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, glX_XML
+import license
+import sys, getopt
+
+class PrintGlOffsets(gl_XML.gl_print_base):
+	def __init__(self):
+		gl_XML.gl_print_base.__init__(self)
+
+		self.name = "gl_apitemp.py (from Mesa)"
+		self.license = license.bsd_license_template % ( \
+"""Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
+(C) Copyright IBM Corporation 2004""", "BRIAN PAUL, IBM")
+
+		self.undef_list.append( "KEYWORD1" )
+		self.undef_list.append( "KEYWORD1_ALT" )
+		self.undef_list.append( "KEYWORD2" )
+		self.undef_list.append( "NAME" )
+		self.undef_list.append( "DISPATCH" )
+		self.undef_list.append( "RETURN_DISPATCH" )
+		self.undef_list.append( "DISPATCH_TABLE_NAME" )
+		self.undef_list.append( "UNUSED_TABLE_NAME" )
+		self.undef_list.append( "TABLE_ENTRY" )
+
+
+	def printFunction(self, f, name):
+		p_string = ""
+		o_string = ""
+		t_string = ""
+		comma = ""
+
+		if f.is_static_entry_point(name):
+			keyword = "KEYWORD1"
+		else:
+			keyword = "KEYWORD1_ALT"
+
+		n = f.static_name(name)
+
+		for p in f.parameterIterator():
+			if p.is_padding:
+				continue
+
+			if p.is_pointer():
+				cast = "(const void *) "
+			else:
+				cast = ""
+
+			t_string = t_string + comma + p.format_string()
+			p_string = p_string + comma + p.name
+			o_string = o_string + comma + cast + p.name
+			comma = ", "
+
+
+		if f.return_type != 'void':
+			dispatch = "RETURN_DISPATCH"
+		else:
+			dispatch = "DISPATCH"
+
+		if f.has_different_protocol(name):
+			print '#ifndef GLX_INDIRECT_RENDERING'
+
+		if not f.is_static_entry_point(name):
+			print '%s %s KEYWORD2 NAME(%s)(%s);' % (keyword, f.return_type, n, f.get_parameter_string(name))
+			print ''
+
+		print '%s %s KEYWORD2 NAME(%s)(%s)' % (keyword, f.return_type, n, f.get_parameter_string(name))
+		print '{'
+		if p_string == "":
+			print '   %s(%s, (), (F, "gl%s();\\n"));' \
+				% (dispatch, f.name, name)
+		else:
+			print '   %s(%s, (%s), (F, "gl%s(%s);\\n", %s));' \
+				% (dispatch, f.name, p_string, name, t_string, o_string)
+		print '}'
+		if f.has_different_protocol(name):
+			print '#endif /* GLX_INDIRECT_RENDERING */'
+		print ''
+		return
+
+	def printRealHeader(self):
+		print ''
+		self.printVisibility( "HIDDEN", "hidden" )
+		print """
+/*
+ * This file is a template which generates the OpenGL API entry point
+ * functions.  It should be included by a .c file which first defines
+ * the following macros:
+ *   KEYWORD1 - usually nothing, but might be __declspec(dllexport) on Win32
+ *   KEYWORD2 - usually nothing, but might be __stdcall on Win32
+ *   NAME(n)  - builds the final function name (usually add "gl" prefix)
+ *   DISPATCH(func, args, msg) - code to do dispatch of named function.
+ *                               msg is a printf-style debug message.
+ *   RETURN_DISPATCH(func, args, msg) - code to do dispatch with a return value
+ *
+ * Here is an example which generates the usual OpenGL functions:
+ *   #define KEYWORD1
+ *   #define KEYWORD2
+ *   #define NAME(func)  gl##func
+ *   #define DISPATCH(func, args, msg)                           \\
+ *          struct _glapi_table *dispatch = CurrentDispatch;     \\
+ *          (*dispatch->func) args
+ *   #define RETURN DISPATCH(func, args, msg)                    \\
+ *          struct _glapi_table *dispatch = CurrentDispatch;     \\
+ *          return (*dispatch->func) args
+ *
+ */
+
+
+#if defined( NAME )
+#ifndef KEYWORD1
+#define KEYWORD1
+#endif
+
+#ifndef KEYWORD1_ALT
+#define KEYWORD1_ALT HIDDEN
+#endif
+
+#ifndef KEYWORD2
+#define KEYWORD2
+#endif
+
+#ifndef DISPATCH
+#error DISPATCH must be defined
+#endif
+
+#ifndef RETURN_DISPATCH
+#error RETURN_DISPATCH must be defined
+#endif
+
+"""
+		return
+
+    
+
+	def printInitDispatch(self, api):
+		print """
+#endif /* defined( NAME ) */
+
+/*
+ * This is how a dispatch table can be initialized with all the functions
+ * we generated above.
+ */
+#ifdef DISPATCH_TABLE_NAME
+
+#ifndef TABLE_ENTRY
+#error TABLE_ENTRY must be defined
+#endif
+
+static _glapi_proc DISPATCH_TABLE_NAME[] = {"""
+		for f in api.functionIterateByOffset():
+			print '   TABLE_ENTRY(%s),' % (f.dispatch_name())
+
+		print '   /* A whole bunch of no-op functions.  These might be called'
+		print '    * when someone tries to call a dynamically-registered'
+		print '    * extension function without a current rendering context.'
+		print '    */'
+		for i in range(1, 100):
+			print '   TABLE_ENTRY(Unused),'
+
+		print '};'
+		print '#endif /* DISPATCH_TABLE_NAME */'
+		print ''
+		return
+
+
+	def printAliasedTable(self, api):
+		print """
+/*
+ * This is just used to silence compiler warnings.
+ * We list the functions which are not otherwise used.
+ */
+#ifdef UNUSED_TABLE_NAME
+static _glapi_proc UNUSED_TABLE_NAME[] = {"""
+
+		for f in api.functionIterateByOffset():
+			for n in f.entry_points:
+				if n != f.name:
+					if f.is_static_entry_point(n):
+						text = '   TABLE_ENTRY(%s),' % (n)
+
+						if f.has_different_protocol(n):
+							print '#ifndef GLX_INDIRECT_RENDERING'
+							print text
+							print '#endif'
+						else:
+							print text
+		print '};'
+		print '#endif /*UNUSED_TABLE_NAME*/'
+		print ''
+		return
+
+
+	def printBody(self, api):
+		for func in api.functionIterateByOffset():
+			got_stub = 0
+			for n in func.entry_points:
+				if func.is_static_entry_point(n):
+					self.printFunction(func, n)
+				elif not got_stub:
+					self.printFunction(func, n)
+					got_stub = 1
+
+		self.printInitDispatch(api)
+		self.printAliasedTable(api)
+		return
+
+
+def show_usage():
+	print "Usage: %s [-f input_file_name]" % sys.argv[0]
+	sys.exit(1)
+
+if __name__ == '__main__':
+	file_name = "gl_API.xml"
+    
+	try:
+		(args, trail) = getopt.getopt(sys.argv[1:], "f:")
+	except Exception,e:
+		show_usage()
+
+	for (arg,val) in args:
+		if arg == "-f":
+			file_name = val
+
+	api = gl_XML.parse_GL_API(file_name, glX_XML.glx_item_factory())
+
+	printer = PrintGlOffsets()
+	printer.Print(api)
