xserver and mesa git update 28-12-2010

1 files changed, 215 insertions, 215 deletions

diff --git a/mesalib/src/mapi/glapi/gen/gl_procs.py b/mesalib/src/mapi/glapi/gen/gl_procs.py
index 5de61fbdf..f1522baec 100644
--- a/mesalib/src/mapi/glapi/gen/gl_procs.py
+++ b/mesalib/src/mapi/glapi/gen/gl_procs.py
@@ -1,215 +1,215 @@
-#!/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 license
-import gl_XML, glX_XML
-import sys, getopt
-
-class PrintGlProcs(gl_XML.gl_print_base):
-	def __init__(self, long_strings, es=False):
-		gl_XML.gl_print_base.__init__(self)
-
-		self.es = es
-		self.long_strings = long_strings
-		self.name = "gl_procs.py (from Mesa)"
-		self.license = license.bsd_license_template % ( \
-"""Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
-(C) Copyright IBM Corporation 2004, 2006""", "BRIAN PAUL, IBM")
-
-
-	def printRealHeader(self):
-		print """
-/* This file is only included by glapi.c and is used for
- * the GetProcAddress() function
- */
-
-typedef struct {
-    GLint Name_offset;
-#if defined(NEED_FUNCTION_POINTER) || defined(GLX_INDIRECT_RENDERING)
-    _glapi_proc Address;
-#endif
-    GLuint Offset;
-} glprocs_table_t;
-
-#if   !defined(NEED_FUNCTION_POINTER) && !defined(GLX_INDIRECT_RENDERING)
-#  define NAME_FUNC_OFFSET(n,f1,f2,f3,o) { n , o }
-#elif  defined(NEED_FUNCTION_POINTER) && !defined(GLX_INDIRECT_RENDERING)
-#  define NAME_FUNC_OFFSET(n,f1,f2,f3,o) { n , (_glapi_proc) f1 , o }
-#elif  defined(NEED_FUNCTION_POINTER) &&  defined(GLX_INDIRECT_RENDERING)
-#  define NAME_FUNC_OFFSET(n,f1,f2,f3,o) { n , (_glapi_proc) f2 , o }
-#elif !defined(NEED_FUNCTION_POINTER) &&  defined(GLX_INDIRECT_RENDERING)
-#  define NAME_FUNC_OFFSET(n,f1,f2,f3,o) { n , (_glapi_proc) f3 , o }
-#endif
-
-"""
-		return
-
-	def printRealFooter(self):
-		print ''
-		print '#undef NAME_FUNC_OFFSET'
-		return
-
-	def printFunctionString(self, name):
-		if self.long_strings:
-			print '    "gl%s\\0"' % (name)
-		else:
-			print "    'g','l',",
-			for c in name:
-				print "'%s'," % (c),
-			
-			print "'\\0',"
-
-
-	def printBody(self, api):
-		print ''
-		if self.long_strings:
-			print 'static const char gl_string_table[] ='
-		else:
-			print 'static const char gl_string_table[] = {'
-
-		base_offset = 0
-		table = []
-		for func in api.functionIterateByOffset():
-			name = func.dispatch_name()
-			self.printFunctionString(func.name)
-			table.append((base_offset, "gl" + name, "gl" + name, "NULL", func.name))
-
-			# The length of the function's name, plus 2 for "gl",
-			# plus 1 for the NUL.
-
-			base_offset += len(func.name) + 3
-
-
-		for func in api.functionIterateByOffset():
-			for n in func.entry_points:
-				if n != func.name:
-					name = func.dispatch_name()
-					self.printFunctionString( n )
-					
-					if func.has_different_protocol(n):
-						alt_name = "gl" + func.static_glx_name(n)
-						table.append((base_offset, "gl" + name, alt_name, alt_name, func.name))
-					else:
-						table.append((base_offset, "gl" + name, "gl" + name, "NULL", func.name))
-
-					base_offset += len(n) + 3
-
-
-		if self.long_strings:
-			print '    ;'
-		else:
-			print '};'
-
-		print ''
-		print ''
-		print "#ifdef USE_MGL_NAMESPACE"
-		for func in api.functionIterateByOffset():
-			for n in func.entry_points:
-				if (not func.is_static_entry_point(func.name)) or (func.has_different_protocol(n) and not func.is_static_entry_point(n)):
-					print '#define gl_dispatch_stub_%u mgl_dispatch_stub_%u' % (func.offset, func.offset)
-					break
-		print "#endif /* USE_MGL_NAMESPACE */"
-		print ''
-		print ''
-		print '#if defined(NEED_FUNCTION_POINTER) || defined(GLX_INDIRECT_RENDERING)'
-		for func in api.functionIterateByOffset():
-			for n in func.entry_points:
-				if (not func.is_static_entry_point(func.name)) or (func.has_different_protocol(n) and not func.is_static_entry_point(n)):
-					print '%s GLAPIENTRY gl_dispatch_stub_%u(%s);' % (func.return_type, func.offset, func.get_parameter_string())
-					break
-
-		if self.es:
-			categories = {}
-			for func in api.functionIterateByOffset():
-				for n in func.entry_points:
-					cat, num = api.get_category_for_name(n)
-					if (cat.startswith("es") or cat.startswith("GL_OES")):
-						if not categories.has_key(cat):
-							categories[cat] = []
-						proto = 'GLAPI %s GLAPIENTRY %s(%s);' \
-								% (func.return_type, "gl" + n, func.get_parameter_string(n))
-						categories[cat].append(proto)
-			if categories:
-				print ''
-				print '/* OpenGL ES specific prototypes */'
-				print ''
-				keys = categories.keys()
-				keys.sort()
-				for key in keys:
-					print '/* category %s */' % key
-					print "\n".join(categories[key])
-				print ''
-
-		print '#endif /* defined(NEED_FUNCTION_POINTER) || defined(GLX_INDIRECT_RENDERING) */'
-
-		print ''
-		print 'static const glprocs_table_t static_functions[] = {'
-
-		for info in table:
-			print '    NAME_FUNC_OFFSET(%5u, %s, %s, %s, _gloffset_%s),' % info
-
-		print '    NAME_FUNC_OFFSET(-1, NULL, NULL, NULL, 0)'
-		print '};'
-		return
-
-
-def show_usage():
-	print "Usage: %s [-f input_file_name] [-m mode] [-c]" % sys.argv[0]
-	print "-c          Enable compatibility with OpenGL ES."
-	print "-m mode     mode can be one of:"
-	print "    long  - Create code for compilers that can handle very"
-	print "            long string constants. (default)"
-	print "    short - Create code for compilers that can only handle"
-	print "            ANSI C89 string constants."
-	sys.exit(1)
-
-if __name__ == '__main__':
-	file_name = "gl_API.xml"
-
-	try:
-		(args, trail) = getopt.getopt(sys.argv[1:], "f:m:c")
-	except Exception,e:
-		show_usage()
-
-	long_string = 1
-	es = False
-	for (arg,val) in args:
-		if arg == "-f":
-			file_name = val
-		elif arg == "-m":
-			if val == "short":
-				long_string = 0
-			elif val == "long":
-				long_string = 1
-			else:
-				show_usage()
-		elif arg == "-c":
-		    es = True
-
-	api = gl_XML.parse_GL_API(file_name, glX_XML.glx_item_factory())
-	printer = PrintGlProcs(long_string, es)
-	printer.Print(api)
+#!/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 license

