From cd103d3f4d59ac4f09cfcf126e572ddb0b9d4628 Mon Sep 17 00:00:00 2001 From: marha Date: Thu, 28 Jun 2012 08:53:34 +0200 Subject: Synchronised files --- xorg-server/glx/dispatch.h | 12 ++++++------ xorg-server/glx/glapitable.h | 6 +++--- xorg-server/hw/xwin/glx/gl.spec | 29 +++++++++++++++++++---------- xorg-server/hw/xwin/glx/gl.tm | 3 +++ xorg-server/hw/xwin/swrastwgl_dri/gl.spec | 29 +++++++++++++++++++---------- xorg-server/hw/xwin/swrastwgl_dri/gl.tm | 3 +++ 6 files changed, 53 insertions(+), 29 deletions(-) (limited to 'xorg-server') diff --git a/xorg-server/glx/dispatch.h b/xorg-server/glx/dispatch.h index 47f0df91a..d9d625f6a 100644 --- a/xorg-server/glx/dispatch.h +++ b/xorg-server/glx/dispatch.h @@ -8618,14 +8618,14 @@ static INLINE void SET_GetUniformBlockIndex(struct _glapi_table *disp, GLuint (G SET_by_offset(disp, _gloffset_GetUniformBlockIndex, fn); } -typedef void (GLAPIENTRYP _glptr_GetUniformIndices)(GLuint, GLsizei, const GLchar **, GLuint *); +typedef void (GLAPIENTRYP _glptr_GetUniformIndices)(GLuint, GLsizei, const GLchar * const *, GLuint *); #define CALL_GetUniformIndices(disp, parameters) \ (* GET_GetUniformIndices(disp)) parameters static INLINE _glptr_GetUniformIndices GET_GetUniformIndices(struct _glapi_table *disp) { return (_glptr_GetUniformIndices) (GET_by_offset(disp, _gloffset_GetUniformIndices)); } -static INLINE void SET_GetUniformIndices(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLsizei, const GLchar **, GLuint *)) { +static INLINE void SET_GetUniformIndices(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLsizei, const GLchar * const *, GLuint *)) { SET_by_offset(disp, _gloffset_GetUniformIndices, fn); } @@ -8761,14 +8761,14 @@ static INLINE void SET_DrawRangeElementsBaseVertex(struct _glapi_table *disp, vo SET_by_offset(disp, _gloffset_DrawRangeElementsBaseVertex, fn); } -typedef void (GLAPIENTRYP _glptr_MultiDrawElementsBaseVertex)(GLenum, const GLsizei *, GLenum, const GLvoid **, GLsizei, const GLint *); +typedef void (GLAPIENTRYP _glptr_MultiDrawElementsBaseVertex)(GLenum, const GLsizei *, GLenum, const GLvoid * const *, GLsizei, const GLint *); #define CALL_MultiDrawElementsBaseVertex(disp, parameters) \ (* GET_MultiDrawElementsBaseVertex(disp)) parameters static INLINE _glptr_MultiDrawElementsBaseVertex GET_MultiDrawElementsBaseVertex(struct _glapi_table *disp) { return (_glptr_MultiDrawElementsBaseVertex) (GET_by_offset(disp, _gloffset_MultiDrawElementsBaseVertex)); } -static INLINE void SET_MultiDrawElementsBaseVertex(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, const GLsizei *, GLenum, const GLvoid **, GLsizei, const GLint *)) { +static INLINE void SET_MultiDrawElementsBaseVertex(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, const GLsizei *, GLenum, const GLvoid * const *, GLsizei, const GLint *)) { SET_by_offset(disp, _gloffset_MultiDrawElementsBaseVertex, fn); } @@ -9542,14 +9542,14 @@ static INLINE void SET_ShaderBinary(struct _glapi_table *disp, void (GLAPIENTRYP SET_by_offset(disp, _gloffset_ShaderBinary, fn); } -typedef void (GLAPIENTRYP _glptr_DebugMessageCallbackARB)(GLDEBUGPROCARB, GLvoid *); +typedef void (GLAPIENTRYP _glptr_DebugMessageCallbackARB)(GLDEBUGPROCARB, const GLvoid *); #define CALL_DebugMessageCallbackARB(disp, parameters) \ (* GET_DebugMessageCallbackARB(disp)) parameters static INLINE _glptr_DebugMessageCallbackARB GET_DebugMessageCallbackARB(struct _glapi_table *disp) { return (_glptr_DebugMessageCallbackARB) (GET_by_offset(disp, _gloffset_DebugMessageCallbackARB)); } -static INLINE void SET_DebugMessageCallbackARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLDEBUGPROCARB, GLvoid *)) { +static INLINE void SET_DebugMessageCallbackARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLDEBUGPROCARB, const GLvoid *)) { SET_by_offset(disp, _gloffset_DebugMessageCallbackARB, fn); } diff --git a/xorg-server/glx/glapitable.h b/xorg-server/glx/glapitable.h index 91d79c2f1..5b0d8b164 100644 --- a/xorg-server/glx/glapitable.h +++ b/xorg-server/glx/glapitable.h @@ -629,7 +629,7 @@ struct _glapi_table void (GLAPIENTRYP GetActiveUniformName)(GLuint program, GLuint uniformIndex, GLsizei bufSize, GLsizei * length, GLchar * uniformName); /* 586 */ void (GLAPIENTRYP GetActiveUniformsiv)(GLuint program, GLsizei uniformCount, const GLuint * uniformIndices, GLenum pname, GLint * params); /* 587 */ GLuint (GLAPIENTRYP GetUniformBlockIndex)(GLuint program, const GLchar * uniformBlockName); /* 588 */ - void (GLAPIENTRYP GetUniformIndices)(GLuint program, GLsizei uniformCount, const GLchar ** uniformNames, GLuint * uniformIndices); /* 589 */ + void (GLAPIENTRYP GetUniformIndices)(GLuint program, GLsizei uniformCount, const GLchar * const * uniformNames, GLuint * uniformIndices); /* 589 */ void (GLAPIENTRYP UniformBlockBinding)(GLuint program, GLuint uniformBlockIndex, GLuint uniformBlockBinding); /* 590 */ void (GLAPIENTRYP CopyBufferSubData)(GLenum readTarget, GLenum writeTarget, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size); /* 591 */ GLenum (GLAPIENTRYP ClientWaitSync)(GLsync sync, GLbitfield flags, GLuint64 timeout); /* 592 */ @@ -642,7 +642,7 @@ struct _glapi_table void (GLAPIENTRYP DrawElementsBaseVertex)(GLenum mode, GLsizei count, GLenum type, const GLvoid * indices, GLint basevertex); /* 599 */ void (GLAPIENTRYP DrawElementsInstancedBaseVertex)(GLenum mode, GLsizei count, GLenum type, const GLvoid * indices, GLsizei primcount, GLint basevertex); /* 600 */ void (GLAPIENTRYP DrawRangeElementsBaseVertex)(GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid * indices, GLint basevertex); /* 601 */ - void (GLAPIENTRYP MultiDrawElementsBaseVertex)(GLenum mode, const GLsizei * count, GLenum type, const GLvoid ** indices, GLsizei primcount, const GLint * basevertex); /* 602 */ + void (GLAPIENTRYP MultiDrawElementsBaseVertex)(GLenum mode, const GLsizei * count, GLenum type, const GLvoid * const * indices, GLsizei primcount, const GLint * basevertex); /* 602 */ void (GLAPIENTRYP BlendEquationSeparateiARB)(GLuint buf, GLenum modeRGB, GLenum modeA); /* 603 */ void (GLAPIENTRYP BlendEquationiARB)(GLuint buf, GLenum mode); /* 604 */ void (GLAPIENTRYP BlendFuncSeparateiARB)(GLuint buf, GLenum srcRGB, GLenum dstRGB, GLenum srcA, GLenum dstA); /* 605 */ @@ -713,7 +713,7 @@ struct _glapi_table void (GLAPIENTRYP GetShaderPrecisionFormat)(GLenum shadertype, GLenum precisiontype, GLint * range, GLint * precision); /* 670 */ void (GLAPIENTRYP ReleaseShaderCompiler)(void); /* 671 */ void (GLAPIENTRYP ShaderBinary)(GLsizei n, const GLuint * shaders, GLenum binaryformat, const GLvoid * binary, GLsizei length); /* 672 */ - void (GLAPIENTRYP DebugMessageCallbackARB)(GLDEBUGPROCARB callback, GLvoid * userParam); /* 673 */ + void (GLAPIENTRYP DebugMessageCallbackARB)(GLDEBUGPROCARB callback, const GLvoid * userParam); /* 673 */ void (GLAPIENTRYP DebugMessageControlARB)(GLenum source, GLenum type, GLenum severity, GLsizei count, const GLuint * ids, GLboolean enabled); /* 674 */ void (GLAPIENTRYP DebugMessageInsertARB)(GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLcharARB * buf); /* 675 */ GLuint (GLAPIENTRYP GetDebugMessageLogARB)(GLuint count, GLsizei bufsize, GLenum * sources, GLenum * types, GLuint * ids, GLenum * severities, GLsizei * lengths, GLcharARB * messageLog); /* 676 */ diff --git a/xorg-server/hw/xwin/glx/gl.spec b/xorg-server/hw/xwin/glx/gl.spec index d7ad0c827..fee74f689 100644 --- a/xorg-server/hw/xwin/glx/gl.spec +++ b/xorg-server/hw/xwin/glx/gl.spec @@ -7,7 +7,7 @@ # This document is licensed under the SGI Free Software B License Version # 2.0. For details, see http://oss.sgi.com/projects/FreeB/ . # -# $Revision: 17237 $ on $Date: 2012-03-28 22:30:00 -0700 (Wed, 28 Mar 2012) $ +# $Revision: 18230 $ on $Date: 2012-06-18 11:27:28 -0700 (Mon, 18 Jun 2012) $ required-props: # Description of a parameter @@ -1232,7 +1232,7 @@ EdgeFlag(flag) EdgeFlagv(flag) return void - param flag Boolean in array [1] + param flag Boolean in reference category VERSION_1_0_DEPRECATED # old: drawing version 1.0 deprecated 3.1 @@ -3565,7 +3565,7 @@ DrawElements(mode, count, type, indices) GetPointerv(pname, params) return void param pname GetPointervPName in value - param params VoidPointer out array [1] + param params VoidPointer out reference category VERSION_1_1 dlflags notlistable glxflags client-handcode client-intercept server-handcode @@ -5081,7 +5081,7 @@ MultiDrawElements(mode, count, type, indices, primcount) param mode BeginMode in value param count SizeI in array [COMPSIZE(primcount)] param type DrawElementsType in value - param indices VoidPointer in array [COMPSIZE(primcount)] + param indices ConstVoidPointer in array [COMPSIZE(primcount)] param primcount SizeI in value category VERSION_1_4 version 1.4 @@ -6186,7 +6186,7 @@ ShaderSource(shader, count, string, length) return void param shader UInt32 in value param count SizeI in value - param string CharPointer in array [count] + param string ConstCharPointer in array [count] param length Int32 in array [1] category VERSION_2_0 version 2.0 @@ -7113,7 +7113,7 @@ TransformFeedbackVaryings(program, count, varyings, bufferMode) return void param program UInt32 in value param count SizeI in value - param varyings CharPointer in array [count] + param varyings ConstCharPointer in array [count] param bufferMode GLenum in value category VERSION_3_0 version 3.0 @@ -11178,7 +11178,7 @@ GetUniformIndices(program, uniformCount, uniformNames, uniformIndices) return void param program UInt32 in value param uniformCount SizeI in value - param uniformNames CharPointer in array [COMPSIZE(uniformCount)] + param uniformNames ConstCharPointer in array [COMPSIZE(uniformCount)] param uniformIndices UInt32 out array [COMPSIZE(uniformCount)] category ARB_uniform_buffer_object dlflags notlistable @@ -11380,7 +11380,7 @@ MultiDrawElementsBaseVertex(mode, count, type, indices, primcount, basevertex) param mode GLenum in value param count SizeI in array [COMPSIZE(primcount)] param type DrawElementsType in value - param indices VoidPointer in array [COMPSIZE(primcount)] + param indices ConstVoidPointer in array [COMPSIZE(primcount)] param primcount SizeI in value param basevertex Int32 in array [COMPSIZE(primcount)] category ARB_draw_elements_base_vertex @@ -13260,7 +13260,7 @@ CreateShaderProgramv(type, count, strings) return UInt32 param type GLenum in value param count SizeI in value - param strings CharPointer in array [count] + param strings ConstCharPointer in array [count] category ARB_separate_shader_objects version 4.1 extension @@ -14385,7 +14385,7 @@ GetDebugMessageLogARB(count, bufsize, sources, types, ids, severities, lengths, glxflags ignore offset ? -#@ GetPointerv is redeclared in this extension +# GetPointerv is redeclared in this extension ############################################################################### # @@ -32761,3 +32761,12 @@ IsImageHandleResidentNV(handle) # (none) newcategory: NV_shader_atomic_float +############################################################################### +# +# Extension #420 +# AMD_query_buffer_object commands +# +############################################################################### + +# (none) +newcategory: AMD_query_buffer_object diff --git a/xorg-server/hw/xwin/glx/gl.tm b/xorg-server/hw/xwin/glx/gl.tm index 3d2c43b08..355a1c8f6 100644 --- a/xorg-server/hw/xwin/glx/gl.tm +++ b/xorg-server/hw/xwin/glx/gl.tm @@ -12,6 +12,7 @@ Boolean,*,*, GLboolean,*,* BooleanPointer,*,*, GLboolean*,*,* Char,*,*, GLchar,*,* CharPointer,*,*, GLchar*,*,* +ConstCharPointer,*,*, GLchar* const,*,* CheckedFloat32,*,*, GLfloat,*,* CheckedInt32,*,*, GLint,*,* ClampColorTargetARB,*,*, GLenum,*,* @@ -318,6 +319,8 @@ BufferAccessMask,*,*, GLbitfield,*,* GetMultisamplePNameNV,*,*, GLenum,*,* SampleMaskNV,*,*, GLbitfield,*,* # ARB_debug_output +GLDEBUGPROC,*,*, GLDEBUGPROC,*,* +# ARB_debug_output GLDEBUGPROCARB,*,*, GLDEBUGPROCARB,*,* # AMD_debug_output GLDEBUGPROCAMD,*,*, GLDEBUGPROCAMD,*,* diff --git a/xorg-server/hw/xwin/swrastwgl_dri/gl.spec b/xorg-server/hw/xwin/swrastwgl_dri/gl.spec index d7ad0c827..fee74f689 100644 --- a/xorg-server/hw/xwin/swrastwgl_dri/gl.spec +++ b/xorg-server/hw/xwin/swrastwgl_dri/gl.spec @@ -7,7 +7,7 @@ # This document is licensed under the SGI Free Software B License Version # 2.0. For details, see http://oss.sgi.com/projects/FreeB/ . # -# $Revision: 17237 $ on $Date: 2012-03-28 22:30:00 -0700 (Wed, 28 Mar 2012) $ +# $Revision: 18230 $ on $Date: 2012-06-18 11:27:28 -0700 (Mon, 18 Jun 2012) $ required-props: # Description of a parameter @@ -1232,7 +1232,7 @@ EdgeFlag(flag) EdgeFlagv(flag) return void - param flag Boolean in array [1] + param flag Boolean in reference category VERSION_1_0_DEPRECATED # old: drawing version 1.0 deprecated 3.1 @@ -3565,7 +3565,7 @@ DrawElements(mode, count, type, indices) GetPointerv(pname, params) return void param pname GetPointervPName in value - param params VoidPointer out array [1] + param params VoidPointer out reference category VERSION_1_1 dlflags notlistable glxflags client-handcode client-intercept server-handcode @@ -5081,7 +5081,7 @@ MultiDrawElements(mode, count, type, indices, primcount) param mode BeginMode in value param count SizeI in array [COMPSIZE(primcount)] param type DrawElementsType in value - param indices VoidPointer in array [COMPSIZE(primcount)] + param indices ConstVoidPointer in array [COMPSIZE(primcount)] param primcount SizeI in value category VERSION_1_4 version 1.4 @@ -6186,7 +6186,7 @@ ShaderSource(shader, count, string, length) return void param shader UInt32 in value param count SizeI in value - param string CharPointer in array [count] + param string ConstCharPointer in array [count] param length Int32 in array [1] category VERSION_2_0 version 2.0 @@ -7113,7 +7113,7 @@ TransformFeedbackVaryings(program, count, varyings, bufferMode) return void param program UInt32 in value param count SizeI in value - param varyings CharPointer in array [count] + param varyings ConstCharPointer in array [count] param bufferMode GLenum in value category VERSION_3_0 version 3.0 @@ -11178,7 +11178,7 @@ GetUniformIndices(program, uniformCount, uniformNames, uniformIndices) return void param program UInt32 in value param uniformCount SizeI in value - param uniformNames CharPointer in array [COMPSIZE(uniformCount)] + param uniformNames ConstCharPointer in array [COMPSIZE(uniformCount)] param uniformIndices UInt32 out array [COMPSIZE(uniformCount)] category ARB_uniform_buffer_object dlflags notlistable @@ -11380,7 +11380,7 @@ MultiDrawElementsBaseVertex(mode, count, type, indices, primcount, basevertex) param mode GLenum in value param count SizeI in array [COMPSIZE(primcount)] param type DrawElementsType in value - param indices VoidPointer in array [COMPSIZE(primcount)] + param indices ConstVoidPointer in array [COMPSIZE(primcount)] param primcount SizeI in value param basevertex Int32 in array [COMPSIZE(primcount)] category ARB_draw_elements_base_vertex @@ -13260,7 +13260,7 @@ CreateShaderProgramv(type, count, strings) return UInt32 param type GLenum in value param count SizeI in value - param strings CharPointer in array [count] + param strings ConstCharPointer in array [count] category ARB_separate_shader_objects version 4.1 extension @@ -14385,7 +14385,7 @@ GetDebugMessageLogARB(count, bufsize, sources, types, ids, severities, lengths, glxflags ignore offset ? -#@ GetPointerv is redeclared in this extension +# GetPointerv is redeclared in this extension ############################################################################### # @@ -32761,3 +32761,12 @@ IsImageHandleResidentNV(handle) # (none) newcategory: NV_shader_atomic_float +############################################################################### +# +# Extension #420 +# AMD_query_buffer_object commands +# +############################################################################### + +# (none) +newcategory: AMD_query_buffer_object diff --git a/xorg-server/hw/xwin/swrastwgl_dri/gl.tm b/xorg-server/hw/xwin/swrastwgl_dri/gl.tm index 3d2c43b08..355a1c8f6 100644 --- a/xorg-server/hw/xwin/swrastwgl_dri/gl.tm +++ b/xorg-server/hw/xwin/swrastwgl_dri/gl.tm @@ -12,6 +12,7 @@ Boolean,*,*, GLboolean,*,* BooleanPointer,*,*, GLboolean*,*,* Char,*,*, GLchar,*,* CharPointer,*,*, GLchar*,*,* +ConstCharPointer,*,*, GLchar* const,*,* CheckedFloat32,*,*, GLfloat,*,* CheckedInt32,*,*, GLint,*,* ClampColorTargetARB,*,*, GLenum,*,* @@ -318,6 +319,8 @@ BufferAccessMask,*,*, GLbitfield,*,* GetMultisamplePNameNV,*,*, GLenum,*,* SampleMaskNV,*,*, GLbitfield,*,* # ARB_debug_output +GLDEBUGPROC,*,*, GLDEBUGPROC,*,* +# ARB_debug_output GLDEBUGPROCARB,*,*, GLDEBUGPROCARB,*,* # AMD_debug_output GLDEBUGPROCAMD,*,*, GLDEBUGPROCAMD,*,* -- cgit v1.2.3