diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2015-11-22 02:46:32 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2015-11-22 02:46:32 +0000 |
| commit | 055b89bfed6f2b29a15e7d9b5a48ea4024a02fff (patch) | |
| tree | ab0941990ea3af76f1d013803b9fab737ad1f64b /lib/mesa/src/mapi | |
| parent | d590e719953f29dcd2f0850b0243863cb6c4a8a8 (diff) | |
import Mesa 11.0.6
Diffstat (limited to 'lib/mesa/src/mapi')
27 files changed, 131 insertions, 740 deletions
diff --git a/lib/mesa/src/mapi/entry.c b/lib/mesa/src/mapi/entry.c index 1e250122c..27d0db40e 100644 --- a/lib/mesa/src/mapi/entry.c +++ b/lib/mesa/src/mapi/entry.c @@ -25,12 +25,8 @@ * Chia-I Wu <olv@lunarg.com> */ -#include <stdlib.h> -#include <stdint.h> - #include "entry.h" #include "u_current.h" -#include "util/u_endian.h" #define _U_STRINGIFY(x) #x #define U_STRINGIFY(x) _U_STRINGIFY(x) @@ -53,15 +49,11 @@ # endif #elif defined(USE_X86_64_ASM) && defined(__GNUC__) && defined(GLX_USE_TLS) # include "entry_x86-64_tls.h" -#elif defined(USE_PPC64LE_ASM) && defined(__GNUC__) && defined(PIPE_ARCH_LITTLE_ENDIAN) -# ifdef GLX_USE_TLS -# include "entry_ppc64le_tls.h" -# else -# include "entry_ppc64le_tsd.h" -# endif #else -static inline const struct _glapi_table * +#include <stdlib.h> + +static inline const struct mapi_table * entry_current_get(void) { #ifdef MAPI_MODE_BRIDGE diff --git a/lib/mesa/src/mapi/glapi/gen/APPLE_vertex_array_object.xml b/lib/mesa/src/mapi/glapi/gen/APPLE_vertex_array_object.xml index daf6990ea..7312f9b35 100644 --- a/lib/mesa/src/mapi/glapi/gen/APPLE_vertex_array_object.xml +++ b/lib/mesa/src/mapi/glapi/gen/APPLE_vertex_array_object.xml @@ -5,21 +5,21 @@ <category name="GL_APPLE_vertex_array_object" number="273"> <enum name="VERTEX_ARRAY_BINDING_APPLE" value="0x85B5"/> - <function name="BindVertexArrayAPPLE" deprecated="3.1" exec="skip"> + <function name="BindVertexArrayAPPLE" deprecated="3.1"> <param name="array" type="GLuint"/> </function> - <function name="DeleteVertexArraysAPPLE" exec="skip"> + <function name="DeleteVertexArraysAPPLE" alias="DeleteVertexArrays"> <param name="n" type="GLsizei"/> <param name="arrays" type="const GLuint *"/> </function> - <function name="GenVertexArraysAPPLE" deprecated="3.1" exec="skip"> + <function name="GenVertexArraysAPPLE" deprecated="3.1"> <param name="n" type="GLsizei"/> <param name="arrays" type="GLuint *" count="n" output="true"/> </function> - <function name="IsVertexArrayAPPLE" exec="skip"> + <function name="IsVertexArrayAPPLE" alias="IsVertexArray"> <param name="array" type="GLuint"/> <return type="GLboolean"/> </function> diff --git a/lib/mesa/src/mapi/glapi/gen/ARB_blend_func_extended.xml b/lib/mesa/src/mapi/glapi/gen/ARB_blend_func_extended.xml index 10d85a766..406140f7d 100644 --- a/lib/mesa/src/mapi/glapi/gen/ARB_blend_func_extended.xml +++ b/lib/mesa/src/mapi/glapi/gen/ARB_blend_func_extended.xml @@ -8,7 +8,7 @@ <category name="GL_ARB_blend_func_extended" number="78"> - <function name="BindFragDataLocationIndexed" no_error="true"> + <function name="BindFragDataLocationIndexed"> <param name="program" type="GLuint"/> <param name="colorNumber" type="GLuint"/> <param name="index" type="GLuint"/> diff --git a/lib/mesa/src/mapi/glapi/gen/ARB_clip_control.xml b/lib/mesa/src/mapi/glapi/gen/ARB_clip_control.xml index 051a64808..ecce133bb 100644 --- a/lib/mesa/src/mapi/glapi/gen/ARB_clip_control.xml +++ b/lib/mesa/src/mapi/glapi/gen/ARB_clip_control.xml @@ -14,7 +14,7 @@ <enum name="CLIP_ORIGIN" value = "0x935C"/> <enum name="CLIP_DEPTH_MODE" value = "0x935D"/> - <function name="ClipControl" no_error="true"> + <function name="ClipControl"> <param name="origin" type="GLenum"/> <param name="depth" type="GLenum"/> <!-- <glx rop="1340"/> --> diff --git a/lib/mesa/src/mapi/glapi/gen/ARB_compute_shader.xml b/lib/mesa/src/mapi/glapi/gen/ARB_compute_shader.xml index 84cbdf396..c2ec842ef 100644 --- a/lib/mesa/src/mapi/glapi/gen/ARB_compute_shader.xml +++ b/lib/mesa/src/mapi/glapi/gen/ARB_compute_shader.xml @@ -26,13 +26,13 @@ <enum name="DISPATCH_INDIRECT_BUFFER_BINDING" value="0x90EF"/> <enum name="COMPUTE_SHADER_BIT" value="0x00000020"/> - <function name="DispatchCompute" es2="3.1" no_error="true"> + <function name="DispatchCompute" es2="3.1"> <param name="num_groups_x" type="GLuint"/> <param name="num_groups_y" type="GLuint"/> <param name="num_groups_z" type="GLuint"/> </function> - <function name="DispatchComputeIndirect" es2="3.1" no_error="true"> + <function name="DispatchComputeIndirect" es2="3.1"> <param name="indirect" type="GLintptr"/> </function> </category> diff --git a/lib/mesa/src/mapi/glapi/gen/ARB_copy_buffer.xml b/lib/mesa/src/mapi/glapi/gen/ARB_copy_buffer.xml index 12e0c195d..d1c6f1fec 100644 --- a/lib/mesa/src/mapi/glapi/gen/ARB_copy_buffer.xml +++ b/lib/mesa/src/mapi/glapi/gen/ARB_copy_buffer.xml @@ -11,7 +11,7 @@ <enum name="COPY_READ_BUFFER" value="0x8F36"/> <enum name="COPY_WRITE_BUFFER" value="0x8F37"/> - <function name="CopyBufferSubData" es2="3.0" no_error="true"> + <function name="CopyBufferSubData" es2="3.0"> <param name="readTarget" type="GLenum"/> <param name="writeTarget" type="GLenum"/> <param name="readOffset" type="GLintptr"/> diff --git a/lib/mesa/src/mapi/glapi/gen/ARB_copy_image.xml b/lib/mesa/src/mapi/glapi/gen/ARB_copy_image.xml index fb4c9b1c2..af672cd38 100644 --- a/lib/mesa/src/mapi/glapi/gen/ARB_copy_image.xml +++ b/lib/mesa/src/mapi/glapi/gen/ARB_copy_image.xml @@ -5,7 +5,7 @@ <category name="GL_ARB_copy_image" number="123"> - <function name="CopyImageSubData" es2="3.2" no_error="true"> + <function name="CopyImageSubData"> <param name="srcName" type="GLuint"/> <param name="srcTarget" type="GLenum"/> <param name="srcLevel" type="GLint"/> diff --git a/lib/mesa/src/mapi/glapi/gen/ARB_direct_state_access.xml b/lib/mesa/src/mapi/glapi/gen/ARB_direct_state_access.xml index 0c34b6385..4c8f73ede 100644 --- a/lib/mesa/src/mapi/glapi/gen/ARB_direct_state_access.xml +++ b/lib/mesa/src/mapi/glapi/gen/ARB_direct_state_access.xml @@ -5,6 +5,7 @@ <category name="GL_ARB_direct_state_access" number="164"> <enum name="TEXTURE_TARGET" value="0x1006"/> <enum name="QUERY_TARGET" value="0x82EA"/> + <enum name="TEXTURE_BINDING" value="0x82EB"/> <!-- Transform Feedback object functions --> @@ -49,33 +50,33 @@ <!-- Buffer object functions --> - <function name="CreateBuffers" no_error="true"> + <function name="CreateBuffers"> <param name="n" type="GLsizei" /> <param name="buffers" type="GLuint *" /> </function> - <function name="NamedBufferStorage" no_error="true"> + <function name="NamedBufferStorage"> <param name="buffer" type="GLuint" /> <param name="size" type="GLsizeiptr" /> <param name="data" type="const GLvoid *" /> <param name="flags" type="GLbitfield" /> </function> - <function name="NamedBufferData" marshal="custom"> + <function name="NamedBufferData"> <param name="buffer" type="GLuint" /> <param name="size" type="GLsizeiptr" /> <param name="data" type="const GLvoid *" /> <param name="usage" type="GLenum" /> </function> - <function name="NamedBufferSubData" no_error="true" marshal="custom"> + <function name="NamedBufferSubData"> <param name="buffer" type="GLuint" /> <param name="offset" type="GLintptr" /> <param name="size" type="GLsizeiptr" /> <param name="data" type="const GLvoid *" /> </function> - <function name="CopyNamedBufferSubData" no_error="true"> + <function name="CopyNamedBufferSubData"> <param name="readBuffer" type="GLuint" /> <param name="writeBuffer" type="GLuint" /> <param name="readOffset" type="GLintptr" /> @@ -101,13 +102,13 @@ <param name="data" type="const GLvoid *" /> </function> - <function name="MapNamedBuffer" no_error="true"> + <function name="MapNamedBuffer"> <return type="GLvoid *" /> <param name="buffer" type="GLuint" /> <param name="access" type="GLenum" /> </function> - <function name="MapNamedBufferRange" no_error="true"> + <function name="MapNamedBufferRange"> <return type="GLvoid *" /> <param name="buffer" type="GLuint" /> <param name="offset" type="GLintptr" /> @@ -115,12 +116,12 @@ <param name="access" type="GLbitfield" /> </function> - <function name="UnmapNamedBuffer" no_error="true"> + <function name="UnmapNamedBuffer"> <return type="GLboolean" /> <param name="buffer" type="GLuint" /> </function> - <function name="FlushMappedNamedBufferRange" no_error="true"> + <function name="FlushMappedNamedBufferRange"> <param name="buffer" type="GLuint" /> <param name="offset" type="GLintptr" /> <param name="length" type="GLsizeiptr" /> @@ -153,32 +154,32 @@ <!-- Framebuffer object functions --> - <function name="CreateFramebuffers"> + <function name="CreateFramebuffers" offset="assign"> <param name="n" type="GLsizei" /> <param name="framebuffers" type="GLuint *" /> </function> - <function name="NamedFramebufferRenderbuffer"> + <function name="NamedFramebufferRenderbuffer" offset="assign"> <param name="framebuffer" type="GLuint" /> <param name="attachment" type="GLenum" /> <param name="renderbuffertarget" type="GLenum" /> <param name="renderbuffer" type="GLuint" /> </function> - <function name="NamedFramebufferParameteri"> + <function name="NamedFramebufferParameteri" offset="assign"> <param name="framebuffer" type="GLuint" /> <param name="pname" type="GLenum" /> <param name="param" type="GLint" /> </function> - <function name="NamedFramebufferTexture" no_error="true"> + <function name="NamedFramebufferTexture" offset="assign"> <param name="framebuffer" type="GLuint" /> <param name="attachment" type="GLenum" /> <param name="texture" type="GLuint" /> <param name="level" type="GLint" /> </function> - <function name="NamedFramebufferTextureLayer" no_error="true"> + <function name="NamedFramebufferTextureLayer" offset="assign"> <param name="framebuffer" type="GLuint" /> <param name="attachment" type="GLenum" /> <param name="texture" type="GLuint" /> @@ -186,29 +187,29 @@ <param name="layer" type="GLint" /> </function> - <function name="NamedFramebufferDrawBuffer"> + <function name="NamedFramebufferDrawBuffer" offset="assign"> <param name="framebuffer" type="GLuint" /> <param name="buf" type="GLenum" /> </function> - <function name="NamedFramebufferDrawBuffers"> + <function name="NamedFramebufferDrawBuffers" offset="assign"> <param name="framebuffer" type="GLuint" /> <param name="n" type="GLsizei" /> <param name="bufs" type="const GLenum *" /> </function> - <function name="NamedFramebufferReadBuffer" no_error="true"> + <function name="NamedFramebufferReadBuffer" offset="assign"> <param name="framebuffer" type="GLuint" /> <param name="buf" type="GLenum" /> </function> - <function name="InvalidateNamedFramebufferData"> + <function name="InvalidateNamedFramebufferData" offset="assign"> <param name="framebuffer" type="GLuint" /> <param name="numAttachments" type="GLsizei" /> <param name="attachments" type="const GLenum *" /> </function> - <function name="InvalidateNamedFramebufferSubData"> + <function name="InvalidateNamedFramebufferSubData" offset="assign"> <param name="framebuffer" type="GLuint" /> <param name="numAttachments" type="GLsizei" /> <param name="attachments" type="const GLenum *" /> @@ -218,36 +219,35 @@ <param name="height" type="GLsizei" /> </function> - <function name="ClearNamedFramebufferiv"> + <function name="ClearNamedFramebufferiv" offset="assign"> <param name="framebuffer" type="GLuint" /> <param name="buffer" type="GLenum" /> <param name="drawbuffer" type="GLint" /> <param name="value" type="const GLint *" /> </function> - <function name="ClearNamedFramebufferuiv"> + <function name="ClearNamedFramebufferuiv" offset="assign"> <param name="framebuffer" type="GLuint" /> <param name="buffer" type="GLenum" /> <param name="drawbuffer" type="GLint" /> <param name="value" type="const GLuint *" /> </function> - <function name="ClearNamedFramebufferfv"> + <function name="ClearNamedFramebufferfv" offset="assign"> <param name="framebuffer" type="GLuint" /> <param name="buffer" type="GLenum" /> <param name="drawbuffer" type="GLint" /> <param name="value" type="const GLfloat *" /> </function> - <function name="ClearNamedFramebufferfi"> + <function name="ClearNamedFramebufferfi" offset="assign"> <param name="framebuffer" type="GLuint" /> <param name="buffer" type="GLenum" /> - <param name="drawbuffer" type="GLint" /> <param name="depth" type="GLfloat" /> <param name="stencil" type="GLint" /> </function> - <function name="BlitNamedFramebuffer" no_error="true"> + <function name="BlitNamedFramebuffer" offset="assign"> <param name="readFramebuffer" type="GLuint" /> <param name="drawFramebuffer" type="GLuint" /> <param name="srcX0" type="GLint" /> @@ -262,19 +262,19 @@ <param name="filter" type="GLenum" /> </function> - <function name="CheckNamedFramebufferStatus"> + <function name="CheckNamedFramebufferStatus" offset="assign"> <return type="GLenum" /> <param name="framebuffer" type="GLuint" /> <param name="target" type="GLenum" /> </function> - <function name="GetNamedFramebufferParameteriv"> + <function name="GetNamedFramebufferParameteriv" offset="assign"> <param name="framebuffer" type="GLuint" /> <param name="pname" type="GLenum" /> <param name="param" type="GLint *" /> </function> - <function name="GetNamedFramebufferAttachmentParameteriv"> + <function name="GetNamedFramebufferAttachmentParameteriv" offset="assign"> <param name="framebuffer" type="GLuint" /> <param name="attachment" type="GLenum" /> <param name="pname" type="GLenum" /> @@ -283,7 +283,7 @@ <!-- Renderbuffer object functions --> - <function name="CreateRenderbuffers" no_error="true"> + <function name="CreateRenderbuffers"> <param name="n" type="GLsizei" /> <param name="renderbuffers" type="GLuint *" /> </function> @@ -311,7 +311,7 @@ <!-- Texture object functions --> - <function name="CreateTextures" no_error="true"> + <function name="CreateTextures"> <param name="target" type="GLenum" /> <param name="n" type="GLsizei" /> <param name="textures" type="GLuint *" /> @@ -410,7 +410,7 @@ <param name="pixels" type="const GLvoid *" /> </function> - <function name="CompressedTextureSubImage1D" no_error="true"> + <function name="CompressedTextureSubImage1D"> <param name="texture" type="GLuint" /> <param name="level" type="GLint" /> <param name="xoffset" type="GLint" /> @@ -420,7 +420,7 @@ <param name="data" type="const GLvoid *" /> </function> - <function name="CompressedTextureSubImage2D" no_error="true"> + <function name="CompressedTextureSubImage2D"> <param name="texture" type="GLuint" /> <param name="level" type="GLint" /> <param name="xoffset" type="GLint" /> @@ -432,7 +432,7 @@ <param name="data" type="const GLvoid *" /> </function> - <function name="CompressedTextureSubImage3D" no_error="true"> + <function name="CompressedTextureSubImage3D"> <param name="texture" type="GLuint" /> <param name="level" type="GLint" /> <param name="xoffset" type="GLint" /> @@ -446,7 +446,7 @@ <param name="data" type="const GLvoid *" /> </function> - <function name="CopyTextureSubImage1D" no_error="true"> + <function name="CopyTextureSubImage1D"> <param name="texture" type="GLuint" /> <param name="level" type="GLint" /> <param name="xoffset" type="GLint" /> @@ -455,7 +455,7 @@ <param name="width" type="GLsizei" /> </function> - <function name="CopyTextureSubImage2D" no_error="true"> + <function name="CopyTextureSubImage2D"> <param name="texture" type="GLuint" /> <param name="level" type="GLint" /> <param name="xoffset" type="GLint" /> @@ -466,7 +466,7 @@ <param name="height" type="GLsizei" /> </function> - <function name="CopyTextureSubImage3D" no_error="true"> + <function name="CopyTextureSubImage3D"> <param name="texture" type="GLuint" /> <param name="level" type="GLint" /> <param name="xoffset" type="GLint" /> @@ -518,7 +518,7 @@ <param name="texture" type="GLuint" /> </function> - <function name="BindTextureUnit" no_error="true"> + <function name="BindTextureUnit"> <param name="unit" type="GLuint" /> <param name="texture" type="GLuint" /> </function> @@ -584,12 +584,12 @@ <param name="arrays" type="GLuint *" /> </function> - <function name="DisableVertexArrayAttrib" no_error="true"> + <function name="DisableVertexArrayAttrib"> <param name="vaobj" type="GLuint" /> <param name="index" type="GLuint" /> </function> - <function name="EnableVertexArrayAttrib" no_error="true"> + <function name="EnableVertexArrayAttrib"> <param name="vaobj" type="GLuint" /> <param name="index" type="GLuint" /> </function> @@ -599,7 +599,7 @@ <param name="buffer" type="GLuint" /> </function> - <function name="VertexArrayVertexBuffer" no_error="true"> + <function name="VertexArrayVertexBuffer"> <param name="vaobj" type="GLuint" /> <param name="bindingindex" type="GLuint" /> <param name="buffer" type="GLuint" /> @@ -607,7 +607,7 @@ <param name="stride" type="GLsizei" /> </function> - <function name="VertexArrayVertexBuffers" no_error="true"> + <function name="VertexArrayVertexBuffers"> <param name="vaobj" type="GLuint" /> <param name="first" type="GLuint" /> <param name="count" type="GLsizei" /> @@ -641,7 +641,7 @@ <param name="relativeoffset" type="GLuint" /> </function> - <function name="VertexArrayAttribBinding" no_error="true"> + <function name="VertexArrayAttribBinding"> <param name="vaobj" type="GLuint" /> <param name="attribindex" type="GLuint" /> <param name="bindingindex" type="GLuint" /> @@ -675,14 +675,14 @@ <!-- Sampler object functions --> - <function name="CreateSamplers" no_error="true"> + <function name="CreateSamplers"> <param name="n" type="GLsizei" /> <param name="samplers" type="GLuint *" /> </function> <!-- Program Pipeline object functions --> - <function name="CreateProgramPipelines" no_error="true"> + <function name="CreateProgramPipelines"> <param name="n" type="GLsizei" /> <param name="pipelines" type="GLuint *" /> </function> diff --git a/lib/mesa/src/mapi/glapi/gen/ARB_draw_buffers_blend.xml b/lib/mesa/src/mapi/glapi/gen/ARB_draw_buffers_blend.xml index 1a44f38d1..8c33fbf89 100644 --- a/lib/mesa/src/mapi/glapi/gen/ARB_draw_buffers_blend.xml +++ b/lib/mesa/src/mapi/glapi/gen/ARB_draw_buffers_blend.xml @@ -13,19 +13,19 @@ <param name="mode" type="GLenum"/> </function> - <function name="BlendEquationSeparateiARB" no_error="true"> + <function name="BlendEquationSeparateiARB"> <param name="buf" type="GLuint"/> <param name="modeRGB" type="GLenum"/> <param name="modeA" type="GLenum"/> </function> - <function name="BlendFunciARB" no_error="true"> + <function name="BlendFunciARB"> <param name="buf" type="GLuint"/> <param name="src" type="GLenum"/> <param name="dst" type="GLenum"/> </function> - <function name="BlendFuncSeparateiARB" no_error="true"> + <function name="BlendFuncSeparateiARB"> <param name="buf" type="GLuint"/> <param name="srcRGB" type="GLenum"/> <param name="dstRGB" type="GLenum"/> diff --git a/lib/mesa/src/mapi/glapi/gen/ARB_framebuffer_object.xml b/lib/mesa/src/mapi/glapi/gen/ARB_framebuffer_object.xml index b8fff9262..1573e7e96 100644 --- a/lib/mesa/src/mapi/glapi/gen/ARB_framebuffer_object.xml +++ b/lib/mesa/src/mapi/glapi/gen/ARB_framebuffer_object.xml @@ -158,7 +158,7 @@ <glx rop="4317"/> </function> - <function name="GenRenderbuffers" es2="2.0" no_error="true"> + <function name="GenRenderbuffers" es2="2.0"> <param name="n" type="GLsizei" counter="true"/> <param name="renderbuffers" type="GLuint *" count="n" output="true"/> <glx vendorpriv="1423" always_array="true"/> @@ -212,13 +212,13 @@ <glx vendorpriv="1426" always_array="true"/> </function> - <function name="CheckFramebufferStatus" es2="2.0" no_error="true"> + <function name="CheckFramebufferStatus" es2="2.0"> <param name="target" type="GLenum"/> <return type="GLenum"/> <glx vendorpriv="1427"/> </function> - <function name="FramebufferTexture1D" no_error="true"> + <function name="FramebufferTexture1D"> <param name="target" type="GLenum"/> <param name="attachment" type="GLenum"/> <param name="textarget" type="GLenum"/> @@ -227,7 +227,7 @@ <glx rop="4321"/> </function> - <function name="FramebufferTexture2D" es2="2.0" no_error="true"> + <function name="FramebufferTexture2D" es2="2.0"> <param name="target" type="GLenum"/> <param name="attachment" type="GLenum"/> <param name="textarget" type="GLenum"/> @@ -236,7 +236,7 @@ <glx rop="4322"/> </function> - <function name="FramebufferTexture3D" no_error="true"> + <function name="FramebufferTexture3D"> <param name="target" type="GLenum"/> <param name="attachment" type="GLenum"/> <param name="textarget" type="GLenum"/> @@ -246,7 +246,7 @@ <glx rop="4323"/> </function> - <function name="FramebufferTextureLayer" es2="3.0" no_error="true"> + <function name="FramebufferTextureLayer" es2="3.0"> <param name="target" type="GLenum"/> <param name="attachment" type="GLenum"/> <param name="texture" type="GLuint"/> @@ -271,7 +271,7 @@ <glx vendorpriv="1428"/> </function> - <function name="BlitFramebuffer" es2="3.0" no_error="true"> + <function name="BlitFramebuffer" es2="3.0"> <param name="srcX0" type="GLint"/> <param name="srcY0" type="GLint"/> <param name="srcX1" type="GLint"/> diff --git a/lib/mesa/src/mapi/glapi/gen/ARB_invalidate_subdata.xml b/lib/mesa/src/mapi/glapi/gen/ARB_invalidate_subdata.xml index 2cbc4f63b..052816ad7 100644 --- a/lib/mesa/src/mapi/glapi/gen/ARB_invalidate_subdata.xml +++ b/lib/mesa/src/mapi/glapi/gen/ARB_invalidate_subdata.xml @@ -19,13 +19,13 @@ <param name="level" type="GLint"/> </function> - <function name="InvalidateBufferSubData" no_error="true"> + <function name="InvalidateBufferSubData"> <param name="buffer" type="GLuint"/> <param name="offset" type="GLintptr"/> <param name="length" type="GLsizeiptr"/> </function> - <function name="InvalidateBufferData" no_error="true"> + <function name="InvalidateBufferData"> <param name="buffer" type="GLuint"/> </function> diff --git a/lib/mesa/src/mapi/glapi/gen/ARB_map_buffer_range.xml b/lib/mesa/src/mapi/glapi/gen/ARB_map_buffer_range.xml index 35a20bea6..cf7b21148 100644 --- a/lib/mesa/src/mapi/glapi/gen/ARB_map_buffer_range.xml +++ b/lib/mesa/src/mapi/glapi/gen/ARB_map_buffer_range.xml @@ -15,7 +15,7 @@ <enum name="MAP_FLUSH_EXPLICIT_BIT" value="0x0010"/> <enum name="MAP_UNSYNCHRONIZED_BIT" value="0x0020"/> - <function name="MapBufferRange" es2="3.0" no_error="true"> + <function name="MapBufferRange" es2="3.0"> <param name="target" type="GLenum"/> <param name="offset" type="GLintptr"/> <param name="length" type="GLsizeiptr"/> @@ -23,7 +23,7 @@ <return type="GLvoid *"/> </function> - <function name="FlushMappedBufferRange" es2="3.0" no_error="true"> + <function name="FlushMappedBufferRange" es2="3.0"> <param name="target" type="GLenum"/> <param name="offset" type="GLintptr"/> <param name="length" type="GLsizeiptr"/> diff --git a/lib/mesa/src/mapi/glapi/gen/ARB_multi_bind.xml b/lib/mesa/src/mapi/glapi/gen/ARB_multi_bind.xml index 601680f30..f42eaa28e 100644 --- a/lib/mesa/src/mapi/glapi/gen/ARB_multi_bind.xml +++ b/lib/mesa/src/mapi/glapi/gen/ARB_multi_bind.xml @@ -35,13 +35,13 @@ <param name="samplers" type="const GLuint *"/> </function> - <function name="BindImageTextures" no_error="true"> + <function name="BindImageTextures"> <param name="first" type="GLuint"/> <param name="count" type="GLsizei"/> <param name="textures" type="const GLuint *"/> </function> - <function name="BindVertexBuffers" no_error="true"> + <function name="BindVertexBuffers"> <param name="first" type="GLuint"/> <param name="count" type="GLsizei"/> <param name="buffers" type="const GLuint *"/> diff --git a/lib/mesa/src/mapi/glapi/gen/ARB_sampler_objects.xml b/lib/mesa/src/mapi/glapi/gen/ARB_sampler_objects.xml index 9fe6c41c8..bc69e97bd 100644 --- a/lib/mesa/src/mapi/glapi/gen/ARB_sampler_objects.xml +++ b/lib/mesa/src/mapi/glapi/gen/ARB_sampler_objects.xml @@ -7,7 +7,7 @@ <category name="GL_ARB_sampler_objects" number="81"> - <function name="GenSamplers" es2="3.0" no_error="true"> + <function name="GenSamplers" es2="3.0"> <param name="count" type="GLsizei"/> <param name="samplers" type="GLuint *"/> </function> @@ -51,13 +51,13 @@ <param name="params" type="const GLfloat *"/> </function> - <function name="SamplerParameterIiv" es2="3.2"> + <function name="SamplerParameterIiv"> <param name="sampler" type="GLuint"/> <param name="pname" type="GLenum"/> <param name="params" type="const GLint *"/> </function> - <function name="SamplerParameterIuiv" es2="3.2"> + <function name="SamplerParameterIuiv"> <param name="sampler" type="GLuint"/> <param name="pname" type="GLenum"/> <param name="params" type="const GLuint *"/> @@ -75,13 +75,13 @@ <param name="params" type="GLfloat *"/> </function> - <function name="GetSamplerParameterIiv" es2="3.2"> + <function name="GetSamplerParameterIiv"> <param name="sampler" type="GLuint"/> <param name="pname" type="GLenum"/> <param name="params" type="GLint *"/> </function> - <function name="GetSamplerParameterIuiv" es2="3.2"> + <function name="GetSamplerParameterIuiv"> <param name="sampler" type="GLuint"/> <param name="pname" type="GLenum"/> <param name="params" type="GLuint *"/> diff --git a/lib/mesa/src/mapi/glapi/gen/ARB_shader_image_load_store.xml b/lib/mesa/src/mapi/glapi/gen/ARB_shader_image_load_store.xml index 6e9ee1fff..178e930f1 100644 --- a/lib/mesa/src/mapi/glapi/gen/ARB_shader_image_load_store.xml +++ b/lib/mesa/src/mapi/glapi/gen/ARB_shader_image_load_store.xml @@ -70,7 +70,7 @@ <enum name="MAX_FRAGMENT_IMAGE_UNIFORMS" value="0x90CE"/> <enum name="MAX_COMBINED_IMAGE_UNIFORMS" value="0x90CF"/> -<function name="BindImageTexture" es2="3.1" no_error="true"> +<function name="BindImageTexture" es2="3.1"> <param name="unit" type="GLuint"/> <param name="texture" type="GLuint"/> <param name="level" type="GLint"/> diff --git a/lib/mesa/src/mapi/glapi/gen/ARB_sync.xml b/lib/mesa/src/mapi/glapi/gen/ARB_sync.xml index f1463f11a..d8a1c34e0 100644 --- a/lib/mesa/src/mapi/glapi/gen/ARB_sync.xml +++ b/lib/mesa/src/mapi/glapi/gen/ARB_sync.xml @@ -39,7 +39,7 @@ --> - <function name="FenceSync" es2="3.0" no_error="true"> + <function name="FenceSync" es2="3.0"> <param name="condition" type="GLenum"/> <param name="flags" type="GLbitfield"/> <return type="GLsync"/> @@ -54,7 +54,7 @@ <param name="sync" type="GLsync"/> </function> - <function name="ClientWaitSync" es2="3.0" no_error="true"> + <function name="ClientWaitSync" es2="3.0"> <param name="sync" type="GLsync"/> <param name="flags" type="GLbitfield"/> <param name="timeout" type="GLuint64"/> diff --git a/lib/mesa/src/mapi/glapi/gen/ARB_uniform_buffer_object.xml b/lib/mesa/src/mapi/glapi/gen/ARB_uniform_buffer_object.xml index 47bb04725..cf86bbb2f 100644 --- a/lib/mesa/src/mapi/glapi/gen/ARB_uniform_buffer_object.xml +++ b/lib/mesa/src/mapi/glapi/gen/ARB_uniform_buffer_object.xml @@ -86,7 +86,7 @@ <!-- Duplicated with GL3x.xml: BindBufferRange, BindBufferBase, GetIntegeri_v --> -<function name="UniformBlockBinding" es2="3.0" no_error="true"> +<function name="UniformBlockBinding" es2="3.0"> <param name="program" type="GLuint" /> <param name="uniformBlockIndex" type="GLuint" /> <param name="uniformBlockBinding" type="GLuint" /> diff --git a/lib/mesa/src/mapi/glapi/gen/ARB_vertex_attrib_64bit.xml b/lib/mesa/src/mapi/glapi/gen/ARB_vertex_attrib_64bit.xml index 6d76003fe..211642fc3 100644 --- a/lib/mesa/src/mapi/glapi/gen/ARB_vertex_attrib_64bit.xml +++ b/lib/mesa/src/mapi/glapi/gen/ARB_vertex_attrib_64bit.xml @@ -51,7 +51,7 @@ <param name="v" type="const GLdouble *"/> </function> - <function name="VertexAttribLPointer" no_error="true"> + <function name="VertexAttribLPointer"> <param name="index" type="GLuint"/> <param name="size" type="GLint"/> <param name="type" type="GLenum"/> diff --git a/lib/mesa/src/mapi/glapi/gen/ARB_vertex_attrib_binding.xml b/lib/mesa/src/mapi/glapi/gen/ARB_vertex_attrib_binding.xml index d1f8db90a..ba9ca57bb 100644 --- a/lib/mesa/src/mapi/glapi/gen/ARB_vertex_attrib_binding.xml +++ b/lib/mesa/src/mapi/glapi/gen/ARB_vertex_attrib_binding.xml @@ -7,7 +7,7 @@ <category name="GL_ARB_vertex_attrib_binding" number="125"> - <function name="BindVertexBuffer" es2="3.1" no_error="true"> + <function name="BindVertexBuffer" es2="3.1"> <param name="bindingindex" type="GLuint"/> <param name="buffer" type="GLuint"/> <param name="offset" type="GLintptr"/> @@ -36,7 +36,7 @@ <param name="relativeoffset" type="GLuint"/> </function> - <function name="VertexAttribBinding" es2="3.1" no_error="true"> + <function name="VertexAttribBinding" es2="3.1"> <param name="attribindex" type="GLuint"/> <param name="bindingindex" type="GLuint"/> </function> diff --git a/lib/mesa/src/mapi/glapi/gen/ARB_viewport_array.xml b/lib/mesa/src/mapi/glapi/gen/ARB_viewport_array.xml index 30c4bca31..b20cf612c 100644 --- a/lib/mesa/src/mapi/glapi/gen/ARB_viewport_array.xml +++ b/lib/mesa/src/mapi/glapi/gen/ARB_viewport_array.xml @@ -12,61 +12,53 @@ <enum name="VIEWPORT_BOUNDS_RANGE" value="0x825D"/> <enum name="LAYER_PROVOKING_VERTEX" value="0x825E"/> <enum name="VIEWPORT_INDEX_PROVOKING_VERTEX" value="0x825F"/> - <enum name="SCISSOR_BOX" count="4" value="0x0C10"> - <size name="Get" mode="get"/> - </enum> - <enum name="VIEWPORT" count="4" value="0x0BA2"> - <size name="Get" mode="get"/> - </enum> - <enum name="DEPTH_RANGE" count="2" value="0x0B70"> - <size name="Get" mode="get"/> - </enum> - <enum name="SCISSOR_TEST" count="1" value="0x0C11"> - <size name="Get" mode="get"/> - </enum> + <enum name="SCISSOR_BOX" value="0x0C10"/> + <enum name="VIEWPORT" value="0x0BA2"/> + <enum name="DEPTH_RANGE" value="0x0B70"/> + <enum name="SCISSOR_TEST" value="0x0C11"/> <enum name="FIRST_VERTEX_CONVENTION" value="0x8E4D"/> <enum name="LAST_VERTEX_CONVENTION" value="0x8E4E"/> <enum name="PROVOKING_VERTEX" value="0x8E4F"/> <enum name="UNDEFINED_VERTEX" value="0x8260"/> - <function name="ViewportArrayv" no_error="true"> + <function name="ViewportArrayv"> <param name="first" type="GLuint"/> <param name="count" type="GLsizei"/> - <param name="v" type="const GLfloat *" count="count" count_scale="4"/> + <param name="v" type="const GLfloat *"/> </function> - <function name="ViewportIndexedf" no_error="true"> + <function name="ViewportIndexedf"> <param name="index" type="GLuint"/> <param name="x" type="GLfloat"/> <param name="y" type="GLfloat"/> <param name="w" type="GLfloat"/> <param name="h" type="GLfloat"/> </function> - <function name="ViewportIndexedfv" no_error="true"> + <function name="ViewportIndexedfv"> <param name="index" type="GLuint"/> - <param name="v" type="const GLfloat *" count="4"/> + <param name="v" type="const GLfloat *"/> </function> - <function name="ScissorArrayv" no_error="true"> + <function name="ScissorArrayv"> <param name="first" type="GLuint"/> <param name="count" type="GLsizei"/> - <param name="v" type="const int *" count="count" count_scale="4"/> + <param name="v" type="const int *"/> </function> - <function name="ScissorIndexed" no_error="true"> + <function name="ScissorIndexed"> <param name="index" type="GLuint"/> <param name="left" type="GLint"/> <param name="bottom" type="GLint"/> <param name="width" type="GLsizei"/> <param name="height" type="GLsizei"/> </function> - <function name="ScissorIndexedv" no_error="true"> + <function name="ScissorIndexedv"> <param name="index" type="GLuint"/> - <param name="v" type="const GLint *" count="4"/> + <param name="v" type="const GLint *"/> </function> <function name="DepthRangeArrayv"> <param name="first" type="GLuint"/> <param name="count" type="GLsizei"/> - <param name="v" type="const GLclampd *" count="count" count_scale="2"/> + <param name="v" type="const GLclampd *"/> </function> - <function name="DepthRangeIndexed" no_error="true"> + <function name="DepthRangeIndexed"> <param name="index" type="GLuint"/> <param name="n" type="GLclampd"/> <param name="f" type="GLclampd"/> diff --git a/lib/mesa/src/mapi/glapi/gen/es_EXT.xml b/lib/mesa/src/mapi/glapi/gen/es_EXT.xml index 271f0c09c..642e3b319 100644 --- a/lib/mesa/src/mapi/glapi/gen/es_EXT.xml +++ b/lib/mesa/src/mapi/glapi/gen/es_EXT.xml @@ -318,8 +318,7 @@ <enum name="POINT_SIZE_ARRAY_OES" value="0x8B9C"/> <enum name="POINT_SIZE_ARRAY_BUFFER_BINDING_OES" value="0x8B9F"/> - <function name="PointSizePointerOES" es1="1.0" desktop="false" - no_error="true"> + <function name="PointSizePointerOES" es1="1.0" desktop="false"> <param name="type" type="GLenum"/> <param name="stride" type="GLsizei"/> <param name="pointer" type="const GLvoid *"/> @@ -791,11 +790,6 @@ </function> </category> -<!-- 122. GL_EXT_shader_framebuffer_fetch --> -<category name="GL_EXT_shader_framebuffer_fetch" number="122"> - <enum name="FRAGMENT_SHADER_DISCARDS_SAMPLES_EXT" value="0x8A52"/> -</category> - <!-- 151. GL_EXT_draw_buffers --> <category name="GL_EXT_draw_buffers" number="151"> <function name="DrawBuffersEXT" alias="DrawBuffers" es2="2.0"> @@ -804,593 +798,4 @@ </function> </category> -<category name="GL_OES_sample_shading" number="169"> - <function name="MinSampleShadingOES" alias="MinSampleShading" es2="3.0"> - <param name="value" type="GLfloat"/> - </function> -</category> - -<!-- 174. GL_OES_texture_storage_multisample_2d_array --> -<category name="GL_OES_texture_storage_multisample_2d_array" number="174"> - <enum name="TEXTURE_2D_MULTISAMPLE_ARRAY_OES" value="0x9102"/> - <enum name="TEXTURE_BINDING_2D_MULTISAMPLE_ARRAY_OES" value="0x9105"/> - <enum name="SAMPLER_2D_MULTISAMPLE_ARRAY_OES" value="0x910B"/> - <enum name="INT_SAMPLER_2D_MULTISAMPLE_ARRAY_OES" value="0x910C"/> - <enum name="UNSIGNED_INT_SAMPLER_2D_MULTISAMPLE_ARRAY_OES" value="0x910D"/> - - <function name="TexStorage3DMultisampleOES" alias="TexStorage3DMultisample" es2="3.1"> - <param name="target" type="GLenum"/> - <param name="samples" type="GLsizei"/> - <param name="internalformat" type="GLenum"/> - <param name="width" type="GLsizei"/> - <param name="height" type="GLsizei"/> - <param name="depth" type="GLsizei"/> - <param name="fixedsamplelocations" type="GLboolean"/> - </function> -</category> - -<category name="GL_EXT_draw_buffers_indexed" number="176"> - - <function name="BlendFunciEXT" alias="BlendFunciARB" es2="3.0"> - <param name="buf" type="GLuint"/> - <param name="sfactor" type="GLenum"/> - <param name="dfactor" type="GLenum"/> - </function> - - <function name="BlendFuncSeparateiEXT" alias="BlendFuncSeparateiARB" es2="3.0"> - <param name="buf" type="GLuint"/> - <param name="sfactorRGB" type="GLenum"/> - <param name="dfactorRGB" type="GLenum"/> - <param name="sfactorAlpha" type="GLenum"/> - <param name="dfactorAlpha" type="GLenum"/> - </function> - - <function name="BlendEquationiEXT" alias="BlendEquationiARB" es2="3.0"> - <param name="buf" type="GLuint"/> - <param name="mode" type="GLenum"/> - </function> - - <function name="BlendEquationSeparateiEXT" alias="BlendEquationSeparateiARB" es2="3.0"> - <param name="buf" type="GLuint"/> - <param name="modeRGB" type="GLenum"/> - <param name="modeA" type="GLenum"/> - </function> - - <function name="ColorMaskiEXT" alias="ColorMaski" es2="3.0"> - <param name="buf" type="GLuint"/> - <param name="r" type="GLboolean"/> - <param name="g" type="GLboolean"/> - <param name="b" type="GLboolean"/> - <param name="a" type="GLboolean"/> - </function> - - <function name="EnableiEXT" alias="Enablei" es2="3.0"> - <param name="target" type="GLenum"/> - <param name="index" type="GLuint"/> - </function> - - <function name="DisableiEXT" alias="Disablei" es2="3.0"> - <param name="target" type="GLenum"/> - <param name="index" type="GLuint"/> - </function> - - <function name="IsEnablediEXT" alias="IsEnabledi" es2="3.0"> - <param name="target" type="GLenum"/> - <param name="index" type="GLuint"/> - <return type="GLboolean"/> - </function> - -</category> - -<category name="GL_EXT_geometry_shader" number="177"> - <!-- The rest of the bits for this are below in OES_geometry_shader. --> - <function name="FramebufferTextureEXT" alias="FramebufferTexture" es2="3.1"> - <param name="target" type="GLenum"/> - <param name="attachment" type="GLenum"/> - <param name="texture" type="GLuint"/> - <param name="level" type="GLint"/> - </function> -</category> - -<category name="GL_EXT_texture_border_clamp" number="182"> - - <!-- The *TexParameter* functions are added in EXT_texture_integer --> - - <function name="SamplerParameterIivEXT" es2="3.0" alias="SamplerParameterIiv"> - <param name="sampler" type="GLuint"/> - <param name="pname" type="GLenum"/> - <param name="params" type="const GLint *"/> - </function> - - <function name="SamplerParameterIuivEXT" es2="3.0" alias="SamplerParameterIuiv"> - <param name="sampler" type="GLuint"/> - <param name="pname" type="GLenum"/> - <param name="params" type="const GLuint *"/> - </function> - - <function name="GetSamplerParameterIivEXT" es2="3.0" alias="GetSamplerParameterIiv"> - <param name="sampler" type="GLuint"/> - <param name="pname" type="GLenum"/> - <param name="params" type="GLint *"/> - </function> - - <function name="GetSamplerParameterIuivEXT" es2="3.0" alias="GetSamplerParameterIuiv"> - <param name="sampler" type="GLuint"/> - <param name="pname" type="GLenum"/> - <param name="params" type="GLuint *"/> - </function> - -</category> - -<category name="GL_EXT_texture_buffer" number="183"> - - <function name="TexBufferEXT" es2="3.1" alias="TexBuffer"> - <param name="target" type="GLenum"/> - <param name="internalFormat" type="GLenum"/> - <param name="buffer" type="GLuint"/> - </function> - - <function name="TexBufferRangeEXT" es2="3.1" alias="TexBufferRange"> - <param name="target" type="GLenum"/> - <param name="internalformat" type="GLenum"/> - <param name="buffer" type="GLuint"/> - <param name="offset" type="GLintptr"/> - <param name="size" type="GLsizeiptr"/> - </function> - -</category> - -<category name="GL_EXT_primitive_bounding_box" number="187"> - - <function name="PrimitiveBoundingBoxEXT" es2="3.1" alias="PrimitiveBoundingBox"> - <param name="minX" type="GLfloat"/> - <param name="minY" type="GLfloat"/> - <param name="minZ" type="GLfloat"/> - <param name="minW" type="GLfloat"/> - <param name="maxX" type="GLfloat"/> - <param name="maxY" type="GLfloat"/> - <param name="maxZ" type="GLfloat"/> - <param name="maxW" type="GLfloat"/> - </function> - -</category> - -<xi:include href="KHR_robustness_es.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> - -<category name="GL_EXT_base_instance" number="203"> - - <function name="DrawArraysInstancedBaseInstanceEXT" es2="3.0" - alias="DrawArraysInstancedBaseInstance"> - <param name="mode" type="GLenum"/> - <param name="first" type="GLint"/> - <param name="count" type="GLsizei"/> - <param name="instancecount" type="GLsizei"/> - <param name="baseinstance" type="GLuint"/> - </function> - - <function name="DrawElementsInstancedBaseInstanceEXT" es2="3.0" - alias="DrawElementsInstancedBaseInstance"> - <param name="mode" type="GLenum"/> - <param name="count" type="GLsizei"/> - <param name="type" type="GLenum"/> - <param name="indices" type="const GLvoid *"/> - <param name="instancecount" type="GLsizei"/> - <param name="baseinstance" type="GLuint"/> - </function> - - <function name="DrawElementsInstancedBaseVertexBaseInstanceEXT" es2="3.0" - alias="DrawElementsInstancedBaseVertexBaseInstance"> - <param name="mode" type="GLenum"/> - <param name="count" type="GLsizei"/> - <param name="type" type="GLenum"/> - <param name="indices" type="const GLvoid *"/> - <param name="instancecount" type="GLsizei"/> - <param name="basevertex" type="GLint"/> - <param name="baseinstance" type="GLuint"/> - </function> - -</category> - -<category name="GL_EXT_draw_elements_base_vertex" number="204"> - - <function name="DrawElementsBaseVertexEXT" alias="DrawElementsBaseVertex" - es2="2.0" exec="dynamic"> - <param name="mode" type="GLenum"/> - <param name="count" type="GLsizei"/> - <param name="type" type="GLenum"/> - <param name="indices" type="const GLvoid *"/> - <param name="basevertex" type="GLint"/> - </function> - - <function name="DrawRangeElementsBaseVertexEXT" alias="DrawRangeElementsBaseVertex" - es2="3.0" exec="dynamic"> - <param name="mode" type="GLenum"/> - <param name="start" type="GLuint"/> - <param name="end" type="GLuint"/> - <param name="count" type="GLsizei"/> - <param name="type" type="GLenum"/> - <param name="indices" type="const GLvoid *"/> - <param name="basevertex" type="GLint"/> - </function> - - <function name="MultiDrawElementsBaseVertexEXT" alias="MultiDrawElementsBaseVertex" - es2="2.0" exec="dynamic"> - <param name="mode" type="GLenum"/> - <param name="count" type="const GLsizei *"/> - <param name="type" type="GLenum"/> - <param name="indices" type="const GLvoid * const *"/> - <param name="primcount" type="GLsizei"/> - <param name="basevertex" type="const GLint *"/> - </function> - - <function name="DrawElementsInstancedBaseVertexEXT" alias="DrawElementsInstancedBaseVertex" - es2="3.0" exec="dynamic"> - <param name="mode" type="GLenum"/> - <param name="count" type="GLsizei"/> - <param name="type" type="GLenum"/> - <param name="indices" type="const GLvoid *"/> - <param name="primcount" type="GLsizei"/> - <param name="basevertex" type="GLint"/> - </function> - -</category> - -<category name="GL_EXT_copy_image" number="208"> - - <function name="CopyImageSubDataEXT" alias="CopyImageSubData" es2="3.0"> - <param name="srcName" type="GLuint"/> - <param name="srcTarget" type="GLenum"/> - <param name="srcLevel" type="GLint"/> - <param name="srcX" type="GLint"/> - <param name="srcY" type="GLint"/> - <param name="srcZ" type="GLint"/> - <param name="dstName" type="GLuint"/> - <param name="dstTarget" type="GLenum"/> - <param name="dstLevel" type="GLint"/> - <param name="dstX" type="GLint"/> - <param name="dstY" type="GLint"/> - <param name="dstZ" type="GLint"/> - <param name="srcWidth" type="GLsizei"/> - <param name="srcHeight" type="GLsizei"/> - <param name="srcDepth" type="GLsizei"/> - </function> - -</category> - -<category name="GL_OES_draw_buffers_indexed" number="209"> - - <function name="BlendFunciOES" alias="BlendFunciARB" es2="3.0"> - <param name="buf" type="GLuint"/> - <param name="sfactor" type="GLenum"/> - <param name="dfactor" type="GLenum"/> - </function> - - <function name="BlendFuncSeparateiOES" alias="BlendFuncSeparateiARB" es2="3.0"> - <param name="buf" type="GLuint"/> - <param name="sfactorRGB" type="GLenum"/> - <param name="dfactorRGB" type="GLenum"/> - <param name="sfactorAlpha" type="GLenum"/> - <param name="dfactorAlpha" type="GLenum"/> - </function> - - <function name="BlendEquationiOES" alias="BlendEquationiARB" es2="3.0"> - <param name="buf" type="GLuint"/> - <param name="mode" type="GLenum"/> - </function> - - <function name="BlendEquationSeparateiOES" alias="BlendEquationSeparateiARB" es2="3.0"> - <param name="buf" type="GLuint"/> - <param name="modeRGB" type="GLenum"/> - <param name="modeA" type="GLenum"/> - </function> - - <function name="ColorMaskiOES" alias="ColorMaski" es2="3.0"> - <param name="buf" type="GLuint"/> - <param name="r" type="GLboolean"/> - <param name="g" type="GLboolean"/> - <param name="b" type="GLboolean"/> - <param name="a" type="GLboolean"/> - </function> - - <function name="EnableiOES" alias="Enablei" es2="3.0"> - <param name="target" type="GLenum"/> - <param name="index" type="GLuint"/> - </function> - - <function name="DisableiOES" alias="Disablei" es2="3.0"> - <param name="target" type="GLenum"/> - <param name="index" type="GLuint"/> - </function> - - <function name="IsEnablediOES" alias="IsEnabledi" es2="3.0"> - <param name="target" type="GLenum"/> - <param name="index" type="GLuint"/> - <return type="GLboolean"/> - </function> - -</category> - -<category name="GL_EXT_primitive_bounding_box" number="212"> - - <function name="PrimitiveBoundingBoxOES" es2="3.1" alias="PrimitiveBoundingBox"> - <param name="minX" type="GLfloat"/> - <param name="minY" type="GLfloat"/> - <param name="minZ" type="GLfloat"/> - <param name="minW" type="GLfloat"/> - <param name="maxX" type="GLfloat"/> - <param name="maxY" type="GLfloat"/> - <param name="maxZ" type="GLfloat"/> - <param name="maxW" type="GLfloat"/> - </function> - -</category> - -<category name="GL_OES_texture_buffer" number="216"> - - <function name="TexBufferOES" es2="3.1" alias="TexBuffer"> - <param name="target" type="GLenum"/> - <param name="internalFormat" type="GLenum"/> - <param name="buffer" type="GLuint"/> - </function> - - <function name="TexBufferRangeOES" es2="3.1" alias="TexBufferRange"> - <param name="target" type="GLenum"/> - <param name="internalformat" type="GLenum"/> - <param name="buffer" type="GLuint"/> - <param name="offset" type="GLintptr"/> - <param name="size" type="GLsizeiptr"/> - </function> - -</category> - -<category name="GL_OES_draw_elements_base_vertex" number="219"> - - <function name="DrawElementsBaseVertexOES" alias="DrawElementsBaseVertex" - es2="2.0" exec="dynamic"> - <param name="mode" type="GLenum"/> - <param name="count" type="GLsizei"/> - <param name="type" type="GLenum"/> - <param name="indices" type="const GLvoid *"/> - <param name="basevertex" type="GLint"/> - </function> - - <function name="DrawRangeElementsBaseVertexOES" alias="DrawRangeElementsBaseVertex" - es2="3.0" exec="dynamic"> - <param name="mode" type="GLenum"/> - <param name="start" type="GLuint"/> - <param name="end" type="GLuint"/> - <param name="count" type="GLsizei"/> - <param name="type" type="GLenum"/> - <param name="indices" type="const GLvoid *"/> - <param name="basevertex" type="GLint"/> - </function> - - <function name="MultiDrawElementsBaseVertexOES" alias="MultiDrawElementsBaseVertex" - es2="2.0" exec="dynamic"> - <param name="mode" type="GLenum"/> - <param name="count" type="const GLsizei *"/> - <param name="type" type="GLenum"/> - <param name="indices" type="const GLvoid * const *"/> - <param name="primcount" type="GLsizei"/> - <param name="basevertex" type="const GLint *"/> - </function> - - <function name="DrawElementsInstancedBaseVertexOES" alias="DrawElementsInstancedBaseVertex" - es2="3.0" exec="dynamic"> - <param name="mode" type="GLenum"/> - <param name="count" type="GLsizei"/> - <param name="type" type="GLenum"/> - <param name="indices" type="const GLvoid *"/> - <param name="primcount" type="GLsizei"/> - <param name="basevertex" type="GLint"/> - </function> - -</category> - -<category name="GL_EXT_buffer_storage" number="239"> - <function name="BufferStorageEXT" alias="BufferStorage" es2="3.1"> - <param name="target" type="GLenum"/> - <param name="size" type="GLsizeiptr"/> - <param name="data" type="const GLvoid *"/> - <param name="flags" type="GLbitfield"/> - </function> -</category> - -<category name="GL_EXT_blend_func_extended" number="247"> - - <function name="BindFragDataLocationIndexedEXT" alias="BindFragDataLocationIndexed" - es2="3.0"> - <param name="program" type="GLuint"/> - <param name="colorNumber" type="GLuint"/> - <param name="index" type="GLuint"/> - <param name="name" type="const GLchar *"/> - </function> - - <function name="GetFragDataIndexEXT" alias="GetFragDataIndex" - es2="3.0"> - <param name="program" type="GLuint"/> - <param name="name" type="const GLchar *"/> - <return type="GLint"/> - </function> - - <function name="GetProgramResourceLocationIndexEXT" alias="GetProgramResourceLocationIndex" - es2="3.1"> - <param name="program" type="GLuint"/> - <param name="programInterface" type="GLenum"/> - <param name="name" type="const GLchar *"/> - <return type="GLint"/> - </function> - -</category> - -<category name="GL_OES_copy_image" number="208"> - - <function name="CopyImageSubDataOES" alias="CopyImageSubData" es2="3.0"> - <param name="srcName" type="GLuint"/> - <param name="srcTarget" type="GLenum"/> - <param name="srcLevel" type="GLint"/> - <param name="srcX" type="GLint"/> - <param name="srcY" type="GLint"/> - <param name="srcZ" type="GLint"/> - <param name="dstName" type="GLuint"/> - <param name="dstTarget" type="GLenum"/> - <param name="dstLevel" type="GLint"/> - <param name="dstX" type="GLint"/> - <param name="dstY" type="GLint"/> - <param name="dstZ" type="GLint"/> - <param name="srcWidth" type="GLsizei"/> - <param name="srcHeight" type="GLsizei"/> - <param name="srcDepth" type="GLsizei"/> - </function> - -</category> - -<!-- 175. GL_OES_geometry_shader --> -<category name="GL_OES_geometry_shader" number="210"> - <enum name="GEOMETRY_SHADER_OES" value="0x8DD9"/> - <enum name="GEOMETRY_SHADER_BIT_OES" value="0x00000004"/> - <enum name="GEOMETRY_LINKED_VERTICES_OUT_OES" value="0x8916"/> - <enum name="GEOMETRY_LINKED_INPUT_TYPE_OES" value="0x8917"/> - <enum name="GEOMETRY_LINKED_OUTPUT_TYPE_OES" value="0x8918"/> - <enum name="GEOMETRY_SHADER_INVOCATIONS_OES" value="0x887F"/> - <enum name="LAYER_PROVOKING_VERTEX_OES" value="0x825E"/> - <enum name="MAX_GEOMETRY_UNIFORM_BLOCKS_OES" value="0x8A2C"/> - <enum name="MAX_COMBINED_GEOMETRY_UNIFORM_COMPONENTS_OES" value="0x8A32"/> - <enum name="MAX_GEOMETRY_INPUT_COMPONENTS_OES" value="0x9123"/> - <enum name="MAX_GEOMETRY_OUTPUT_COMPONENTS_OES" value="0x9124"/> - <enum name="MAX_GEOMETRY_OUTPUT_VERTICES_OES" value="0x8DE0"/> - <enum name="MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS_OES" value="0x8DE1"/> - <enum name="MAX_GEOMETRY_SHADER_INVOCATIONS_OES" value="0x8E5A"/> - <enum name="MAX_GEOMETRY_TEXTURE_IMAGE_UNITS_OES" value="0x8C29"/> - <enum name="MAX_GEOMETRY_ATOMIC_COUNTER_BUFFERS_OES" value="0x92CF"/> - <enum name="MAX_GEOMETRY_ATOMIC_COUNTERS_OES" value="0x92D5"/> - <enum name="MAX_GEOMETRY_IMAGE_UNIFORMS_OES" value="0x90CD"/> - <enum name="MAX_GEOMETRY_SHADER_STORAGE_BLOCKS_OES" value="0x90D7"/> - <enum name="FIRST_VERTEX_CONVENTION_OES" value="0x8E4D"/> - <enum name="LAST_VERTEX_CONVENTION_OES" value="0x8E4E"/> - <enum name="UNDEFINED_VERTEX_OES" value="0x8260"/> - <enum name="PRIMITIVES_GENERATED_OES" value="0x8C87"/> - <enum name="LINES_ADJACENCY_OES" value="0xA"/> - <enum name="LINE_STRIP_ADJACENCY_OES" value="0xB"/> - <enum name="TRIANGLES_ADJACENCY_OES" value="0xC"/> - <enum name="TRIANGLE_STRIP_ADJACENCY_OES" value="0xD"/> - <enum name="FRAMEBUFFER_DEFAULT_LAYERS_OES" value="0x9312"/> - <enum name="MAX_FRAMEBUFFER_LAYERS_OES" value="0x9317"/> - <enum name="FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS_OES" value="0x8DA8"/> - <enum name="FRAMEBUFFER_ATTACHMENT_LAYERED_OES" value="0x8DA7"/> - <enum name="REFERENCED_BY_GEOMETRY_SHADER_OES" value="0x9309"/> - - <function name="FramebufferTextureOES" alias="FramebufferTexture" es2="3.1"> - <param name="target" type="GLenum"/> - <param name="attachment" type="GLenum"/> - <param name="texture" type="GLuint"/> - <param name="level" type="GLint"/> - </function> -</category> - -<category name="GL_OES_texture_border_clamp" number="215"> - - <enum name="TEXTURE_BORDER_COLOR_OES" value ="0x1004"/> - <enum name="CLAMP_TO_BORDER_OES" value="0x812D"/> - - <function name="TexParameterIivOES" es2="3.0" alias="TexParameterIiv"> - <param name="target" type="GLenum"/> - <param name="pname" type="GLenum"/> - <param name="params" type="const GLint *"/> - </function> - - <function name="TexParameterIuivOES" es2="3.0" alias="TexParameterIuiv"> - <param name="target" type="GLenum"/> - <param name="pname" type="GLenum"/> - <param name="params" type="const GLuint *"/> - </function> - - <function name="GetTexParameterIivOES" es2="3.0" alias="GetTexParameterIiv"> - <param name="target" type="GLenum"/> - <param name="pname" type="GLenum"/> - <param name="params" type="GLint *"/> - </function> - - <function name="GetTexParameterIuivOES" es2="3.0" alias="GetTexParameterIuiv"> - <param name="target" type="GLenum"/> - <param name="pname" type="GLenum"/> - <param name="params" type="GLuint *"/> - </function> - - <function name="SamplerParameterIivOES" es2="3.0" alias="SamplerParameterIiv"> - <param name="sampler" type="GLuint"/> - <param name="pname" type="GLenum"/> - <param name="params" type="const GLint *"/> - </function> - - <function name="SamplerParameterIuivOES" es2="3.0" alias="SamplerParameterIuiv"> - <param name="sampler" type="GLuint"/> - <param name="pname" type="GLenum"/> - <param name="params" type="const GLuint *"/> - </function> - - <function name="GetSamplerParameterIivOES" es2="3.0" alias="GetSamplerParameterIiv"> - <param name="sampler" type="GLuint"/> - <param name="pname" type="GLenum"/> - <param name="params" type="GLint *"/> - </function> - - <function name="GetSamplerParameterIuivOES" es2="3.0" alias="GetSamplerParameterIuiv"> - <param name="sampler" type="GLuint"/> - <param name="pname" type="GLenum"/> - <param name="params" type="GLuint *"/> - </function> - -</category> - -<category name="GL_OES_viewport_array" number="267"> - <function name="ViewportArrayvOES" es2="3.1" alias="ViewportArrayv"> - <param name="first" type="GLuint"/> - <param name="count" type="GLsizei"/> - <param name="v" type="const GLfloat *"/> - </function> - <function name="ViewportIndexedfOES" es2="3.1" alias="ViewportIndexedf"> - <param name="index" type="GLuint"/> - <param name="x" type="GLfloat"/> - <param name="y" type="GLfloat"/> - <param name="w" type="GLfloat"/> - <param name="h" type="GLfloat"/> - </function> - <function name="ViewportIndexedfvOES" es2="3.1" alias="ViewportIndexedfv"> - <param name="index" type="GLuint"/> - <param name="v" type="const GLfloat *"/> - </function> - <function name="ScissorArrayvOES" es2="3.1" alias="ScissorArrayv"> - <param name="first" type="GLuint"/> - <param name="count" type="GLsizei"/> - <param name="v" type="const int *"/> - </function> - <function name="ScissorIndexedOES" es2="3.1" alias="ScissorIndexed"> - <param name="index" type="GLuint"/> - <param name="left" type="GLint"/> - <param name="bottom" type="GLint"/> - <param name="width" type="GLsizei"/> - <param name="height" type="GLsizei"/> - </function> - <function name="ScissorIndexedvOES" es2="3.1" alias="ScissorIndexedv"> - <param name="index" type="GLuint"/> - <param name="v" type="const GLint *"/> - </function> - <function name="DepthRangeArrayfvOES" es2="3.1" desktop="false"> - <param name="first" type="GLuint"/> - <param name="count" type="GLsizei"/> - <param name="v" type="const GLfloat *"/> - </function> - <function name="DepthRangeIndexedfOES" es2="3.1" desktop="false"> - <param name="index" type="GLuint"/> - <param name="n" type="GLfloat"/> - <param name="f" type="GLfloat"/> - </function> - <function name="GetFloati_vOES" es2="3.1" alias="GetFloati_v"> - <param name="target" type="GLenum"/> - <param name="index" type="GLuint"/> - <param name="data" type="GLfloat *"/> - </function> -</category> - </OpenGLAPI> diff --git a/lib/mesa/src/mapi/glapi/glapi.c b/lib/mesa/src/mapi/glapi/glapi.c index 55258a476..194b9ee86 100644 --- a/lib/mesa/src/mapi/glapi/glapi.c +++ b/lib/mesa/src/mapi/glapi/glapi.c @@ -60,5 +60,5 @@ _glapi_set_context(void *context) void _glapi_set_dispatch(struct _glapi_table *dispatch) { - u_current_set_table((const struct _glapi_table *) dispatch); + u_current_set_table((const struct mapi_table *) dispatch); } diff --git a/lib/mesa/src/mapi/mapi_glapi.c b/lib/mesa/src/mapi/mapi_glapi.c index 3a376e81b..9f02edb7c 100644 --- a/lib/mesa/src/mapi/mapi_glapi.c +++ b/lib/mesa/src/mapi/mapi_glapi.c @@ -65,7 +65,7 @@ _glapi_set_context(void *context) void _glapi_set_dispatch(struct _glapi_table *dispatch) { - u_current_set_table((const struct _glapi_table *) dispatch); + u_current_set_table((const struct mapi_table *) dispatch); } /** diff --git a/lib/mesa/src/mapi/shared-glapi/SConscript b/lib/mesa/src/mapi/shared-glapi/SConscript index 5d74bd681..26bfe7e95 100644 --- a/lib/mesa/src/mapi/shared-glapi/SConscript +++ b/lib/mesa/src/mapi/shared-glapi/SConscript @@ -26,13 +26,12 @@ def mapi_objects(env, printer, mode): header_name = '%s-tmp.h' % (printer) # generate ABI header - GLAPI = '../glapi/' header = env.CodeGenerate( target = header_name, script = '../mapi_abi.py', - source = [GLAPI + 'gen/gl_and_es_API.xml'] + env.Glob(GLAPI + 'gen/*.xml'), + source = '../glapi/gen/gl_and_es_API.xml', command = python_cmd + ' $SCRIPT ' + \ - '--printer %s $SOURCE > $TARGET' % (printer), + '--printer %s --mode lib $SOURCE > $TARGET' % (printer), ) cpppath = [ @@ -41,7 +40,7 @@ def mapi_objects(env, printer, mode): '#/src', '#/src/mapi', ] - + cppdefines = mapi_defines[mode] + [ 'MAPI_ABI_HEADER=\\"%s\\"' % (header_name), ] diff --git a/lib/mesa/src/mapi/table.h b/lib/mesa/src/mapi/table.h index f488b6d8a..a1af40c6f 100644 --- a/lib/mesa/src/mapi/table.h +++ b/lib/mesa/src/mapi/table.h @@ -37,7 +37,7 @@ #define MAPI_TABLE_NUM_SLOTS (MAPI_TABLE_NUM_STATIC + MAPI_TABLE_NUM_DYNAMIC) #define MAPI_TABLE_SIZE (MAPI_TABLE_NUM_SLOTS * sizeof(mapi_func)) -struct _glapi_table; +struct mapi_table; extern const mapi_func table_noop_array[]; @@ -52,17 +52,17 @@ table_set_noop_handler(nop_handler_proc func); /** * Get the no-op dispatch table. */ -static inline const struct _glapi_table * +static inline const struct mapi_table * table_get_noop(void) { - return (const struct _glapi_table *) table_noop_array; + return (const struct mapi_table *) table_noop_array; } /** * Set the function of a slot. */ static inline void -table_set_func(struct _glapi_table *tbl, int slot, mapi_func func) +table_set_func(struct mapi_table *tbl, int slot, mapi_func func) { mapi_func *funcs = (mapi_func *) tbl; funcs[slot] = func; @@ -72,7 +72,7 @@ table_set_func(struct _glapi_table *tbl, int slot, mapi_func func) * Return the function of a slot. */ static inline mapi_func -table_get_func(const struct _glapi_table *tbl, int slot) +table_get_func(const struct mapi_table *tbl, int slot) { const mapi_func *funcs = (const mapi_func *) tbl; return funcs[slot]; diff --git a/lib/mesa/src/mapi/u_current.c b/lib/mesa/src/mapi/u_current.c index 1402cea45..7e7e275f2 100644 --- a/lib/mesa/src/mapi/u_current.c +++ b/lib/mesa/src/mapi/u_current.c @@ -99,17 +99,17 @@ extern void (*__glapi_noop_table[])(void); /*@{*/ #if defined(GLX_USE_TLS) -__thread struct _glapi_table *u_current_table +__thread struct mapi_table *u_current_table __attribute__((tls_model("initial-exec"))) - = (struct _glapi_table *) table_noop_array; + = (struct mapi_table *) table_noop_array; __thread void *u_current_context __attribute__((tls_model("initial-exec"))); #else -struct _glapi_table *u_current_table = - (struct _glapi_table *) table_noop_array; +struct mapi_table *u_current_table = + (struct mapi_table *) table_noop_array; void *u_current_context; tss_t u_current_table_tsd; @@ -259,17 +259,17 @@ u_current_get_context_internal(void) * table (__glapi_noop_table). */ void -u_current_set_table(const struct _glapi_table *tbl) +u_current_set_table(const struct mapi_table *tbl) { u_current_init(); stub_init_once(); if (!tbl) - tbl = (const struct _glapi_table *) table_noop_array; + tbl = (const struct mapi_table *) table_noop_array; #if defined(GLX_USE_TLS) - u_current_table = (struct _glapi_table *) tbl; + u_current_table = (struct mapi_table *) tbl; #else tss_set(u_current_table_tsd, (void *) tbl); u_current_table = (ThreadSafe) ? NULL : (void *) tbl; @@ -279,15 +279,15 @@ u_current_set_table(const struct _glapi_table *tbl) /** * Return pointer to current dispatch table for calling thread. */ -struct _glapi_table * +struct mapi_table * u_current_get_table_internal(void) { #if defined(GLX_USE_TLS) return u_current_table; #else if (ThreadSafe) - return (struct _glapi_table *) tss_get(u_current_table_tsd); + return (struct mapi_table *) tss_get(u_current_table_tsd); else - return (struct _glapi_table *) u_current_table; + return (struct mapi_table *) u_current_table; #endif } diff --git a/lib/mesa/src/mapi/u_current.h b/lib/mesa/src/mapi/u_current.h index 3c9a414ee..ea4f81723 100644 --- a/lib/mesa/src/mapi/u_current.h +++ b/lib/mesa/src/mapi/u_current.h @@ -10,6 +10,9 @@ #include "glapi/glapi.h" +/* ugly renames to match glapi.h */ +#define mapi_table _glapi_table + #ifdef GLX_USE_TLS #define u_current_table _glapi_tls_Dispatch #define u_current_context _glapi_tls_Context @@ -25,11 +28,11 @@ #else /* MAPI_MODE_UTIL || MAPI_MODE_GLAPI || MAPI_MODE_BRIDGE */ -struct _glapi_table; +struct mapi_table; #ifdef GLX_USE_TLS -extern __thread struct _glapi_table *u_current_table +extern __thread struct mapi_table *u_current_table __attribute__((tls_model("initial-exec"))); extern __thread void *u_current_context @@ -37,7 +40,7 @@ extern __thread void *u_current_context #else /* GLX_USE_TLS */ -extern struct _glapi_table *u_current_table; +extern struct mapi_table *u_current_table; extern void *u_current_context; #endif /* GLX_USE_TLS */ @@ -51,9 +54,9 @@ void u_current_destroy(void); void -u_current_set_table(const struct _glapi_table *tbl); +u_current_set_table(const struct mapi_table *tbl); -struct _glapi_table * +struct mapi_table * u_current_get_table_internal(void); void @@ -62,7 +65,7 @@ u_current_set_context(const void *ptr); void * u_current_get_context_internal(void); -static inline const struct _glapi_table * +static inline const struct mapi_table * u_current_get_table(void) { #ifdef GLX_USE_TLS |