diff options
| -rw-r--r-- | src/glx/x11/indirect_init.c | 2 | ||||
| -rw-r--r-- | src/mesa/glapi/gl_API.dtd | 4 | ||||
| -rw-r--r-- | src/mesa/glapi/gl_API.xml | 12 | ||||
| -rw-r--r-- | src/mesa/glapi/glapitemp.h | 6 | ||||
| -rw-r--r-- | src/mesa/x86/glapi_x86.S | 10 |
5 files changed, 22 insertions, 12 deletions
diff --git a/src/glx/x11/indirect_init.c b/src/glx/x11/indirect_init.c index 64aefcbaf15..e87d39859f0 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 352e1b53a5d..4adfaaceb7e 100644 --- a/src/mesa/glapi/gl_API.dtd +++ b/src/mesa/glapi/gl_API.dtd @@ -22,12 +22,12 @@ vectorequiv NMTOKEN #IMPLIED> <!ATTLIST size name NMTOKEN #REQUIRED count NMTOKEN #IMPLIED - mode NMTOKEN #IMPLIED> + mode (get | set) "set"> <!ATTLIST param name NMTOKEN #REQUIRED type CDATA #REQUIRED count NMTOKEN #IMPLIED counter (true | false) "false" - count_scale NMTOKEN #IMPLIED + count_scale NMTOKEN "1" output (true | false) "false" img_width NMTOKEN #IMPLIED img_height NMTOKEN #IMPLIED diff --git a/src/mesa/glapi/gl_API.xml b/src/mesa/glapi/gl_API.xml index 2ce70957fc8..5ce816693c8 100644 --- a/src/mesa/glapi/gl_API.xml +++ b/src/mesa/glapi/gl_API.xml @@ -4919,15 +4919,15 @@ <function name="BufferData" alias="BufferDataARB"> <param name="target" type="GLenum"/> - <param name="size" type="GLsizeiptrARB"/> + <param name="size" type="GLsizeiptr"/> <param name="data" type="const GLvoid *"/> <param name="usage" type="GLenum"/> </function> <function name="BufferSubData" alias="BufferSubDataARB"> <param name="target" type="GLenum"/> - <param name="offset" type="GLintptrARB"/> - <param name="size" type="GLsizeiptrARB"/> + <param name="offset" type="GLintptr"/> + <param name="size" type="GLsizeiptr"/> <param name="data" type="const GLvoid *"/> </function> @@ -4955,8 +4955,8 @@ <function name="GetBufferSubData" alias="GetBufferSubDataARB"> <param name="target" type="GLenum"/> - <param name="offset" type="GLintptrARB"/> - <param name="size" type="GLsizeiptrARB"/> + <param name="offset" type="GLintptr"/> + <param name="size" type="GLsizeiptr"/> <param name="data" type="GLvoid *" output="true"/> </function> @@ -11110,7 +11110,7 @@ <!-- No new functions, types, enums. --> </category> -<category name="EXT_stencil_two_side" number="268"> +<category name="GL_EXT_stencil_two_side" number="268"> <enum name="STENCIL_TEST_TWO_SIDE_EXT" count="1" value="0x8910"> <size name="Get" mode="get"/> </enum> diff --git a/src/mesa/glapi/glapitemp.h b/src/mesa/glapi/glapitemp.h index bd9da0b5bf7..340fc66e676 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 6e8f32e373d..c0a971bd53b 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) |