Mesa (7.8): glapi: Fix aliases to non-static functions.

[Chia-I Wu]

Module: Mesa
Branch: 7.8
Commit: 6fed3a9fa0a87ae797f995de5b51eb9be3493fe0
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=6fed3a9fa0a87ae797f995de5b51eb9be3493fe0

Author: Chia-I Wu <olv at lunarg.com>
Date:   Sat Mar 20 23:58:15 2010 +0800

glapi: Fix aliases to non-static functions.

The bug is triggered by 41a87a43e11c664935349f938022d58d3e22da4e.
glBlitFramebuffer, for example, is an alias to the non-static
glBlitFramebufferEXT.  We should define glBlitFramebuffer as an alias to
_dispatch_stub_NNN.

---

 src/mesa/glapi/gen/gl_x86_asm.py |    2 +-
 src/mesa/x86/glapi_x86.S         |    8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/mesa/glapi/gen/gl_x86_asm.py b/src/mesa/glapi/gen/gl_x86_asm.py
index 7fb7af5..10dfa1d 100644
--- a/src/mesa/glapi/gen/gl_x86_asm.py
+++ b/src/mesa/glapi/gen/gl_x86_asm.py
@@ -230,7 +230,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, f.name, alt)
+						text = '\tGL_STUB_ALIAS(%s, _gloffset_%s, %s, %s, %s)' % (n, f.name, alt2, name, alt)
 
 						if f.has_different_protocol(n):
 							print '#ifndef GLX_INDIRECT_RENDERING'
diff --git a/src/mesa/x86/glapi_x86.S b/src/mesa/x86/glapi_x86.S
index 26c1ce4..b1730d2 100644
--- a/src/mesa/x86/glapi_x86.S
+++ b/src/mesa/x86/glapi_x86.S
@@ -1250,9 +1250,9 @@ GLNAME(gl_dispatch_functions_start):
 	GL_STUB_ALIAS(IsProgramARB, _gloffset_IsProgramNV, IsProgramARB at 4, IsProgramNV, IsProgramNV at 4)
 	GL_STUB_ALIAS(PointParameteri, _gloffset_PointParameteriNV, PointParameteri at 8, PointParameteriNV, PointParameteriNV at 8)
 	GL_STUB_ALIAS(PointParameteriv, _gloffset_PointParameterivNV, PointParameteriv at 8, PointParameterivNV, PointParameterivNV at 8)
-	GL_STUB_ALIAS(DeleteVertexArrays, _gloffset_DeleteVertexArraysAPPLE, DeleteVertexArrays at 8, DeleteVertexArraysAPPLE, _dispatch_stub_755 at 8)
-	GL_STUB_ALIAS(IsVertexArray, _gloffset_IsVertexArrayAPPLE, IsVertexArray at 4, IsVertexArrayAPPLE, _dispatch_stub_757 at 4)
-	GL_STUB_ALIAS(BlendEquationSeparate, _gloffset_BlendEquationSeparateEXT, BlendEquationSeparate at 8, BlendEquationSeparateEXT, _dispatch_stub_765 at 8)
+	GL_STUB_ALIAS(DeleteVertexArrays, _gloffset_DeleteVertexArraysAPPLE, DeleteVertexArrays at 8, _dispatch_stub_755, _dispatch_stub_755 at 8)
+	GL_STUB_ALIAS(IsVertexArray, _gloffset_IsVertexArrayAPPLE, IsVertexArray at 4, _dispatch_stub_757, _dispatch_stub_757 at 4)
+	GL_STUB_ALIAS(BlendEquationSeparate, _gloffset_BlendEquationSeparateEXT, BlendEquationSeparate at 8, _dispatch_stub_765, _dispatch_stub_765 at 8)
 	GL_STUB_ALIAS(BindFramebuffer, _gloffset_BindFramebufferEXT, BindFramebuffer at 8, BindFramebufferEXT, BindFramebufferEXT at 8)
 	GL_STUB_ALIAS(BindRenderbuffer, _gloffset_BindRenderbufferEXT, BindRenderbuffer at 8, BindRenderbufferEXT, BindRenderbufferEXT at 8)
 	GL_STUB_ALIAS(CheckFramebufferStatus, _gloffset_CheckFramebufferStatusEXT, CheckFramebufferStatus at 4, CheckFramebufferStatusEXT, CheckFramebufferStatusEXT at 4)
@@ -1270,7 +1270,7 @@ GLNAME(gl_dispatch_functions_start):
 	GL_STUB_ALIAS(IsFramebuffer, _gloffset_IsFramebufferEXT, IsFramebuffer at 4, IsFramebufferEXT, IsFramebufferEXT at 4)
 	GL_STUB_ALIAS(IsRenderbuffer, _gloffset_IsRenderbufferEXT, IsRenderbuffer at 4, IsRenderbufferEXT, IsRenderbufferEXT at 4)
 	GL_STUB_ALIAS(RenderbufferStorage, _gloffset_RenderbufferStorageEXT, RenderbufferStorage at 16, RenderbufferStorageEXT, RenderbufferStorageEXT at 16)
-	GL_STUB_ALIAS(BlitFramebuffer, _gloffset_BlitFramebufferEXT, BlitFramebuffer at 40, BlitFramebufferEXT, _dispatch_stub_783 at 40)
+	GL_STUB_ALIAS(BlitFramebuffer, _gloffset_BlitFramebufferEXT, BlitFramebuffer at 40, _dispatch_stub_783, _dispatch_stub_783 at 40)
 	GL_STUB_ALIAS(FramebufferTextureLayer, _gloffset_FramebufferTextureLayerEXT, FramebufferTextureLayer at 20, FramebufferTextureLayerEXT, FramebufferTextureLayerEXT at 20)
 	GL_STUB_ALIAS(ProvokingVertex, _gloffset_ProvokingVertexEXT, ProvokingVertex at 4, ProvokingVertexEXT, ProvokingVertexEXT at 4)