From 249db89b009e64812d4bcec80d0c5a64f1d65aeb Mon Sep 17 00:00:00 2001 From: Ian Romanick Date: Thu, 26 May 2005 16:24:35 +0000 Subject: Make a couple minor corrections to gl_API.xml. Fixes the name of an extension that was missing the GL_ part and uses the core GL type names for vertex buffer object functions instead of the ARB names. Also commits the resulting changes to the generated code. Some how, the #if sequence disappeared in the 1.52 version of glapi_x86.S. --- src/glx/x11/indirect_init.c | 2 +- src/mesa/glapi/gl_API.dtd | 4 ++-- src/mesa/glapi/gl_API.xml | 12 ++++++------ src/mesa/glapi/glapitemp.h | 6 +++--- src/mesa/x86/glapi_x86.S | 10 ++++++++++ 5 files changed, 22 insertions(+), 12 deletions(-) (limited to 'src') diff --git a/src/glx/x11/indirect_init.c b/src/glx/x11/indirect_init.c index 64aefcbaf1..e87d39859f 100644 --- a/src/glx/x11/indirect_init.c +++ b/src/glx/x11/indirect_init.c @@ -682,7 +682,7 @@ __GLapi * __glXNewIndirectAPI( void ) glAPI->MultiDrawArraysEXT = __indirect_glMultiDrawArraysEXT; glAPI->MultiDrawElementsEXT = __indirect_glMultiDrawElementsEXT; - /* EXT_stencil_two_side */ + /* GL_EXT_stencil_two_side */ glAPI->ActiveStencilFaceEXT = __indirect_glActiveStencilFaceEXT; diff --git a/src/mesa/glapi/gl_API.dtd b/src/mesa/glapi/gl_API.dtd index 352e1b53a5..4adfaaceb7 100644 --- a/src/mesa/glapi/gl_API.dtd +++ b/src/mesa/glapi/gl_API.dtd @@ -22,12 +22,12 @@ vectorequiv NMTOKEN #IMPLIED> + mode (get | set) "set"> - + - - + + @@ -4955,8 +4955,8 @@ - - + + @@ -11110,7 +11110,7 @@ - + diff --git a/src/mesa/glapi/glapitemp.h b/src/mesa/glapi/glapitemp.h index bd9da0b5bf..340fc66e67 100644 --- a/src/mesa/glapi/glapitemp.h +++ b/src/mesa/glapi/glapitemp.h @@ -4610,12 +4610,12 @@ KEYWORD1 void KEYWORD2 NAME(BindBuffer)(GLenum target, GLuint buffer) DISPATCH(BindBufferARB, (target, buffer), (F, "glBindBuffer(0x%x, %d);\n", target, buffer)); } -KEYWORD1 void KEYWORD2 NAME(BufferData)(GLenum target, GLsizeiptrARB size, const GLvoid * data, GLenum usage) +KEYWORD1 void KEYWORD2 NAME(BufferData)(GLenum target, GLsizeiptr size, const GLvoid * data, GLenum usage) { DISPATCH(BufferDataARB, (target, size, data, usage), (F, "glBufferData(0x%x, %d, %p, 0x%x);\n", target, size, (const void *) data, usage)); } -KEYWORD1 void KEYWORD2 NAME(BufferSubData)(GLenum target, GLintptrARB offset, GLsizeiptrARB size, const GLvoid * data) +KEYWORD1 void KEYWORD2 NAME(BufferSubData)(GLenum target, GLintptr offset, GLsizeiptr size, const GLvoid * data) { DISPATCH(BufferSubDataARB, (target, offset, size, data), (F, "glBufferSubData(0x%x, %d, %d, %p);\n", target, offset, size, (const void *) data)); } @@ -4640,7 +4640,7 @@ KEYWORD1 void KEYWORD2 NAME(GetBufferPointerv)(GLenum target, GLenum pname, GLvo DISPATCH(GetBufferPointervARB, (target, pname, params), (F, "glGetBufferPointerv(0x%x, 0x%x, %p);\n", target, pname, (const void *) params)); } -KEYWORD1 void KEYWORD2 NAME(GetBufferSubData)(GLenum target, GLintptrARB offset, GLsizeiptrARB size, GLvoid * data) +KEYWORD1 void KEYWORD2 NAME(GetBufferSubData)(GLenum target, GLintptr offset, GLsizeiptr size, GLvoid * data) { DISPATCH(GetBufferSubDataARB, (target, offset, size, data), (F, "glGetBufferSubData(0x%x, %d, %d, %p);\n", target, offset, size, (const void *) data)); } diff --git a/src/mesa/x86/glapi_x86.S b/src/mesa/x86/glapi_x86.S index 6e8f32e373..c0a971bd53 100644 --- a/src/mesa/x86/glapi_x86.S +++ b/src/mesa/x86/glapi_x86.S @@ -29,6 +29,16 @@ #include "assyntax.h" #include "glapioffsets.h" +/* If we build with gcc's -fvisibility=hidden flag, we'll need to change +* the symbol visibility mode to 'default'. +*/ +#if defined(__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__) >= 303 +# pragma GCC visibility push(default) +# define HIDDEN(x) .hidden x +#else +# define HIDDEN(x) +#endif + #ifndef __WIN32__ #if defined(STDCALL_API) -- cgit v1.2.3