+import gl_XML, glX_XML

+import sys, getopt

+

+class PrintGlProcs(gl_XML.gl_print_base):

+	def __init__(self, long_strings, es=False):

+		gl_XML.gl_print_base.__init__(self)

+

+		self.es = es

+		self.long_strings = long_strings

+		self.name = "gl_procs.py (from Mesa)"

+		self.license = license.bsd_license_template % ( \

+"""Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.

+(C) Copyright IBM Corporation 2004, 2006""", "BRIAN PAUL, IBM")

+

+

+	def printRealHeader(self):

+		print """

+/* This file is only included by glapi.c and is used for

+ * the GetProcAddress() function

+ */

+

+typedef struct {

+    GLint Name_offset;

+#if defined(NEED_FUNCTION_POINTER) || defined(GLX_INDIRECT_RENDERING)

+    _glapi_proc Address;

+#endif

+    GLuint Offset;

+} glprocs_table_t;

+

+#if   !defined(NEED_FUNCTION_POINTER) && !defined(GLX_INDIRECT_RENDERING)

+#  define NAME_FUNC_OFFSET(n,f1,f2,f3,o) { n , o }

+#elif  defined(NEED_FUNCTION_POINTER) && !defined(GLX_INDIRECT_RENDERING)

+#  define NAME_FUNC_OFFSET(n,f1,f2,f3,o) { n , (_glapi_proc) f1 , o }

+#elif  defined(NEED_FUNCTION_POINTER) &&  defined(GLX_INDIRECT_RENDERING)

+#  define NAME_FUNC_OFFSET(n,f1,f2,f3,o) { n , (_glapi_proc) f2 , o }

+#elif !defined(NEED_FUNCTION_POINTER) &&  defined(GLX_INDIRECT_RENDERING)

+#  define NAME_FUNC_OFFSET(n,f1,f2,f3,o) { n , (_glapi_proc) f3 , o }

+#endif

+

+"""

+		return

+

+	def printRealFooter(self):

+		print ''

+		print '#undef NAME_FUNC_OFFSET'

+		return

+

+	def printFunctionString(self, name):

+		if self.long_strings:

