glapi: Do not use glapioffsets.h.

glapioffsets.h exists for the same reason as glapidispatch.h does.  It
is of no use to glapi.  This commit also drops the use of glapioffsets.h
in glx as glx is considered an extension to glapi when it comes to
defining public GL entries.

4 files changed, 10 insertions, 10 deletions

diff --git a/src/mapi/glapi/gen/glX_proto_send.py b/src/mapi/glapi/gen/glX_proto_send.py
index 4f8baf35d1..17ebad0176 100644
--- a/src/mapi/glapi/gen/glX_proto_send.py
+++ b/src/mapi/glapi/gen/glX_proto_send.py
@@ -993,6 +993,9 @@ extern HIDDEN NOINLINE FASTCALL GLubyte * __glXSetupVendorRequest(
 					asdf = func.static_glx_name(n)
 					if asdf not in func.static_entry_points:
 						print 'extern HIDDEN %s gl%s(%s);' % (func.return_type, asdf, params)
+						# give it a easy-to-remember name
+						if func.client_handcode:
+							print '#define gl_dispatch_stub_%s gl%s' % (n, asdf)
 					else:
 						print 'GLAPI %s GLAPIENTRY gl%s(%s);' % (func.return_type, asdf, params)
 						
diff --git a/src/mapi/glapi/gen/gl_SPARC_asm.py b/src/mapi/glapi/gen/gl_SPARC_asm.py
index 33e752df38..400e684da0 100644
--- a/src/mapi/glapi/gen/gl_SPARC_asm.py
+++ b/src/mapi/glapi/gen/gl_SPARC_asm.py
@@ -39,8 +39,6 @@ class PrintGenericStubs(gl_XML.gl_print_base):
 
 
 	def printRealHeader(self):
-		print '#include "glapi/glapioffsets.h"'
-		print ''
 		print '#ifdef __arch64__'
 		print '#define GL_OFF(N)\t((N) * 8)'
 		print '#define GL_LL\t\tldx'
@@ -223,7 +221,7 @@ class PrintGenericStubs(gl_XML.gl_print_base):
 		for f in api.functionIterateByOffset():
 			name = f.dispatch_name()
 
-			print '\tGL_STUB(gl%s, _gloffset_%s)' % (name, f.name)
+			print '\tGL_STUB(gl%s, %d)' % (name, f.offset)
 
 			if not f.is_static_entry_point(f.name):
 				print '\tHIDDEN(gl%s)' % (name)
diff --git a/src/mapi/glapi/gen/gl_procs.py b/src/mapi/glapi/gen/gl_procs.py
index 5de61fbdfe..a9ba48297a 100644
--- a/src/mapi/glapi/gen/gl_procs.py
+++ b/src/mapi/glapi/gen/gl_procs.py
@@ -96,7 +96,7 @@ typedef struct {
 		for func in api.functionIterateByOffset():
 			name = func.dispatch_name()
 			self.printFunctionString(func.name)
-			table.append((base_offset, "gl" + name, "gl" + name, "NULL", 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.
@@ -112,9 +112,9 @@ typedef struct {
 					
 					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))
+						table.append((base_offset, "gl" + name, alt_name, alt_name, func.offset))
 					else:
-						table.append((base_offset, "gl" + name, "gl" + name, "NULL", func.name))
+						table.append((base_offset, "gl" + name, "gl" + name, "NULL", func.offset))
 
 					base_offset += len(n) + 3
 
@@ -170,7 +170,7 @@ typedef struct {
 		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(%5u, %s, %s, %s, %d),' % info
 
 		print '    NAME_FUNC_OFFSET(-1, NULL, NULL, NULL, 0)'
 		print '};'
diff --git a/src/mapi/glapi/gen/gl_x86_asm.py b/src/mapi/glapi/gen/gl_x86_asm.py
index 10dfa1ddb3..3b1d035f04 100644
--- a/src/mapi/glapi/gen/gl_x86_asm.py
+++ b/src/mapi/glapi/gen/gl_x86_asm.py
@@ -54,7 +54,6 @@ class PrintGenericStubs(gl_XML.gl_print_base):
 
 	def printRealHeader(self):
 		print '#include "x86/assyntax.h"'
-		print '#include "glapi/glapioffsets.h"'
 		print ''
 		print '#if defined(STDCALL_API)'
 		print '# if defined(USE_MGL_NAMESPACE)'
@@ -215,7 +214,7 @@ class PrintGenericStubs(gl_XML.gl_print_base):
 			stack = self.get_stack_size(f)
 			alt = "%s@%u" % (name, stack)
 
-			print '\tGL_STUB(%s, _gloffset_%s, %s)' % (name, f.name, alt)
+			print '\tGL_STUB(%s, %d, %s)' % (name, f.offset, alt)
 
 			if not f.is_static_entry_point(f.name):
 				print '\tHIDDEN(GL_PREFIX(%s, %s))' % (name, alt)
@@ -230,7 +229,7 @@ class PrintGenericStubs(gl_XML.gl_print_base):
 				if f.is_static_entry_point(n):
 					if n != f.name:
 						alt2 = "%s@%u" % (n, stack)
-						text = '\tGL_STUB_ALIAS(%s, _gloffset_%s, %s, %s, %s)' % (n, f.name, alt2, name, alt)
+						text = '\tGL_STUB_ALIAS(%s, %d, %s, %s, %s)' % (n, f.offset, alt2, name, alt)
 
 						if f.has_different_protocol(n):
 							print '#ifndef GLX_INDIRECT_RENDERING'