+			print '    "gl%s\\0"' % (name)

+		else:

+			print "    'g','l',",

+			for c in name:

+				print "'%s'," % (c),

+			

+			print "'\\0',"

+

+

+	def printBody(self, api):

+		print ''

+		if self.long_strings:

+			print 'static const char gl_string_table[] ='

+		else:

+			print 'static const char gl_string_table[] = {'

+

+		base_offset = 0

+		table = []

+		for func in api.functionIterateByOffset():

+			name = func.dispatch_name()

+			self.printFunctionString(func.name)

+			table.append((base_offset, "gl" + name, "gl" + name, "NULL", func.offset))

+

+			# The length of the function's name, plus 2 for "gl",

+			# plus 1 for the NUL.

+

+			base_offset += len(func.name) + 3

+

+

+		for func in api.functionIterateByOffset():

+			for n in func.entry_points:

+				if n != func.name:

+					name = func.dispatch_name()

+					self.printFunctionString( n )

+					

+					if func.has_different_protocol(n):

+						alt_name = "gl" + func.static_glx_name(n)

+						table.append((base_offset, "gl" + name, alt_name, alt_name, func.offset))

+					else:

+						table.append((base_offset, "gl" + name, "gl" + name, "NULL", func.offset))

+

+					base_offset += len(n) + 3

+

+

+		if self.long_strings:

+			print '    ;'

+		else:

+			print '};'

+

+		print ''

+		print ''

+		print "#ifdef USE_MGL_NAMESPACE"

+		for func in api.functionIterateByOffset():

+			for n in func.entry_points:

+				if (not func.is_static_entry_point(func.name)) or (func.has_different_protocol(n) and not func.is_static_entry_point(n)):

+					print '#define gl_dispatch_stub_%u mgl_dispatch_stub_%u' % (func.offset, func.offset)

+					break

+		print "#endif /* USE_MGL_NAMESPACE */"

+		print ''

+		print ''

+		print '#if defined(NEED_FUNCTION_POINTER) || defined(GLX_INDIRECT_RENDERING)'

+		for func in api.functionIterateByOffset():

+			for n in func.entry_points:

+				if (not func.is_static_entry_point(func.name)) or (func.has_different_protocol(n) and not func.is_static_entry_point(n)):

+					print '%s GLAPIENTRY gl_dispatch_stub_%u(%s);' % (func.return_type, func.offset, func.get_parameter_string())

+					break

+

+		if self.es:

+			categories = {}

+			for func in api.functionIterateByOffset():

+				for n in func.entry_points:

+					cat, num = api.get_category_for_name(n)

+					if (cat.startswith("es") or cat.startswith("GL_OES")):

+						if not categories.has_key(cat):

+							categories[cat] = []

+						proto = 'GLAPI %s GLAPIENTRY %s(%s);' \

+								% (func.return_type, "gl" + n, func.get_parameter_string(n))

+						categories[cat].append(proto)

+			if categories:

+				print ''

+				print '/* OpenGL ES specific prototypes */'

+				print ''

+				keys = categories.keys()

+				keys.sort()

+				for key in keys:

+					print '/* category %s */' % key

+					print "\n".join(categories[key])

+				print ''

+

+		print '#endif /* defined(NEED_FUNCTION_POINTER) || defined(GLX_INDIRECT_RENDERING) */'

+

+		print ''

+		print 'static const glprocs_table_t static_functions[] = {'

+

+		for info in table:

+			print '    NAME_FUNC_OFFSET(%5u, %s, %s, %s, %d),' % info

+

+		print '    NAME_FUNC_OFFSET(-1, NULL, NULL, NULL, 0)'

+		print '};'

+		return

+

+

+def show_usage():

+	print "Usage: %s [-f input_file_name] [-m mode] [-c]" % sys.argv[0]

+	print "-c          Enable compatibility with OpenGL ES."

+	print "-m mode     mode can be one of:"

+	print "    long  - Create code for compilers that can handle very"

+	print "            long string constants. (default)"

+	print "    short - Create code for compilers that can only handle"

+	print "            ANSI C89 string constants."

+	sys.exit(1)

+

+if __name__ == '__main__':

+	file_name = "gl_API.xml"

+

+	try:

+		(args, trail) = getopt.getopt(sys.argv[1:], "f:m:c")

+	except Exception,e:

+		show_usage()

+

+	long_string = 1

+	es = False

+	for (arg,val) in args:

+		if arg == "-f":

+			file_name = val

+		elif arg == "-m":

+			if val == "short":

+				long_string = 0

+			elif val == "long":

+				long_string = 1

+			else:

+				show_usage()

+		elif arg == "-c":

+		    es = True

+

+	api = gl_XML.parse_GL_API(file_name, glX_XML.glx_item_factory())

+	printer = PrintGlProcs(long_string, es)

+	printer.Print(api)