diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2018-01-08 05:41:41 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2018-01-08 05:41:41 +0000 |
| commit | 28b1530fee42a3fea77d7918f5f612e2e052f659 (patch) | |
| tree | 08a228d317d8f1d7fe500b868d3334e371cf3102 /lib/mesa/src/mapi/glapi/gen | |
| parent | e0bf2746b74787c4c07df1bb7b1585d70397b9cb (diff) | |
Revert to Mesa 13.0.6 again.
Corruption has again been reported on Intel hardware running Xorg with
the modesetting driver (which uses OpenGL based acceleration instead of
SNA acceleration the intel driver defaults to).
Reported in various forms on Sandy Bridge (X220), Ivy Bridge (X230) and
Haswell (X240). Confirmed to not occur with the intel driver but the
xserver was changed to default to the modesetting driver on >= gen4
hardware (except Ironlake).
One means of triggering this is to open a large pdf with xpdf on an
idle machine and highlight a section of the document.
There have been reports of gpu hangs on gen4 intel hardware
(T500 with GM45, X61 with 965GM) when starting Xorg as well.
Diffstat (limited to 'lib/mesa/src/mapi/glapi/gen')
44 files changed, 862 insertions, 1328 deletions
diff --git a/lib/mesa/src/mapi/glapi/gen/ARB_base_instance.xml b/lib/mesa/src/mapi/glapi/gen/ARB_base_instance.xml index e3bbcd198..56de639e9 100644 --- a/lib/mesa/src/mapi/glapi/gen/ARB_base_instance.xml +++ b/lib/mesa/src/mapi/glapi/gen/ARB_base_instance.xml @@ -8,8 +8,7 @@ <category name="GL_ARB_base_instance" number="107"> - <function name="DrawArraysInstancedBaseInstance" exec="dynamic" marshal="draw" - marshal_fail="_mesa_glthread_is_non_vbo_draw_elements(ctx)"> + <function name="DrawArraysInstancedBaseInstance" exec="dynamic"> <param name="mode" type="GLenum"/> <param name="first" type="GLint"/> <param name="count" type="GLsizei"/> @@ -17,8 +16,7 @@ <param name="baseinstance" type="GLuint"/> </function> - <function name="DrawElementsInstancedBaseInstance" exec="dynamic" marshal="draw" - marshal_fail="_mesa_glthread_is_non_vbo_draw_elements(ctx)"> + <function name="DrawElementsInstancedBaseInstance" exec="dynamic"> <param name="mode" type="GLenum"/> <param name="count" type="GLsizei"/> <param name="type" type="GLenum"/> @@ -27,8 +25,7 @@ <param name="baseinstance" type="GLuint"/> </function> - <function name="DrawElementsInstancedBaseVertexBaseInstance" exec="dynamic" marshal="draw" - marshal_fail="_mesa_glthread_is_non_vbo_draw_elements(ctx)"> + <function name="DrawElementsInstancedBaseVertexBaseInstance" exec="dynamic"> <param name="mode" type="GLenum"/> <param name="count" type="GLsizei"/> <param name="type" type="GLenum"/> diff --git a/lib/mesa/src/mapi/glapi/gen/ARB_bindless_texture.xml b/lib/mesa/src/mapi/glapi/gen/ARB_bindless_texture.xml deleted file mode 100644 index 762cadf6f..000000000 --- a/lib/mesa/src/mapi/glapi/gen/ARB_bindless_texture.xml +++ /dev/null @@ -1,100 +0,0 @@ -<?xml version="1.0"?> -<!DOCTYPE OpenGLAPI SYSTEM "gl_API.dtd"> - -<OpenGLAPI> - -<category name="GL_ARB_bindless_texture" number="152"> - - <enum name="UNSIGNED_INT64_ARB" value="0x140F" /> - <type name="uint64EXT" unsigned="true" size="8"/> - - <function name="GetTextureHandleARB" no_error="true"> - <return type="GLuint64"/> - <param name="texture" type="GLuint" /> - </function> - - <function name="GetTextureSamplerHandleARB" no_error="true"> - <return type="GLuint64"/> - <param name="texture" type="GLuint" /> - <param name="sampler" type="GLuint" /> - </function> - - <function name="MakeTextureHandleResidentARB" no_error="true"> - <param name="handle" type="GLuint64" /> - </function> - - <function name="MakeTextureHandleNonResidentARB" no_error="true"> - <param name="handle" type="GLuint64" /> - </function> - - <function name="GetImageHandleARB" no_error="true"> - <return type="GLuint64"/> - <param name="texture" type="GLuint" /> - <param name="level" type="GLint" /> - <param name="layered" type="GLboolean" /> - <param name="layer" type="GLint" /> - <param name="format" type="GLenum" /> - </function> - - <function name="MakeImageHandleResidentARB" no_error="true"> - <param name="handle" type="GLuint64" /> - <param name="access" type="GLenum" /> - </function> - - <function name="MakeImageHandleNonResidentARB" no_error="true"> - <param name="handle" type="GLuint64" /> - </function> - - <function name="UniformHandleui64ARB"> - <param name="location" type="GLint" /> - <param name="value" type="GLuint64" /> - </function> - - <function name="UniformHandleui64vARB"> - <param name="location" type="GLint" /> - <param name="count" type="GLsizei" /> - <param name="value" type="const GLuint64 *" /> - </function> - - <function name="ProgramUniformHandleui64ARB"> - <param name="program" type="GLuint" /> - <param name="location" type="GLint" /> - <param name="value" type="GLuint64" /> - </function> - - <function name="ProgramUniformHandleui64vARB"> - <param name="program" type="GLuint" /> - <param name="location" type="GLint" /> - <param name="count" type="GLsizei" /> - <param name="value" type="const GLuint64 *" /> - </function> - - <function name="IsTextureHandleResidentARB" no_error="true"> - <return type="GLboolean"/> - <param name="handle" type="GLuint64" /> - </function> - - <function name="IsImageHandleResidentARB" no_error="true"> - <return type="GLboolean"/> - <param name="handle" type="GLuint64" /> - </function> - - <function name="VertexAttribL1ui64ARB" exec="dynamic"> - <param name="index" type="GLuint" /> - <param name="x" type="GLuint64EXT" /> - </function> - - <function name="VertexAttribL1ui64vARB" exec="dynamic"> - <param name="index" type="GLuint" /> - <param name="v" type="const GLuint64EXT *" /> - </function> - - <function name="GetVertexAttribLui64vARB"> - <param name="index" type="GLuint" /> - <param name="pname" type="GLenum" /> - <param name="params" type="GLuint64EXT *" /> - </function> - -</category> - -</OpenGLAPI> 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 af672cd38..9ee2ba304 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"> + <function name="CopyImageSubData" es2="3.2"> <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 4c8f73ede..43841bb6c 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,7 +5,6 @@ <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 --> @@ -154,32 +153,32 @@ <!-- Framebuffer object functions --> - <function name="CreateFramebuffers" offset="assign"> + <function name="CreateFramebuffers"> <param name="n" type="GLsizei" /> <param name="framebuffers" type="GLuint *" /> </function> - <function name="NamedFramebufferRenderbuffer" offset="assign"> + <function name="NamedFramebufferRenderbuffer"> <param name="framebuffer" type="GLuint" /> <param name="attachment" type="GLenum" /> <param name="renderbuffertarget" type="GLenum" /> <param name="renderbuffer" type="GLuint" /> </function> - <function name="NamedFramebufferParameteri" offset="assign"> + <function name="NamedFramebufferParameteri"> <param name="framebuffer" type="GLuint" /> <param name="pname" type="GLenum" /> <param name="param" type="GLint" /> </function> - <function name="NamedFramebufferTexture" offset="assign"> + <function name="NamedFramebufferTexture"> <param name="framebuffer" type="GLuint" /> <param name="attachment" type="GLenum" /> <param name="texture" type="GLuint" /> <param name="level" type="GLint" /> </function> - <function name="NamedFramebufferTextureLayer" offset="assign"> + <function name="NamedFramebufferTextureLayer"> <param name="framebuffer" type="GLuint" /> <param name="attachment" type="GLenum" /> <param name="texture" type="GLuint" /> @@ -187,29 +186,29 @@ <param name="layer" type="GLint" /> </function> - <function name="NamedFramebufferDrawBuffer" offset="assign"> + <function name="NamedFramebufferDrawBuffer"> <param name="framebuffer" type="GLuint" /> <param name="buf" type="GLenum" /> </function> - <function name="NamedFramebufferDrawBuffers" offset="assign"> + <function name="NamedFramebufferDrawBuffers"> <param name="framebuffer" type="GLuint" /> <param name="n" type="GLsizei" /> <param name="bufs" type="const GLenum *" /> </function> - <function name="NamedFramebufferReadBuffer" offset="assign"> + <function name="NamedFramebufferReadBuffer"> <param name="framebuffer" type="GLuint" /> <param name="buf" type="GLenum" /> </function> - <function name="InvalidateNamedFramebufferData" offset="assign"> + <function name="InvalidateNamedFramebufferData"> <param name="framebuffer" type="GLuint" /> <param name="numAttachments" type="GLsizei" /> <param name="attachments" type="const GLenum *" /> </function> - <function name="InvalidateNamedFramebufferSubData" offset="assign"> + <function name="InvalidateNamedFramebufferSubData"> <param name="framebuffer" type="GLuint" /> <param name="numAttachments" type="GLsizei" /> <param name="attachments" type="const GLenum *" /> @@ -219,35 +218,36 @@ <param name="height" type="GLsizei" /> </function> - <function name="ClearNamedFramebufferiv" offset="assign"> + <function name="ClearNamedFramebufferiv"> <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" offset="assign"> + <function name="ClearNamedFramebufferuiv"> <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" offset="assign"> + <function name="ClearNamedFramebufferfv"> <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" offset="assign"> + <function name="ClearNamedFramebufferfi"> <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" offset="assign"> + <function name="BlitNamedFramebuffer"> <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" offset="assign"> + <function name="CheckNamedFramebufferStatus"> <return type="GLenum" /> <param name="framebuffer" type="GLuint" /> <param name="target" type="GLenum" /> </function> - <function name="GetNamedFramebufferParameteriv" offset="assign"> + <function name="GetNamedFramebufferParameteriv"> <param name="framebuffer" type="GLuint" /> <param name="pname" type="GLenum" /> <param name="param" type="GLint *" /> </function> - <function name="GetNamedFramebufferAttachmentParameteriv" offset="assign"> + <function name="GetNamedFramebufferAttachmentParameteriv"> <param name="framebuffer" type="GLuint" /> <param name="attachment" type="GLenum" /> <param name="pname" type="GLenum" /> diff --git a/lib/mesa/src/mapi/glapi/gen/ARB_draw_elements_base_vertex.xml b/lib/mesa/src/mapi/glapi/gen/ARB_draw_elements_base_vertex.xml index 2f1a93dc8..72aa62c77 100644 --- a/lib/mesa/src/mapi/glapi/gen/ARB_draw_elements_base_vertex.xml +++ b/lib/mesa/src/mapi/glapi/gen/ARB_draw_elements_base_vertex.xml @@ -8,8 +8,7 @@ <category name="GL_ARB_draw_elements_base_vertex" number="62"> - <function name="DrawElementsBaseVertex" es2="3.2" exec="dynamic" marshal="draw" - marshal_fail="_mesa_glthread_is_non_vbo_draw_elements(ctx)"> + <function name="DrawElementsBaseVertex" es2="3.2" exec="dynamic"> <param name="mode" type="GLenum"/> <param name="count" type="GLsizei"/> <param name="type" type="GLenum"/> @@ -17,8 +16,7 @@ <param name="basevertex" type="GLint"/> </function> - <function name="DrawRangeElementsBaseVertex" es2="3.2" exec="dynamic" marshal="draw" - marshal_fail="_mesa_glthread_is_non_vbo_draw_elements(ctx)"> + <function name="DrawRangeElementsBaseVertex" es2="3.2" exec="dynamic"> <param name="mode" type="GLenum"/> <param name="start" type="GLuint"/> <param name="end" type="GLuint"/> @@ -28,8 +26,7 @@ <param name="basevertex" type="GLint"/> </function> - <function name="MultiDrawElementsBaseVertex" exec="dynamic" marshal="draw" - marshal_fail="_mesa_glthread_is_non_vbo_draw_elements(ctx)"> + <function name="MultiDrawElementsBaseVertex" exec="dynamic"> <param name="mode" type="GLenum"/> <param name="count" type="const GLsizei *"/> <param name="type" type="GLenum"/> @@ -38,8 +35,7 @@ <param name="basevertex" type="const GLint *"/> </function> - <function name="DrawElementsInstancedBaseVertex" es2="3.2" exec="dynamic" marshal="draw" - marshal_fail="_mesa_glthread_is_non_vbo_draw_elements(ctx)"> + <function name="DrawElementsInstancedBaseVertex" es2="3.2" exec="dynamic"> <param name="mode" type="GLenum"/> <param name="count" type="GLsizei"/> <param name="type" type="GLenum"/> diff --git a/lib/mesa/src/mapi/glapi/gen/ARB_draw_instanced.xml b/lib/mesa/src/mapi/glapi/gen/ARB_draw_instanced.xml index 8d7fd6301..b1c822144 100644 --- a/lib/mesa/src/mapi/glapi/gen/ARB_draw_instanced.xml +++ b/lib/mesa/src/mapi/glapi/gen/ARB_draw_instanced.xml @@ -8,15 +8,14 @@ <category name="GL_ARB_draw_instanced" number="44"> - <function name="DrawArraysInstancedARB" exec="dynamic" marshal="draw"> + <function name="DrawArraysInstancedARB" exec="dynamic"> <param name="mode" type="GLenum"/> <param name="first" type="GLint"/> <param name="count" type="GLsizei"/> <param name="primcount" type="GLsizei"/> </function> - <function name="DrawElementsInstancedARB" exec="dynamic" marshal="draw" - marshal_fail="_mesa_glthread_is_non_vbo_draw_elements(ctx)"> + <function name="DrawElementsInstancedARB" exec="dynamic"> <param name="mode" type="GLenum"/> <param name="count" type="GLsizei"/> <param name="type" type="GLenum"/> diff --git a/lib/mesa/src/mapi/glapi/gen/ARB_gpu_shader_fp64.xml b/lib/mesa/src/mapi/glapi/gen/ARB_gpu_shader_fp64.xml index 2f2b914b3..fd1ad117e 100644 --- a/lib/mesa/src/mapi/glapi/gen/ARB_gpu_shader_fp64.xml +++ b/lib/mesa/src/mapi/glapi/gen/ARB_gpu_shader_fp64.xml @@ -34,88 +34,88 @@ <function name="Uniform1dv"> <param name="location" type="GLint"/> <param name="count" type="GLsizei"/> - <param name="value" type="const GLdouble *" count="count"/> + <param name="value" type="const GLdouble *"/> </function> <function name="Uniform2dv"> <param name="location" type="GLint"/> <param name="count" type="GLsizei"/> - <param name="value" type="const GLdouble *" count="count" count_scale="2"/> + <param name="value" type="const GLdouble *"/> </function> <function name="Uniform3dv"> <param name="location" type="GLint"/> <param name="count" type="GLsizei"/> - <param name="value" type="const GLdouble *" count="count" count_scale="3"/> + <param name="value" type="const GLdouble *"/> </function> <function name="Uniform4dv"> <param name="location" type="GLint"/> <param name="count" type="GLsizei"/> - <param name="value" type="const GLdouble *" count="count" count_scale="4"/> + <param name="value" type="const GLdouble *"/> </function> <function name="UniformMatrix2dv"> <param name="location" type="GLint"/> <param name="count" type="GLsizei"/> <param name="transpose" type="GLboolean"/> - <param name="value" type="const GLdouble *" count="count" count_scale="4"/> + <param name="value" type="const GLdouble *"/> </function> <function name="UniformMatrix3dv"> <param name="location" type="GLint"/> <param name="count" type="GLsizei"/> <param name="transpose" type="GLboolean"/> - <param name="value" type="const GLdouble *" count="count" count_scale="9"/> + <param name="value" type="const GLdouble *"/> </function> <function name="UniformMatrix4dv"> <param name="location" type="GLint"/> <param name="count" type="GLsizei"/> <param name="transpose" type="GLboolean"/> - <param name="value" type="const GLdouble *" count="count" count_scale="16"/> + <param name="value" type="const GLdouble *"/> </function> <function name="UniformMatrix2x3dv"> <param name="location" type="GLint"/> <param name="count" type="GLsizei"/> <param name="transpose" type="GLboolean"/> - <param name="value" type="const GLdouble *" count="count" count_scale="6"/> + <param name="value" type="const GLdouble *"/> </function> <function name="UniformMatrix2x4dv"> <param name="location" type="GLint"/> <param name="count" type="GLsizei"/> <param name="transpose" type="GLboolean"/> - <param name="value" type="const GLdouble *" count="count" count_scale="8"/> + <param name="value" type="const GLdouble *"/> </function> <function name="UniformMatrix3x2dv"> <param name="location" type="GLint"/> <param name="count" type="GLsizei"/> <param name="transpose" type="GLboolean"/> - <param name="value" type="const GLdouble *" count="count" count_scale="6"/> + <param name="value" type="const GLdouble *"/> </function> <function name="UniformMatrix3x4dv"> <param name="location" type="GLint"/> <param name="count" type="GLsizei"/> <param name="transpose" type="GLboolean"/> - <param name="value" type="const GLdouble *" count="count" count_scale="12"/> + <param name="value" type="const GLdouble *"/> </function> <function name="UniformMatrix4x2dv"> <param name="location" type="GLint"/> <param name="count" type="GLsizei"/> <param name="transpose" type="GLboolean"/> - <param name="value" type="const GLdouble *" count="count" count_scale="8"/> + <param name="value" type="const GLdouble *"/> </function> <function name="UniformMatrix4x3dv"> <param name="location" type="GLint"/> <param name="count" type="GLsizei"/> <param name="transpose" type="GLboolean"/> - <param name="value" type="const GLdouble *" count="count" count_scale="12"/> + <param name="value" type="const GLdouble *"/> </function> <function name="GetUniformdv"> diff --git a/lib/mesa/src/mapi/glapi/gen/ARB_gpu_shader_int64.xml b/lib/mesa/src/mapi/glapi/gen/ARB_gpu_shader_int64.xml deleted file mode 100644 index f6ee64c31..000000000 --- a/lib/mesa/src/mapi/glapi/gen/ARB_gpu_shader_int64.xml +++ /dev/null @@ -1,262 +0,0 @@ -<?xml version="1.0"?> -<!DOCTYPE OpenGLAPI SYSTEM "gl_API.dtd"> - -<OpenGLAPI> - -<category name="GL_ARB_gpu_shader_int64" number="178"> - - <function name="Uniform1i64ARB"> - <param name="location" type="GLint"/> - <param name="x" type="GLint64"/> - </function> - - <function name="Uniform2i64ARB"> - <param name="location" type="GLint"/> - <param name="x" type="GLint64"/> - <param name="y" type="GLint64"/> - </function> - - <function name="Uniform3i64ARB"> - <param name="location" type="GLint"/> - <param name="x" type="GLint64"/> - <param name="y" type="GLint64"/> - <param name="z" type="GLint64"/> - </function> - - <function name="Uniform4i64ARB"> - <param name="location" type="GLint"/> - <param name="x" type="GLint64"/> - <param name="y" type="GLint64"/> - <param name="z" type="GLint64"/> - <param name="w" type="GLint64"/> - </function> - - <function name="Uniform1i64vARB"> - <param name="location" type="GLint"/> - <param name="count" type="GLsizei"/> - <param name="value" type="const GLint64 *" count="count"/> - </function> - - <function name="Uniform2i64vARB"> - <param name="location" type="GLint"/> - <param name="count" type="GLsizei"/> - <param name="value" type="const GLint64 *" count="count" count_scale="2"/> - </function> - - <function name="Uniform3i64vARB"> - <param name="location" type="GLint"/> - <param name="count" type="GLsizei"/> - <param name="value" type="const GLint64 *" count="count" count_scale="3"/> - </function> - - <function name="Uniform4i64vARB"> - <param name="location" type="GLint"/> - <param name="count" type="GLsizei"/> - <param name="value" type="const GLint64 *" count="count" count_scale="4"/> - </function> - - <function name="Uniform1ui64ARB"> - <param name="location" type="GLint"/> - <param name="x" type="GLuint64"/> - </function> - - <function name="Uniform2ui64ARB"> - <param name="location" type="GLint"/> - <param name="x" type="GLuint64"/> - <param name="y" type="GLuint64"/> - </function> - - <function name="Uniform3ui64ARB"> - <param name="location" type="GLint"/> - <param name="x" type="GLuint64"/> - <param name="y" type="GLuint64"/> - <param name="z" type="GLuint64"/> - </function> - - <function name="Uniform4ui64ARB"> - <param name="location" type="GLint"/> - <param name="x" type="GLuint64"/> - <param name="y" type="GLuint64"/> - <param name="z" type="GLuint64"/> - <param name="w" type="GLuint64"/> - </function> - - <function name="Uniform1ui64vARB"> - <param name="location" type="GLint"/> - <param name="count" type="GLsizei"/> - <param name="value" type="const GLuint64 *" count="count"/> - </function> - - <function name="Uniform2ui64vARB"> - <param name="location" type="GLint"/> - <param name="count" type="GLsizei"/> - <param name="value" type="const GLuint64 *" count="count" count_scale="2"/> - </function> - - <function name="Uniform3ui64vARB"> - <param name="location" type="GLint"/> - <param name="count" type="GLsizei"/> - <param name="value" type="const GLuint64 *" count="count" count_scale="3"/> - </function> - - <function name="Uniform4ui64vARB"> - <param name="location" type="GLint"/> - <param name="count" type="GLsizei"/> - <param name="value" type="const GLuint64 *" count="count" count_scale="4"/> - </function> - - <function name="GetUniformi64vARB"> - <param name="program" type="GLuint"/> - <param name="location" type="GLint"/> - <param name="params" type="GLint64 *"/> - </function> - - <function name="GetUniformui64vARB"> - <param name="program" type="GLuint"/> - <param name="location" type="GLint"/> - <param name="params" type="GLuint64 *"/> - </function> - - <function name="GetnUniformi64vARB"> - <param name="program" type="GLuint"/> - <param name="location" type="GLint"/> - <param name="bufSize" type="GLsizei"/> - <param name="params" type="GLint64 *"/> - </function> - - <function name="GetnUniformui64vARB"> - <param name="program" type="GLuint"/> - <param name="location" type="GLint"/> - <param name="bufSize" type="GLsizei"/> - <param name="params" type="GLuint64 *"/> - </function> - - <function name="ProgramUniform1i64ARB"> - <param name="program" type="GLuint"/> - <param name="location" type="GLint"/> - <param name="x" type="GLint64"/> - </function> - - <function name="ProgramUniform2i64ARB"> - <param name="program" type="GLuint"/> - <param name="location" type="GLint"/> - <param name="x" type="GLint64"/> - <param name="y" type="GLint64"/> - </function> - - <function name="ProgramUniform3i64ARB"> - <param name="program" type="GLuint"/> - <param name="location" type="GLint"/> - <param name="x" type="GLint64"/> - <param name="y" type="GLint64"/> - <param name="z" type="GLint64"/> - </function> - - <function name="ProgramUniform4i64ARB"> - <param name="program" type="GLuint"/> - <param name="location" type="GLint"/> - <param name="x" type="GLint64"/> - <param name="y" type="GLint64"/> - <param name="z" type="GLint64"/> - <param name="w" type="GLint64"/> - </function> - - <function name="ProgramUniform1i64vARB"> - <param name="program" type="GLuint"/> - <param name="location" type="GLint"/> - <param name="count" type="GLsizei"/> - <param name="value" type="const GLint64 *" count="count"/> - </function> - - <function name="ProgramUniform2i64vARB"> - <param name="program" type="GLuint"/> - <param name="location" type="GLint"/> - <param name="count" type="GLsizei"/> - <param name="value" type="const GLint64 *" count="count" count_scale="2"/> - </function> - - <function name="ProgramUniform3i64vARB"> - <param name="program" type="GLuint"/> - <param name="location" type="GLint"/> - <param name="count" type="GLsizei"/> - <param name="value" type="const GLint64 *" count="count" count_scale="3"/> - </function> - - <function name="ProgramUniform4i64vARB"> - <param name="program" type="GLuint"/> - <param name="location" type="GLint"/> - <param name="count" type="GLsizei"/> - <param name="value" type="const GLint64 *" count="count" count_scale="4"/> - </function> - - <function name="ProgramUniform1ui64ARB"> - <param name="program" type="GLuint"/> - <param name="location" type="GLint"/> - <param name="x" type="GLuint64"/> - </function> - - <function name="ProgramUniform2ui64ARB"> - <param name="program" type="GLuint"/> - <param name="location" type="GLint"/> - <param name="x" type="GLuint64"/> - <param name="y" type="GLuint64"/> - </function> - - <function name="ProgramUniform3ui64ARB"> - <param name="program" type="GLuint"/> - <param name="location" type="GLint"/> - <param name="x" type="GLuint64"/> - <param name="y" type="GLuint64"/> - <param name="z" type="GLuint64"/> - </function> - - <function name="ProgramUniform4ui64ARB"> - <param name="program" type="GLuint"/> - <param name="location" type="GLint"/> - <param name="x" type="GLuint64"/> - <param name="y" type="GLuint64"/> - <param name="z" type="GLuint64"/> - <param name="w" type="GLuint64"/> - </function> - - <function name="ProgramUniform1ui64vARB"> - <param name="program" type="GLuint"/> - <param name="location" type="GLint"/> - <param name="count" type="GLsizei"/> - <param name="value" type="const GLuint64 *" count="count"/> - </function> - - <function name="ProgramUniform2ui64vARB"> - <param name="program" type="GLuint"/> - <param name="location" type="GLint"/> - <param name="count" type="GLsizei"/> - <param name="value" type="const GLuint64 *" count="count" count_scale="2"/> - </function> - - <function name="ProgramUniform3ui64vARB"> - <param name="program" type="GLuint"/> - <param name="location" type="GLint"/> - <param name="count" type="GLsizei"/> - <param name="value" type="const GLuint64 *" count="count" count_scale="3"/> - </function> - - <function name="ProgramUniform4ui64vARB"> - <param name="program" type="GLuint"/> - <param name="location" type="GLint"/> - <param name="count" type="GLsizei"/> - <param name="value" type="const GLuint64 *" count="count" count_scale="4"/> - </function> - - <enum name="INT64_ARB" value="0x140E"/> - <enum name="UNSIGNED_INT64_ARB" value="0x140F"/> - <enum name="INT64_VEC2_ARB" value="0x8FE9"/> - <enum name="INT64_VEC3_ARB" value="0x8FEA"/> - <enum name="INT64_VEC4_ARB" value="0x8FEB"/> - <enum name="UNSIGNED_INT64_VEC2_ARB" value="0x8FF5"/> - <enum name="UNSIGNED_INT64_VEC3_ARB" value="0x8FF6"/> - <enum name="UNSIGNED_INT64_VEC4_ARB" value="0x8FF7"/> - -</category> - -</OpenGLAPI> - 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 bc69e97bd..20363f70b 100644 --- a/lib/mesa/src/mapi/glapi/gen/ARB_sampler_objects.xml +++ b/lib/mesa/src/mapi/glapi/gen/ARB_sampler_objects.xml @@ -51,13 +51,13 @@ <param name="params" type="const GLfloat *"/> </function> - <function name="SamplerParameterIiv"> + <function name="SamplerParameterIiv" es2="3.2"> <param name="sampler" type="GLuint"/> <param name="pname" type="GLenum"/> <param name="params" type="const GLint *"/> </function> - <function name="SamplerParameterIuiv"> + <function name="SamplerParameterIuiv" es2="3.2"> <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"> + <function name="GetSamplerParameterIiv" es2="3.2"> <param name="sampler" type="GLuint"/> <param name="pname" type="GLenum"/> <param name="params" type="GLint *"/> </function> - <function name="GetSamplerParameterIuiv"> + <function name="GetSamplerParameterIuiv" es2="3.2"> <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_separate_shader_objects.xml b/lib/mesa/src/mapi/glapi/gen/ARB_separate_shader_objects.xml index 2273b4875..c9f481d8b 100644 --- a/lib/mesa/src/mapi/glapi/gen/ARB_separate_shader_objects.xml +++ b/lib/mesa/src/mapi/glapi/gen/ARB_separate_shader_objects.xml @@ -15,12 +15,12 @@ <enum name="ALL_SHADER_BITS" value="0xFFFFFFFF"/> <enum name="PROGRAM_SEPARABLE" value="0x8258"/> - <function name="UseProgramStages" es2="3.1" no_error="true"> + <function name="UseProgramStages" es2="3.1"> <param name="pipeline" type="GLuint" /> <param name="stages" type="GLbitfield" /> <param name="program" type="GLuint" /> </function> - <function name="ActiveShaderProgram" es2="3.1" no_error="true"> + <function name="ActiveShaderProgram" es2="3.1"> <param name="pipeline" type="GLuint" /> <param name="program" type="GLuint" /> </function> @@ -30,14 +30,14 @@ <param name="strings" type="const GLchar * const *" /> <return type="GLuint"/> </function> - <function name="BindProgramPipeline" es2="3.1" no_error="true"> + <function name="BindProgramPipeline" es2="3.1"> <param name="pipeline" type="GLuint" /> </function> <function name="DeleteProgramPipelines" es2="3.1"> <param name="n" type="GLsizei" /> <param name="pipelines" type="const GLuint *" /> </function> - <function name="GenProgramPipelines" es2="3.1" no_error="true"> + <function name="GenProgramPipelines" es2="3.1"> <param name="n" type="GLsizei" /> <param name="pipelines" type="GLuint *" /> </function> @@ -141,136 +141,136 @@ <param name="program" type="GLuint" /> <param name="location" type="GLint" /> <param name="count" type="GLsizei" /> - <param name="value" type="const GLint *" count="count" /> + <param name="value" type="const GLint *" /> </function> <function name="ProgramUniform2iv" es2="3.1"> <param name="program" type="GLuint" /> <param name="location" type="GLint" /> <param name="count" type="GLsizei" /> - <param name="value" type="const GLint *" count="count" count_scale="2" /> + <param name="value" type="const GLint *" /> </function> <function name="ProgramUniform3iv" es2="3.1"> <param name="program" type="GLuint" /> <param name="location" type="GLint" /> <param name="count" type="GLsizei" /> - <param name="value" type="const GLint *" count="count" count_scale="3" /> + <param name="value" type="const GLint *" /> </function> <function name="ProgramUniform4iv" es2="3.1"> <param name="program" type="GLuint" /> <param name="location" type="GLint" /> <param name="count" type="GLsizei" /> - <param name="value" type="const GLint *" count="count" count_scale="4" /> + <param name="value" type="const GLint *" /> </function> <function name="ProgramUniform1uiv" es2="3.1"> <param name="program" type="GLuint" /> <param name="location" type="GLint" /> <param name="count" type="GLsizei" /> - <param name="value" type="const GLuint *" count="count" /> + <param name="value" type="const GLuint *" /> </function> <function name="ProgramUniform2uiv" es2="3.1"> <param name="program" type="GLuint" /> <param name="location" type="GLint" /> <param name="count" type="GLsizei" /> - <param name="value" type="const GLuint *" count="count" count_scale="2" /> + <param name="value" type="const GLuint *" /> </function> <function name="ProgramUniform3uiv" es2="3.1"> <param name="program" type="GLuint" /> <param name="location" type="GLint" /> <param name="count" type="GLsizei" /> - <param name="value" type="const GLuint *" count="count" count_scale="3" /> + <param name="value" type="const GLuint *" /> </function> <function name="ProgramUniform4uiv" es2="3.1"> <param name="program" type="GLuint" /> <param name="location" type="GLint" /> <param name="count" type="GLsizei" /> - <param name="value" type="const GLuint *" count="count" count_scale="4" /> + <param name="value" type="const GLuint *" /> </function> <function name="ProgramUniform1fv" es2="3.1"> <param name="program" type="GLuint" /> <param name="location" type="GLint" /> <param name="count" type="GLsizei" /> - <param name="value" type="const GLfloat *" count="count" /> + <param name="value" type="const GLfloat *" /> </function> <function name="ProgramUniform2fv" es2="3.1"> <param name="program" type="GLuint" /> <param name="location" type="GLint" /> <param name="count" type="GLsizei" /> - <param name="value" type="const GLfloat *" count="count" count_scale="2" /> + <param name="value" type="const GLfloat *" /> </function> <function name="ProgramUniform3fv" es2="3.1"> <param name="program" type="GLuint" /> <param name="location" type="GLint" /> <param name="count" type="GLsizei" /> - <param name="value" type="const GLfloat *" count="count" count_scale="3" /> + <param name="value" type="const GLfloat *" /> </function> <function name="ProgramUniform4fv" es2="3.1"> <param name="program" type="GLuint" /> <param name="location" type="GLint" /> <param name="count" type="GLsizei" /> - <param name="value" type="const GLfloat *" count="count" count_scale="4" /> + <param name="value" type="const GLfloat *" /> </function> <function name="ProgramUniformMatrix2fv" es2="3.1"> <param name="program" type="GLuint" /> <param name="location" type="GLint" /> <param name="count" type="GLsizei" /> <param name="transpose" type="GLboolean" /> - <param name="value" type="const GLfloat *" count="count" count_scale="4" /> + <param name="value" type="const GLfloat *" /> </function> <function name="ProgramUniformMatrix3fv" es2="3.1"> <param name="program" type="GLuint" /> <param name="location" type="GLint" /> <param name="count" type="GLsizei" /> <param name="transpose" type="GLboolean" /> - <param name="value" type="const GLfloat *" count="count" count_scale="9" /> + <param name="value" type="const GLfloat *" /> </function> <function name="ProgramUniformMatrix4fv" es2="3.1"> <param name="program" type="GLuint" /> <param name="location" type="GLint" /> <param name="count" type="GLsizei" /> <param name="transpose" type="GLboolean" /> - <param name="value" type="const GLfloat *" count="count" count_scale="16" /> + <param name="value" type="const GLfloat *" /> </function> <function name="ProgramUniformMatrix2x3fv" es2="3.1"> <param name="program" type="GLuint" /> <param name="location" type="GLint" /> <param name="count" type="GLsizei" /> <param name="transpose" type="GLboolean" /> - <param name="value" type="const GLfloat *" count="count" count_scale="6" /> + <param name="value" type="const GLfloat *" /> </function> <function name="ProgramUniformMatrix3x2fv" es2="3.1"> <param name="program" type="GLuint" /> <param name="location" type="GLint" /> <param name="count" type="GLsizei" /> <param name="transpose" type="GLboolean" /> - <param name="value" type="const GLfloat *" count="count" count_scale="6" /> + <param name="value" type="const GLfloat *" /> </function> <function name="ProgramUniformMatrix2x4fv" es2="3.1"> <param name="program" type="GLuint" /> <param name="location" type="GLint" /> <param name="count" type="GLsizei" /> <param name="transpose" type="GLboolean" /> - <param name="value" type="const GLfloat *" count="count" count_scale="8" /> + <param name="value" type="const GLfloat *" /> </function> <function name="ProgramUniformMatrix4x2fv" es2="3.1"> <param name="program" type="GLuint" /> <param name="location" type="GLint" /> <param name="count" type="GLsizei" /> <param name="transpose" type="GLboolean" /> - <param name="value" type="const GLfloat *" count="count" count_scale="8" /> + <param name="value" type="const GLfloat *" /> </function> <function name="ProgramUniformMatrix3x4fv" es2="3.1"> <param name="program" type="GLuint" /> <param name="location" type="GLint" /> <param name="count" type="GLsizei" /> <param name="transpose" type="GLboolean" /> - <param name="value" type="const GLfloat *" count="count" count_scale="12" /> + <param name="value" type="const GLfloat *" /> </function> <function name="ProgramUniformMatrix4x3fv" es2="3.1"> <param name="program" type="GLuint" /> <param name="location" type="GLint" /> <param name="count" type="GLsizei" /> <param name="transpose" type="GLboolean" /> - <param name="value" type="const GLfloat *" count="count" count_scale="12" /> + <param name="value" type="const GLfloat *" /> </function> <function name="ValidateProgramPipeline" es2="3.1"> <param name="pipeline" type="GLuint" /> @@ -313,87 +313,87 @@ <param name="location" type="GLint" /> <param name="count" type="GLsizei" /> <param name="transpose" type="GLboolean" /> - <param name="value" type="const GLdouble *" count="count" count_scale="6" /> + <param name="value" type="const GLdouble *" /> </function> <function name="ProgramUniformMatrix3x2dv"> <param name="program" type="GLuint" /> <param name="location" type="GLint" /> <param name="count" type="GLsizei" /> <param name="transpose" type="GLboolean" /> - <param name="value" type="const GLdouble *" count="count" count_scale="6" /> + <param name="value" type="const GLdouble *" /> </function> <function name="ProgramUniformMatrix2x4dv"> <param name="program" type="GLuint" /> <param name="location" type="GLint" /> <param name="count" type="GLsizei" /> <param name="transpose" type="GLboolean" /> - <param name="value" type="const GLdouble *" count="count" count_scale="8" /> + <param name="value" type="const GLdouble *" /> </function> <function name="ProgramUniformMatrix4x2dv"> <param name="program" type="GLuint" /> <param name="location" type="GLint" /> <param name="count" type="GLsizei" /> <param name="transpose" type="GLboolean" /> - <param name="value" type="const GLdouble *" count="count" count_scale="8" /> + <param name="value" type="const GLdouble *" /> </function> <function name="ProgramUniformMatrix3x4dv"> <param name="program" type="GLuint" /> <param name="location" type="GLint" /> <param name="count" type="GLsizei" /> <param name="transpose" type="GLboolean" /> - <param name="value" type="const GLdouble *" count="count" count_scale="12" /> + <param name="value" type="const GLdouble *" /> </function> <function name="ProgramUniformMatrix4x3dv"> <param name="program" type="GLuint" /> <param name="location" type="GLint" /> <param name="count" type="GLsizei" /> <param name="transpose" type="GLboolean" /> - <param name="value" type="const GLdouble *" count="count" count_scale="12" /> + <param name="value" type="const GLdouble *" /> </function> <function name="ProgramUniformMatrix2dv"> <param name="program" type="GLuint" /> <param name="location" type="GLint" /> <param name="count" type="GLsizei" /> <param name="transpose" type="GLboolean" /> - <param name="value" type="const GLdouble *" count="count" count_scale="4" /> + <param name="value" type="const GLdouble *" /> </function> <function name="ProgramUniformMatrix3dv"> <param name="program" type="GLuint" /> <param name="location" type="GLint" /> <param name="count" type="GLsizei" /> <param name="transpose" type="GLboolean" /> - <param name="value" type="const GLdouble *" count="count" count_scale="9" /> + <param name="value" type="const GLdouble *" /> </function> <function name="ProgramUniformMatrix4dv"> <param name="program" type="GLuint" /> <param name="location" type="GLint" /> <param name="count" type="GLsizei" /> <param name="transpose" type="GLboolean" /> - <param name="value" type="const GLdouble *" count="count" count_scale="16" /> + <param name="value" type="const GLdouble *" /> </function> <function name="ProgramUniform1dv"> <param name="program" type="GLuint" /> <param name="location" type="GLint" /> <param name="count" type="GLsizei" /> - <param name="value" type="const GLdouble *" count="count" /> + <param name="value" type="const GLdouble *" /> </function> <function name="ProgramUniform2dv"> <param name="program" type="GLuint" /> <param name="location" type="GLint" /> <param name="count" type="GLsizei" /> - <param name="value" type="const GLdouble *" count="count" count_scale="2" /> + <param name="value" type="const GLdouble *" /> </function> <function name="ProgramUniform3dv"> <param name="program" type="GLuint" /> <param name="location" type="GLint" /> <param name="count" type="GLsizei" /> - <param name="value" type="const GLdouble *" count="count" count_scale="3" /> + <param name="value" type="const GLdouble *" /> </function> <function name="ProgramUniform4dv"> <param name="program" type="GLuint" /> <param name="location" type="GLint" /> <param name="count" type="GLsizei" /> - <param name="value" type="const GLdouble *" count="count" count_scale="4" /> + <param name="value" type="const GLdouble *" /> </function> </category> </OpenGLAPI> diff --git a/lib/mesa/src/mapi/glapi/gen/ARB_sparse_buffer.xml b/lib/mesa/src/mapi/glapi/gen/ARB_sparse_buffer.xml deleted file mode 100644 index 90bc659fd..000000000 --- a/lib/mesa/src/mapi/glapi/gen/ARB_sparse_buffer.xml +++ /dev/null @@ -1,30 +0,0 @@ -<?xml version="1.0"?> -<!DOCTYPE OpenGLAPI SYSTEM "gl_API.dtd"> - -<OpenGLAPI> - -<category name="GL_ARB_sparse_buffer" number="172"> - - <function name="BufferPageCommitmentARB"> - <param name="target" type="GLenum"/> - <param name="offset" type="GLintptr"/> - <param name="size" type="GLsizeiptr"/> - <param name="commit" type="GLboolean"/> - </function> - - <!-- Only with GL_EXT_direct_state_access: glNamedBufferPageCommitmentEXT --> - - <!-- Only with GL_ARB_direct_state_access --> - <function name="NamedBufferPageCommitmentARB"> - <param name="buffer" type="GLuint"/> - <param name="offset" type="GLintptr"/> - <param name="size" type="GLsizeiptr"/> - <param name="commit" type="GLboolean"/> - </function> - - <enum name="SPARSE_STORAGE_BIT_ARB" value="0x0400"/> - <enum name="SPARSE_BUFFER_PAGE_SIZE_ARB" value="0x82F8"/> - -</category> - -</OpenGLAPI> diff --git a/lib/mesa/src/mapi/glapi/gen/ARB_vertex_array_object.xml b/lib/mesa/src/mapi/glapi/gen/ARB_vertex_array_object.xml index 4f21137ab..4a392dbb4 100644 --- a/lib/mesa/src/mapi/glapi/gen/ARB_vertex_array_object.xml +++ b/lib/mesa/src/mapi/glapi/gen/ARB_vertex_array_object.xml @@ -10,8 +10,7 @@ <enum name="VERTEX_ARRAY_BINDING" value="0x85B5"/> - <function name="BindVertexArray" es2="3.0" - marshal_fail="_mesa_glthread_is_compat_bind_vertex_array(ctx)"> + <function name="BindVertexArray" es2="3.0"> <param name="array" 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 b20cf612c..ebd5b99c8 100644 --- a/lib/mesa/src/mapi/glapi/gen/ARB_viewport_array.xml +++ b/lib/mesa/src/mapi/glapi/gen/ARB_viewport_array.xml @@ -12,10 +12,18 @@ <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" value="0x0C10"/> - <enum name="VIEWPORT" value="0x0BA2"/> - <enum name="DEPTH_RANGE" value="0x0B70"/> - <enum name="SCISSOR_TEST" value="0x0C11"/> + <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="FIRST_VERTEX_CONVENTION" value="0x8E4D"/> <enum name="LAST_VERTEX_CONVENTION" value="0x8E4E"/> <enum name="PROVOKING_VERTEX" value="0x8E4F"/> diff --git a/lib/mesa/src/mapi/glapi/gen/EXT_transform_feedback.xml b/lib/mesa/src/mapi/glapi/gen/EXT_transform_feedback.xml index bbb44866f..2aa26ad72 100644 --- a/lib/mesa/src/mapi/glapi/gen/EXT_transform_feedback.xml +++ b/lib/mesa/src/mapi/glapi/gen/EXT_transform_feedback.xml @@ -108,7 +108,7 @@ <function name="ResumeTransformFeedback" es2="3.0"> </function> - <function name="DrawTransformFeedback" exec="dynamic" marshal="draw"> + <function name="DrawTransformFeedback" exec="dynamic"> <param name="mode" type="GLenum"/> <param name="id" type="GLuint"/> </function> diff --git a/lib/mesa/src/mapi/glapi/gen/GL3x.xml b/lib/mesa/src/mapi/glapi/gen/GL3x.xml index 7c86e8fc5..6b91945c8 100644 --- a/lib/mesa/src/mapi/glapi/gen/GL3x.xml +++ b/lib/mesa/src/mapi/glapi/gen/GL3x.xml @@ -117,25 +117,25 @@ <!-- These functions are unique to GL3 --> - <function name="ClearBufferiv" es2="3.0" marshal="custom"> + <function name="ClearBufferiv" es2="3.0"> <param name="buffer" type="GLenum"/> <param name="drawbuffer" type="GLint"/> <param name="value" type="const GLint *"/> </function> - <function name="ClearBufferuiv" es2="3.0" marshal="custom"> + <function name="ClearBufferuiv" es2="3.0"> <param name="buffer" type="GLenum"/> <param name="drawbuffer" type="GLint"/> <param name="value" type="const GLuint *"/> </function> - <function name="ClearBufferfv" es2="3.0" marshal="custom"> + <function name="ClearBufferfv" es2="3.0"> <param name="buffer" type="GLenum"/> <param name="drawbuffer" type="GLint"/> <param name="value" type="const GLfloat *"/> </function> - <function name="ClearBufferfi" es2="3.0" marshal="custom"> + <function name="ClearBufferfi" es2="3.0"> <param name="buffer" type="GLenum"/> <param name="drawbuffer" type="GLint"/> <param name="depth" type="GLfloat"/> @@ -200,7 +200,7 @@ <return type="GLint"/> </function> - <function name="BindFragDataLocation" no_error="true"> + <function name="BindFragDataLocation"> <param name="program" type="GLuint"/> <param name="colorNumber" type="GLuint"/> <param name="name" type="const GLchar *"/> @@ -213,7 +213,7 @@ <function name="EndTransformFeedback" es2="3.0"> </function> - <function name="BindBufferRange" es2="3.0" no_error="true"> + <function name="BindBufferRange" es2="3.0"> <param name="target" type="GLenum"/> <param name="index" type="GLuint"/> <param name="buffer" type="GLuint"/> @@ -256,9 +256,7 @@ <!-- These functions alias ones from GL_EXT_gpu_shader4 --> - <function name="VertexAttribIPointer" es2="3.0" marshal="async" - no_error="true" - marshal_fail="_mesa_glthread_is_non_vbo_vertex_attrib_pointer(ctx)"> + <function name="VertexAttribIPointer" es2="3.0"> <param name="index" type="GLuint"/> <param name="size" type="GLint"/> <param name="type" type="GLenum"/> @@ -607,7 +605,7 @@ <param name="params" type="GLint64 *"/> </function> - <function name="FramebufferTexture" es2="3.2" no_error="true"> + <function name="FramebufferTexture" es2="3.2"> <param name="target" type="GLenum"/> <param name="attachment" type="GLenum"/> <param name="texture" type="GLuint"/> @@ -625,7 +623,7 @@ <enum name="TEXTURE_SWIZZLE_A" value="0x8E45"/> <enum name="TEXTURE_SWIZZLE_RGBA" value="0x8E46"/> - <function name="VertexAttribDivisor" es2="3.0" no_error="true"> + <function name="VertexAttribDivisor" es2="3.0"> <param name="index" type="GLuint"/> <param name="divisor" type="GLuint"/> </function> diff --git a/lib/mesa/src/mapi/glapi/gen/KHR_robustness.xml b/lib/mesa/src/mapi/glapi/gen/KHR_robustness.xml index 21425938a..e773501da 100644 --- a/lib/mesa/src/mapi/glapi/gen/KHR_robustness.xml +++ b/lib/mesa/src/mapi/glapi/gen/KHR_robustness.xml @@ -12,9 +12,6 @@ <enum name="INNOCENT_CONTEXT_RESET" value="0x8254"/> <enum name="UNKNOWN_CONTEXT_RESET" value="0x8255"/> - <enum name="CONTEXT_ROBUST_ACCESS" count="1" value="0x90F3"> - <size name="Get" mode="get"/> - </enum> <enum name="RESET_NOTIFICATION_STRATEGY" count="1" value="0x8256"> <size name="Get" mode="get"/> </enum> diff --git a/lib/mesa/src/mapi/glapi/gen/Makefile.am b/lib/mesa/src/mapi/glapi/gen/Makefile.am index d51d21aa9..28b5b77d9 100644 --- a/lib/mesa/src/mapi/glapi/gen/Makefile.am +++ b/lib/mesa/src/mapi/glapi/gen/Makefile.am @@ -54,8 +54,6 @@ BUILT_SOURCES = \ $(MESA_GLAPI_ASM_OUTPUTS) \ $(MESA_DIR)/main/enums.c \ $(MESA_DIR)/main/api_exec.c \ - $(MESA_DIR)/main/marshal_generated.c \ - $(MESA_DIR)/main/marshal_generated.h \ $(MESA_DIR)/main/dispatch.h \ $(MESA_DIR)/main/remap_helper.h \ $(MESA_GLX_DIR)/indirect.c \ @@ -75,8 +73,6 @@ EXTRA_DIST= \ gl_enums.py \ gl_genexec.py \ gl_gentable.py \ - gl_marshal.py \ - gl_marshal_h.py \ gl_procs.py \ gl_SPARC_asm.py \ gl_table.py \ @@ -86,7 +82,6 @@ EXTRA_DIST= \ glX_proto_send.py \ glX_proto_size.py \ glX_server_table.py \ - marshal_XML.py \ remap_helper.py \ static_data.py \ SConscript \ @@ -119,7 +114,6 @@ API_XML = \ gl_and_glX_API.xml \ ARB_base_instance.xml \ ARB_blend_func_extended.xml \ - ARB_bindless_texture.xml \ ARB_clear_buffer_object.xml \ ARB_clear_texture.xml \ ARB_clip_control.xml \ @@ -145,7 +139,6 @@ API_XML = \ ARB_get_program_binary.xml \ ARB_get_texture_sub_image.xml \ ARB_gpu_shader_fp64.xml \ - ARB_gpu_shader_int64.xml \ ARB_gpu_shader5.xml \ ARB_indirect_parameters.xml \ ARB_instanced_arrays.xml \ @@ -165,7 +158,6 @@ API_XML = \ ARB_shader_image_load_store.xml \ ARB_shader_subroutine.xml \ ARB_shader_storage_buffer_object.xml \ - ARB_sparse_buffer.xml \ ARB_sync.xml \ ARB_tessellation_shader.xml \ ARB_texture_barrier.xml \ @@ -262,7 +254,7 @@ $(XORG_GLAPI_DIR)/%.h: $(MESA_GLAPI_DIR)/%.h if REGEN_SOURCES $(MESA_GLAPI_DIR)/glapi_mapi_tmp.h: $(MESA_MAPI_DIR)/mapi_abi.py $(COMMON) $(PYTHON_GEN) $(MESA_MAPI_DIR)/mapi_abi.py \ - --printer glapi $(srcdir)/gl_and_es_API.xml > $@ + --printer glapi --mode lib $(srcdir)/gl_and_es_API.xml > $@ $(MESA_GLAPI_DIR)/glprocs.h: gl_procs.py $(COMMON) $(PYTHON_GEN) $(srcdir)/gl_procs.py -c -f $(srcdir)/gl_and_es_API.xml > $@ @@ -295,12 +287,6 @@ $(MESA_DIR)/main/enums.c: gl_enums.py $(srcdir)/../registry/gl.xml $(MESA_DIR)/main/api_exec.c: gl_genexec.py apiexec.py $(COMMON) $(PYTHON_GEN) $(srcdir)/gl_genexec.py -f $(srcdir)/gl_and_es_API.xml > $@ -$(MESA_DIR)/main/marshal_generated.c: gl_marshal.py marshal_XML.py $(COMMON) - $(PYTHON_GEN) $(srcdir)/gl_marshal.py -f $(srcdir)/gl_and_es_API.xml > $@ - -$(MESA_DIR)/main/marshal_generated.h: gl_marshal_h.py marshal_XML.py $(COMMON) - $(PYTHON_GEN) $(srcdir)/gl_marshal_h.py -f $(srcdir)/gl_and_es_API.xml > $@ - $(MESA_DIR)/main/dispatch.h: gl_table.py $(COMMON) $(PYTHON_GEN) $(srcdir)/gl_table.py -f $(srcdir)/gl_and_es_API.xml -m remap_table > $@ diff --git a/lib/mesa/src/mapi/glapi/gen/Makefile.in b/lib/mesa/src/mapi/glapi/gen/Makefile.in index 9b4339b19..5d7fd5cb6 100644 --- a/lib/mesa/src/mapi/glapi/gen/Makefile.in +++ b/lib/mesa/src/mapi/glapi/gen/Makefile.in @@ -98,8 +98,6 @@ AMDGPU_CFLAGS = @AMDGPU_CFLAGS@ AMDGPU_LIBS = @AMDGPU_LIBS@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -ANDROID_CFLAGS = @ANDROID_CFLAGS@ -ANDROID_LIBS = @ANDROID_LIBS@ AR = @AR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -130,6 +128,8 @@ DLLTOOL = @DLLTOOL@ DLOPEN_LIBS = @DLOPEN_LIBS@ DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@ DRI2PROTO_LIBS = @DRI2PROTO_LIBS@ +DRI3PROTO_CFLAGS = @DRI3PROTO_CFLAGS@ +DRI3PROTO_LIBS = @DRI3PROTO_LIBS@ DRIGL_CFLAGS = @DRIGL_CFLAGS@ DRIGL_LIBS = @DRIGL_LIBS@ DRI_DRIVER_INSTALL_DIR = @DRI_DRIVER_INSTALL_DIR@ @@ -142,11 +142,10 @@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGL_CFLAGS = @EGL_CFLAGS@ +EGL_CLIENT_APIS = @EGL_CLIENT_APIS@ EGL_LIB_DEPS = @EGL_LIB_DEPS@ EGL_NATIVE_PLATFORM = @EGL_NATIVE_PLATFORM@ EGREP = @EGREP@ -ETNAVIV_CFLAGS = @ETNAVIV_CFLAGS@ -ETNAVIV_LIBS = @ETNAVIV_LIBS@ EXEEXT = @EXEEXT@ EXPAT_CFLAGS = @EXPAT_CFLAGS@ EXPAT_LIBS = @EXPAT_LIBS@ @@ -173,8 +172,6 @@ GL_PC_LIB_PRIV = @GL_PC_LIB_PRIV@ GL_PC_REQ_PRIV = @GL_PC_REQ_PRIV@ GREP = @GREP@ HAVE_XF86VIDMODE = @HAVE_XF86VIDMODE@ -I915_CFLAGS = @I915_CFLAGS@ -I915_LIBS = @I915_LIBS@ INDENT = @INDENT@ INDENT_FLAGS = @INDENT_FLAGS@ INSTALL = @INSTALL@ @@ -182,40 +179,45 @@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +INTEL_CFLAGS = @INTEL_CFLAGS@ +INTEL_LIBS = @INTEL_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ LD_NO_UNDEFINED = @LD_NO_UNDEFINED@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ -LIBATOMIC_LIBS = @LIBATOMIC_LIBS@ LIBCLC_INCLUDEDIR = @LIBCLC_INCLUDEDIR@ LIBCLC_LIBEXECDIR = @LIBCLC_LIBEXECDIR@ LIBDRM_CFLAGS = @LIBDRM_CFLAGS@ LIBDRM_LIBS = @LIBDRM_LIBS@ LIBELF_CFLAGS = @LIBELF_CFLAGS@ LIBELF_LIBS = @LIBELF_LIBS@ -LIBGLVND_DATADIR = @LIBGLVND_DATADIR@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ -LIBSENSORS_LIBS = @LIBSENSORS_LIBS@ +LIBSENSORS_LDFLAGS = @LIBSENSORS_LDFLAGS@ +LIBSHA1_CFLAGS = @LIBSHA1_CFLAGS@ +LIBSHA1_LIBS = @LIBSHA1_LIBS@ LIBTOOL = @LIBTOOL@ -LIBUNWIND_CFLAGS = @LIBUNWIND_CFLAGS@ -LIBUNWIND_LIBS = @LIBUNWIND_LIBS@ LIB_DIR = @LIB_DIR@ LIB_EXT = @LIB_EXT@ LIPO = @LIPO@ +LLVM_BINDIR = @LLVM_BINDIR@ LLVM_CFLAGS = @LLVM_CFLAGS@ LLVM_CONFIG = @LLVM_CONFIG@ +LLVM_CPPFLAGS = @LLVM_CPPFLAGS@ LLVM_CXXFLAGS = @LLVM_CXXFLAGS@ LLVM_INCLUDEDIR = @LLVM_INCLUDEDIR@ LLVM_LDFLAGS = @LLVM_LDFLAGS@ +LLVM_LIBDIR = @LLVM_LIBDIR@ LLVM_LIBS = @LLVM_LIBS@ +LLVM_VERSION = @LLVM_VERSION@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ +MESA_LLVM = @MESA_LLVM@ MKDIR_P = @MKDIR_P@ MSVC2013_COMPAT_CFLAGS = @MSVC2013_COMPAT_CFLAGS@ MSVC2013_COMPAT_CXXFLAGS = @MSVC2013_COMPAT_CXXFLAGS@ @@ -236,6 +238,8 @@ OMX_LIBS = @OMX_LIBS@ OMX_LIB_INSTALL_DIR = @OMX_LIB_INSTALL_DIR@ OPENCL_LIBNAME = @OPENCL_LIBNAME@ OPENCL_VERSION = @OPENCL_VERSION@ +OPENSSL_CFLAGS = @OPENSSL_CFLAGS@ +OPENSSL_LIBS = @OPENSSL_LIBS@ OSMESA_LIB = @OSMESA_LIB@ OSMESA_LIB_DEPS = @OSMESA_LIB_DEPS@ OSMESA_PC_LIB_PRIV = @OSMESA_PC_LIB_PRIV@ @@ -255,6 +259,8 @@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POSIX_SHELL = @POSIX_SHELL@ +PRESENTPROTO_CFLAGS = @PRESENTPROTO_CFLAGS@ +PRESENTPROTO_LIBS = @PRESENTPROTO_LIBS@ PTHREADSTUBS_CFLAGS = @PTHREADSTUBS_CFLAGS@ PTHREADSTUBS_LIBS = @PTHREADSTUBS_LIBS@ PTHREAD_CC = @PTHREAD_CC@ @@ -270,6 +276,8 @@ SED = @SED@ SELINUX_CFLAGS = @SELINUX_CFLAGS@ SELINUX_LIBS = @SELINUX_LIBS@ SET_MAKE = @SET_MAKE@ +SHA1_CFLAGS = @SHA1_CFLAGS@ +SHA1_LIBS = @SHA1_LIBS@ SHELL = @SHELL@ SIMPENROSE_CFLAGS = @SIMPENROSE_CFLAGS@ SIMPENROSE_LIBS = @SIMPENROSE_LIBS@ @@ -278,8 +286,7 @@ STRIP = @STRIP@ SWR_AVX2_CXXFLAGS = @SWR_AVX2_CXXFLAGS@ SWR_AVX_CXXFLAGS = @SWR_AVX_CXXFLAGS@ SWR_CXX11_CXXFLAGS = @SWR_CXX11_CXXFLAGS@ -SWR_KNL_CXXFLAGS = @SWR_KNL_CXXFLAGS@ -SWR_SKX_CXXFLAGS = @SWR_SKX_CXXFLAGS@ +TIMESTAMP_CMD = @TIMESTAMP_CMD@ VALGRIND_CFLAGS = @VALGRIND_CFLAGS@ VALGRIND_LIBS = @VALGRIND_LIBS@ VA_CFLAGS = @VA_CFLAGS@ @@ -287,12 +294,15 @@ VA_LIBS = @VA_LIBS@ VA_LIB_INSTALL_DIR = @VA_LIB_INSTALL_DIR@ VA_MAJOR = @VA_MAJOR@ VA_MINOR = @VA_MINOR@ +VC4_CFLAGS = @VC4_CFLAGS@ +VC4_LIBS = @VC4_LIBS@ VDPAU_CFLAGS = @VDPAU_CFLAGS@ VDPAU_LIBS = @VDPAU_LIBS@ VDPAU_LIB_INSTALL_DIR = @VDPAU_LIB_INSTALL_DIR@ VDPAU_MAJOR = @VDPAU_MAJOR@ VDPAU_MINOR = @VDPAU_MINOR@ VERSION = @VERSION@ +VG_LIB_DEPS = @VG_LIB_DEPS@ VISIBILITY_CFLAGS = @VISIBILITY_CFLAGS@ VISIBILITY_CXXFLAGS = @VISIBILITY_CXXFLAGS@ VL_CFLAGS = @VL_CFLAGS@ @@ -300,7 +310,6 @@ VL_LIBS = @VL_LIBS@ VULKAN_ICD_INSTALL_DIR = @VULKAN_ICD_INSTALL_DIR@ WAYLAND_CFLAGS = @WAYLAND_CFLAGS@ WAYLAND_LIBS = @WAYLAND_LIBS@ -WAYLAND_PROTOCOLS_DATADIR = @WAYLAND_PROTOCOLS_DATADIR@ WAYLAND_SCANNER = @WAYLAND_SCANNER@ WAYLAND_SCANNER_CFLAGS = @WAYLAND_SCANNER_CFLAGS@ WAYLAND_SCANNER_LIBS = @WAYLAND_SCANNER_LIBS@ @@ -322,10 +331,9 @@ XVMC_LIBS = @XVMC_LIBS@ XVMC_LIB_INSTALL_DIR = @XVMC_LIB_INSTALL_DIR@ XVMC_MAJOR = @XVMC_MAJOR@ XVMC_MINOR = @XVMC_MINOR@ +XXD = @XXD@ YACC = @YACC@ YFLAGS = @YFLAGS@ -ZLIB_CFLAGS = @ZLIB_CFLAGS@ -ZLIB_LIBS = @ZLIB_LIBS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -420,8 +428,6 @@ BUILT_SOURCES = \ $(MESA_GLAPI_ASM_OUTPUTS) \ $(MESA_DIR)/main/enums.c \ $(MESA_DIR)/main/api_exec.c \ - $(MESA_DIR)/main/marshal_generated.c \ - $(MESA_DIR)/main/marshal_generated.h \ $(MESA_DIR)/main/dispatch.h \ $(MESA_DIR)/main/remap_helper.h \ $(MESA_GLX_DIR)/indirect.c \ @@ -442,8 +448,6 @@ EXTRA_DIST = \ gl_enums.py \ gl_genexec.py \ gl_gentable.py \ - gl_marshal.py \ - gl_marshal_h.py \ gl_procs.py \ gl_SPARC_asm.py \ gl_table.py \ @@ -453,7 +457,6 @@ EXTRA_DIST = \ glX_proto_send.py \ glX_proto_size.py \ glX_server_table.py \ - marshal_XML.py \ remap_helper.py \ static_data.py \ SConscript \ @@ -483,7 +486,6 @@ API_XML = \ gl_and_glX_API.xml \ ARB_base_instance.xml \ ARB_blend_func_extended.xml \ - ARB_bindless_texture.xml \ ARB_clear_buffer_object.xml \ ARB_clear_texture.xml \ ARB_clip_control.xml \ @@ -509,7 +511,6 @@ API_XML = \ ARB_get_program_binary.xml \ ARB_get_texture_sub_image.xml \ ARB_gpu_shader_fp64.xml \ - ARB_gpu_shader_int64.xml \ ARB_gpu_shader5.xml \ ARB_indirect_parameters.xml \ ARB_instanced_arrays.xml \ @@ -529,7 +530,6 @@ API_XML = \ ARB_shader_image_load_store.xml \ ARB_shader_subroutine.xml \ ARB_shader_storage_buffer_object.xml \ - ARB_sparse_buffer.xml \ ARB_sync.xml \ ARB_tessellation_shader.xml \ ARB_texture_barrier.xml \ @@ -822,7 +822,7 @@ $(XORG_GLAPI_DIR)/%.h: $(MESA_GLAPI_DIR)/%.h @REGEN_SOURCES_TRUE@$(MESA_GLAPI_DIR)/glapi_mapi_tmp.h: $(MESA_MAPI_DIR)/mapi_abi.py $(COMMON) @REGEN_SOURCES_TRUE@ $(PYTHON_GEN) $(MESA_MAPI_DIR)/mapi_abi.py \ -@REGEN_SOURCES_TRUE@ --printer glapi $(srcdir)/gl_and_es_API.xml > $@ +@REGEN_SOURCES_TRUE@ --printer glapi --mode lib $(srcdir)/gl_and_es_API.xml > $@ @REGEN_SOURCES_TRUE@$(MESA_GLAPI_DIR)/glprocs.h: gl_procs.py $(COMMON) @REGEN_SOURCES_TRUE@ $(PYTHON_GEN) $(srcdir)/gl_procs.py -c -f $(srcdir)/gl_and_es_API.xml > $@ @@ -855,12 +855,6 @@ $(XORG_GLAPI_DIR)/%.h: $(MESA_GLAPI_DIR)/%.h @REGEN_SOURCES_TRUE@$(MESA_DIR)/main/api_exec.c: gl_genexec.py apiexec.py $(COMMON) @REGEN_SOURCES_TRUE@ $(PYTHON_GEN) $(srcdir)/gl_genexec.py -f $(srcdir)/gl_and_es_API.xml > $@ -@REGEN_SOURCES_TRUE@$(MESA_DIR)/main/marshal_generated.c: gl_marshal.py marshal_XML.py $(COMMON) -@REGEN_SOURCES_TRUE@ $(PYTHON_GEN) $(srcdir)/gl_marshal.py -f $(srcdir)/gl_and_es_API.xml > $@ - -@REGEN_SOURCES_TRUE@$(MESA_DIR)/main/marshal_generated.h: gl_marshal_h.py marshal_XML.py $(COMMON) -@REGEN_SOURCES_TRUE@ $(PYTHON_GEN) $(srcdir)/gl_marshal_h.py -f $(srcdir)/gl_and_es_API.xml > $@ - @REGEN_SOURCES_TRUE@$(MESA_DIR)/main/dispatch.h: gl_table.py $(COMMON) @REGEN_SOURCES_TRUE@ $(PYTHON_GEN) $(srcdir)/gl_table.py -f $(srcdir)/gl_and_es_API.xml -m remap_table > $@ diff --git a/lib/mesa/src/mapi/glapi/gen/apiexec.py b/lib/mesa/src/mapi/glapi/gen/apiexec.py index 61eda4b0f..4bdc95d68 100644 --- a/lib/mesa/src/mapi/glapi/gen/apiexec.py +++ b/lib/mesa/src/mapi/glapi/gen/apiexec.py @@ -252,46 +252,4 @@ functions = { "GetQueryBufferObjectuiv": exec_info(core=31), "GetQueryBufferObjecti64v": exec_info(core=31), "GetQueryBufferObjectui64v": exec_info(core=31), - - # GL_ARB_gpu_shader_int64 - nominally requires OpenGL 4.0, and Mesa - # only supports 4.0 in core profile. - "Uniform1i64ARB": exec_info(core=31), - "Uniform2i64ARB": exec_info(core=31), - "Uniform3i64ARB": exec_info(core=31), - "Uniform4i64ARB": exec_info(core=31), - "Uniform1i64vARB": exec_info(core=31), - "Uniform2i64vARB": exec_info(core=31), - "Uniform3i64vARB": exec_info(core=31), - "Uniform4i64vARB": exec_info(core=31), - "Uniform1ui64ARB": exec_info(core=31), - "Uniform2ui64ARB": exec_info(core=31), - "Uniform3ui64ARB": exec_info(core=31), - "Uniform4ui64ARB": exec_info(core=31), - "Uniform1ui64vARB": exec_info(core=31), - "Uniform2ui64vARB": exec_info(core=31), - "Uniform3ui64vARB": exec_info(core=31), - "Uniform4ui64vARB": exec_info(core=31), - "GetUniformi64vARB": exec_info(core=31), - "GetUniformui64vARB": exec_info(core=31), - "GetnUniformi64vARB": exec_info(core=31), - "GetnUniformui64vARB": exec_info(core=31), - "ProgramUniform1i64ARB": exec_info(core=31), - "ProgramUniform2i64ARB": exec_info(core=31), - "ProgramUniform3i64ARB": exec_info(core=31), - "ProgramUniform4i64ARB": exec_info(core=31), - "ProgramUniform1i64vARB": exec_info(core=31), - "ProgramUniform2i64vARB": exec_info(core=31), - "ProgramUniform3i64vARB": exec_info(core=31), - "ProgramUniform4i64vARB": exec_info(core=31), - "ProgramUniform1ui64ARB": exec_info(core=31), - "ProgramUniform2ui64ARB": exec_info(core=31), - "ProgramUniform3ui64ARB": exec_info(core=31), - "ProgramUniform4ui64ARB": exec_info(core=31), - "ProgramUniform1ui64vARB": exec_info(core=31), - "ProgramUniform2ui64vARB": exec_info(core=31), - "ProgramUniform3ui64vARB": exec_info(core=31), - "ProgramUniform4ui64vARB": exec_info(core=31), - - # GL_ARB_bindless_texture - "GetVertexAttribLui64vARB": exec_info(core=31), } diff --git a/lib/mesa/src/mapi/glapi/gen/es_EXT.xml b/lib/mesa/src/mapi/glapi/gen/es_EXT.xml index 642e3b319..3e705eb40 100644 --- a/lib/mesa/src/mapi/glapi/gen/es_EXT.xml +++ b/lib/mesa/src/mapi/glapi/gen/es_EXT.xml @@ -790,6 +790,11 @@ </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"> @@ -798,4 +803,593 @@ </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/gen/glX_XML.py b/lib/mesa/src/mapi/glapi/gen/glX_XML.py index b6d305c87..c659e931b 100644 --- a/lib/mesa/src/mapi/glapi/gen/glX_XML.py +++ b/lib/mesa/src/mapi/glapi/gen/glX_XML.py @@ -1,3 +1,4 @@ +#!/usr/bin/env python # (C) Copyright IBM Corporation 2004, 2005 # All Rights Reserved. diff --git a/lib/mesa/src/mapi/glapi/gen/glX_proto_common.py b/lib/mesa/src/mapi/glapi/gen/glX_proto_common.py index bd1192cb4..ae2c2d581 100644 --- a/lib/mesa/src/mapi/glapi/gen/glX_proto_common.py +++ b/lib/mesa/src/mapi/glapi/gen/glX_proto_common.py @@ -1,3 +1,4 @@ +#!/usr/bin/env python # (C) Copyright IBM Corporation 2004, 2005 # All Rights Reserved. diff --git a/lib/mesa/src/mapi/glapi/gen/glX_proto_recv.py b/lib/mesa/src/mapi/glapi/gen/glX_proto_recv.py index 946f01181..54332882a 100644 --- a/lib/mesa/src/mapi/glapi/gen/glX_proto_recv.py +++ b/lib/mesa/src/mapi/glapi/gen/glX_proto_recv.py @@ -1,3 +1,4 @@ +#!/usr/bin/env python # (C) Copyright IBM Corporation 2005 # All Rights Reserved. diff --git a/lib/mesa/src/mapi/glapi/gen/glX_proto_send.py b/lib/mesa/src/mapi/glapi/gen/glX_proto_send.py index d458214fb..26e7ab667 100644 --- a/lib/mesa/src/mapi/glapi/gen/glX_proto_send.py +++ b/lib/mesa/src/mapi/glapi/gen/glX_proto_send.py @@ -1,3 +1,4 @@ +#!/usr/bin/env python # (C) Copyright IBM Corporation 2004, 2005 # All Rights Reserved. @@ -382,7 +383,7 @@ const GLuint __glXDefaultPixelStore[9] = { 0, 0, 0, 0, 0, 0, 0, 0, 1 }; procs[n] = func.static_glx_name(n) print """ -#ifdef GLX_INDIRECT_RENDERING +#ifdef GLX_SHARED_GLAPI static const struct proc_pair { @@ -418,7 +419,7 @@ __indirect_get_proc_address(const char *name) return (pair) ? pair->proc : NULL; } -#endif /* GLX_INDIRECT_RENDERING */ +#endif /* GLX_SHARED_GLAPI */ """ return @@ -572,7 +573,7 @@ generic_%u_byte( GLint rop, const void * ptr ) condition = 'compsize > 0' print 'if (%s) {' % (condition) - print ' gc->fillImage(gc, %s, %s, %s, %s, %s, %s, %s, %s, %s);' % (dim_str, width, height, depth, param.img_format, param.img_type, param.name, pcPtr, pixHeaderPtr) + print ' (*gc->fillImage)(gc, %s, %s, %s, %s, %s, %s, %s, %s, %s);' % (dim_str, width, height, depth, param.img_format, param.img_type, param.name, pcPtr, pixHeaderPtr) print '} else {' print ' (void) memcpy( %s, default_pixel_store_%uD, default_pixel_store_%uD_size );' % (pixHeaderPtr, dim, dim) print '}' @@ -1113,7 +1114,7 @@ extern _X_HIDDEN NOINLINE FASTCALL GLubyte * __glXSetupVendorRequest( break print '' - print '#ifdef GLX_INDIRECT_RENDERING' + print '#ifdef GLX_SHARED_GLAPI' print 'extern _X_HIDDEN void (*__indirect_get_proc_address(const char *name))(void);' print '#endif' diff --git a/lib/mesa/src/mapi/glapi/gen/glX_proto_size.py b/lib/mesa/src/mapi/glapi/gen/glX_proto_size.py index e16dbab3e..3a1c55402 100644 --- a/lib/mesa/src/mapi/glapi/gen/glX_proto_size.py +++ b/lib/mesa/src/mapi/glapi/gen/glX_proto_size.py @@ -1,3 +1,4 @@ +#!/usr/bin/env python # (C) Copyright IBM Corporation 2004, 2005 # All Rights Reserved. @@ -329,7 +330,10 @@ class PrintGlxSizeStubs_c(PrintGlxSizeStubs_common): self.printFastcall() print '' print '' - print '#ifdef HAVE_FUNC_ATTRIBUTE_ALIAS' + print '#if defined(__CYGWIN__) || defined(__MINGW32__) || defined(GLX_USE_APPLEGL)' + print '# undef HAVE_ALIAS' + print '#endif' + print '#ifdef HAVE_ALIAS' print '# define ALIAS2(from,to) \\' print ' _X_INTERNAL PURE FASTCALL GLint __gl ## from ## _size( GLenum e ) \\' print ' __attribute__ ((alias( # to )));' @@ -448,7 +452,10 @@ class PrintGlxReqSize_c(PrintGlxReqSize_common): print '#include "indirect_size.h"' print '#include "indirect_reqsize.h"' print '' - print '#ifdef HAVE_FUNC_ATTRIBUTE_ALIAS' + print '#if defined(__CYGWIN__) || defined(__MINGW32__)' + print '# undef HAVE_ALIAS' + print '#endif' + print '#ifdef HAVE_ALIAS' print '# define ALIAS2(from,to) \\' print ' GLint __glX ## from ## ReqSize( const GLbyte * pc, Bool swap, int reqlen ) \\' print ' __attribute__ ((alias( # to )));' diff --git a/lib/mesa/src/mapi/glapi/gen/glX_server_table.py b/lib/mesa/src/mapi/glapi/gen/glX_server_table.py index f2e664264..2d21f4e4e 100644 --- a/lib/mesa/src/mapi/glapi/gen/glX_server_table.py +++ b/lib/mesa/src/mapi/glapi/gen/glX_server_table.py @@ -1,3 +1,4 @@ +#!/bin/env python # (C) Copyright IBM Corporation 2005, 2006 # All Rights Reserved. diff --git a/lib/mesa/src/mapi/glapi/gen/gl_API.dtd b/lib/mesa/src/mapi/glapi/gen/gl_API.dtd index b46425077..bdc62f1c8 100644 --- a/lib/mesa/src/mapi/glapi/gen/gl_API.dtd +++ b/lib/mesa/src/mapi/glapi/gen/gl_API.dtd @@ -38,9 +38,7 @@ es2 CDATA "none" deprecated CDATA "none" exec NMTOKEN #IMPLIED - desktop (true | false) "true" - marshal NMTOKEN #IMPLIED - marshal_fail CDATA #IMPLIED> + desktop (true | false) "true"> <!ATTLIST size name NMTOKEN #REQUIRED count NMTOKEN #IMPLIED mode (get | set) "set"> @@ -92,7 +90,7 @@ param: the stride parameters to Map1f, etc.) count - for counted arrays (e.g., the 'lists' parameter to glCallLists), the parameter or literal that represents the count. For functions - like glVertex3fv it will be a literal, for others it will be one of + like glVertex3fv it will be a litteral, for others it will be one of the parameters. counter - this parameter is a counter that will be referenced by the 'count' attribute in another parameter. @@ -122,18 +120,6 @@ param: offset data should be padded to the next even number of dimensions. For example, this will insert an empty "height" field after the "width" field in the protocol for TexImage1D. - marshal - One of "sync", "async", "draw", or "custom", defaulting to - async unless one of the arguments is something we know we can't - codegen for. If "sync", we finish any queued glthread work and call - the Mesa implementation directly. If "async", we queue the function - call to be performed by glthread. If "custom", the prototype will be - generated but a custom implementation will be present in marshal.c. - If "draw", it will follow the "async" rules except that "indices" are - ignored (since they may come from a VBO). - marshal_fail - an expression that, if it evaluates true, causes glthread - to switch back to the Mesa implementation and call it directly. Used - to disable glthread for GL compatibility interactions that we don't - want to track state for. glx: rop - Opcode value for "render" commands diff --git a/lib/mesa/src/mapi/glapi/gen/gl_API.xml b/lib/mesa/src/mapi/glapi/gen/gl_API.xml index 18839ec70..2ab0672b2 100644 --- a/lib/mesa/src/mapi/glapi/gen/gl_API.xml +++ b/lib/mesa/src/mapi/glapi/gen/gl_API.xml @@ -1109,7 +1109,7 @@ <type name="DEBUGPROCARB" size="4" pointer="true"/> <type name="DEBUGPROC" size="4" pointer="true"/> - <function name="NewList" deprecated="3.1" marshal_fail="true"> + <function name="NewList" deprecated="3.1"> <param name="list" type="GLuint"/> <param name="mode" type="GLenum"/> <glx sop="101"/> @@ -1148,7 +1148,7 @@ <glx rop="3"/> </function> - <function name="Begin" deprecated="3.1" exec="dynamic" marshal_fail="true"> + <function name="Begin" deprecated="3.1" exec="dynamic"> <param name="mode" type="GLenum"/> <glx rop="4"/> </function> @@ -1961,7 +1961,7 @@ <glx rop="78"/> </function> - <function name="CullFace" es1="1.0" es2="2.0" no_error="true"> + <function name="CullFace" es1="1.0" es2="2.0"> <param name="mode" type="GLenum"/> <glx rop="79"/> </function> @@ -1990,7 +1990,7 @@ <glx rop="83"/> </function> - <function name="FrontFace" es1="1.0" es2="2.0" no_error="true"> + <function name="FrontFace" es1="1.0" es2="2.0"> <param name="mode" type="GLenum"/> <glx rop="84"/> </function> @@ -2108,7 +2108,7 @@ <glx rop="102"/> </function> - <function name="Scissor" es1="1.0" es2="2.0" no_error="true"> + <function name="Scissor" es1="1.0" es2="2.0"> <param name="x" type="GLint"/> <param name="y" type="GLint"/> <param name="width" type="GLsizei"/> @@ -2149,7 +2149,7 @@ <glx rop="108"/> </function> - <function name="TexImage1D" no_error="true"> + <function name="TexImage1D"> <param name="target" type="GLenum"/> <param name="level" type="GLint"/> <param name="internalformat" type="GLint"/> @@ -2161,7 +2161,7 @@ <glx rop="109" large="true"/> </function> - <function name="TexImage2D" es1="1.0" es2="2.0" no_error="true"> + <function name="TexImage2D" es1="1.0" es2="2.0"> <param name="target" type="GLenum"/> <param name="level" type="GLint"/> <param name="internalformat" type="GLint"/> @@ -2291,7 +2291,7 @@ <glx rop="126"/> </function> - <function name="Clear" es1="1.0" es2="2.0" no_error="true"> + <function name="Clear" es1="1.0" es2="2.0"> <param name="mask" type="GLbitfield"/> <glx rop="127"/> </function> @@ -2361,23 +2361,16 @@ <glx rop="138" handcode="client"/> </function> - <function name="Enable" es1="1.0" es2="2.0" marshal="custom"> + <function name="Enable" es1="1.0" es2="2.0"> <param name="cap" type="GLenum"/> <glx rop="139" handcode="client"/> </function> - <function name="Finish" es1="1.0" es2="2.0" marshal="sync"> + <function name="Finish" es1="1.0" es2="2.0"> <glx sop="108" handcode="true"/> </function> - <!-- TODO: Flush is marshalled synchronously as a temporary hack - since we don't yet have a hook into SwapBuffers. - - NOTE: when we remove this hack, we'll still have to handle Flush - specially to ensure that it causes all previous commands to get - delivered to the server thread. - --> - <function name="Flush" es1="1.0" es2="2.0" marshal="custom"> + <function name="Flush" es1="1.0" es2="2.0"> <glx sop="142" handcode="true"/> </function> @@ -2545,32 +2538,32 @@ <glx rop="159"/> </function> - <function name="BlendFunc" es1="1.0" es2="2.0" no_error="true"> + <function name="BlendFunc" es1="1.0" es2="2.0"> <param name="sfactor" type="GLenum"/> <param name="dfactor" type="GLenum"/> <glx rop="160"/> </function> - <function name="LogicOp" es1="1.0" no_error="true"> + <function name="LogicOp" es1="1.0"> <param name="opcode" type="GLenum"/> <glx rop="161"/> </function> - <function name="StencilFunc" es1="1.0" es2="2.0" no_error="true"> + <function name="StencilFunc" es1="1.0" es2="2.0"> <param name="func" type="GLenum"/> <param name="ref" type="GLint"/> <param name="mask" type="GLuint"/> <glx rop="162"/> </function> - <function name="StencilOp" es1="1.0" es2="2.0" no_error="true"> + <function name="StencilOp" es1="1.0" es2="2.0"> <param name="fail" type="GLenum"/> <param name="zfail" type="GLenum"/> <param name="zpass" type="GLenum"/> <glx rop="163"/> </function> - <function name="DepthFunc" es1="1.0" es2="2.0" no_error="true"> + <function name="DepthFunc" es1="1.0" es2="2.0"> <param name="func" type="GLenum"/> <glx rop="164"/> </function> @@ -2593,40 +2586,40 @@ <glx rop="167"/> </function> - <function name="PixelStoref" no_error="true"> + <function name="PixelStoref"> <param name="pname" type="GLenum"/> <param name="param" type="GLfloat"/> <glx sop="109" handcode="client"/> </function> - <function name="PixelStorei" es1="1.0" es2="2.0" no_error="true"> + <function name="PixelStorei" es1="1.0" es2="2.0"> <param name="pname" type="GLenum"/> <param name="param" type="GLint"/> <glx sop="110" handcode="client"/> </function> - <function name="PixelMapfv" deprecated="3.1" marshal="sync"> + <function name="PixelMapfv" deprecated="3.1"> <param name="map" type="GLenum"/> <param name="mapsize" type="GLsizei" counter="true"/> <param name="values" type="const GLfloat *" count="mapsize"/> <glx rop="168" large="true"/> </function> - <function name="PixelMapuiv" deprecated="3.1" marshal="sync"> + <function name="PixelMapuiv" deprecated="3.1"> <param name="map" type="GLenum"/> <param name="mapsize" type="GLsizei" counter="true"/> <param name="values" type="const GLuint *" count="mapsize"/> <glx rop="169" large="true"/> </function> - <function name="PixelMapusv" deprecated="3.1" marshal="sync"> + <function name="PixelMapusv" deprecated="3.1"> <param name="map" type="GLenum"/> <param name="mapsize" type="GLsizei" counter="true"/> <param name="values" type="const GLushort *" count="mapsize"/> <glx rop="170" large="true"/> </function> - <function name="ReadBuffer" es2="3.0" no_error="true"> + <function name="ReadBuffer" es2="3.0"> <param name="mode" type="GLenum"/> <glx rop="171"/> </function> @@ -2966,7 +2959,7 @@ <glx rop="190"/> </function> - <function name="Viewport" es1="1.0" es2="2.0" no_error="true"> + <function name="Viewport" es1="1.0" es2="2.0"> <param name="x" type="GLint"/> <param name="y" type="GLint"/> <param name="width" type="GLsizei"/> @@ -3148,14 +3141,12 @@ <enum name="CLIENT_VERTEX_ARRAY_BIT" value="0x00000002"/> <enum name="CLIENT_ALL_ATTRIB_BITS" value="0xFFFFFFFF"/> - <function name="ArrayElement" deprecated="3.1" exec="dynamic" marshal="draw"> + <function name="ArrayElement" deprecated="3.1" exec="dynamic"> <param name="i" type="GLint"/> <glx handcode="true"/> </function> - <function name="ColorPointer" es1="1.0" deprecated="3.1" marshal="async" - no_error="true" - marshal_fail="_mesa_glthread_is_non_vbo_vertex_attrib_pointer(ctx)"> + <function name="ColorPointer" es1="1.0" deprecated="3.1"> <param name="size" type="GLint"/> <param name="type" type="GLenum"/> <param name="stride" type="GLsizei"/> @@ -3168,15 +3159,14 @@ <glx handcode="true"/> </function> - <function name="DrawArrays" es1="1.0" es2="2.0" exec="dynamic" marshal="draw"> + <function name="DrawArrays" es1="1.0" es2="2.0" exec="dynamic"> <param name="mode" type="GLenum"/> <param name="first" type="GLint"/> <param name="count" type="GLsizei"/> <glx rop="193" handcode="true"/> </function> - <function name="DrawElements" es1="1.0" es2="2.0" exec="dynamic" marshal="draw" - marshal_fail="_mesa_glthread_is_non_vbo_draw_elements(ctx)"> + <function name="DrawElements" es1="1.0" es2="2.0" exec="dynamic"> <param name="mode" type="GLenum"/> <param name="count" type="GLsizei"/> <param name="type" type="GLenum"/> @@ -3184,9 +3174,7 @@ <glx handcode="true"/> </function> - <function name="EdgeFlagPointer" deprecated="3.1" marshal="async" - no_error="true" - marshal_fail="_mesa_glthread_is_non_vbo_vertex_attrib_pointer(ctx)"> + <function name="EdgeFlagPointer" deprecated="3.1"> <param name="stride" type="GLsizei"/> <param name="pointer" type="const GLvoid *"/> <glx handcode="true"/> @@ -3203,9 +3191,7 @@ <glx handcode="true"/> </function> - <function name="IndexPointer" deprecated="3.1" marshal="async" - no_error="true" - marshal_fail="_mesa_glthread_is_non_vbo_vertex_attrib_pointer(ctx)"> + <function name="IndexPointer" deprecated="3.1"> <param name="type" type="GLenum"/> <param name="stride" type="GLsizei"/> <param name="pointer" type="const GLvoid *"/> @@ -3219,18 +3205,14 @@ <glx handcode="true"/> </function> - <function name="NormalPointer" es1="1.0" deprecated="3.1" marshal="async" - no_error="true" - marshal_fail="_mesa_glthread_is_non_vbo_vertex_attrib_pointer(ctx)"> + <function name="NormalPointer" es1="1.0" deprecated="3.1"> <param name="type" type="GLenum"/> <param name="stride" type="GLsizei"/> <param name="pointer" type="const GLvoid *"/> <glx handcode="true"/> </function> - <function name="TexCoordPointer" es1="1.0" deprecated="3.1" marshal="async" - no_error="true" - marshal_fail="_mesa_glthread_is_non_vbo_vertex_attrib_pointer(ctx)"> + <function name="TexCoordPointer" es1="1.0" deprecated="3.1"> <param name="size" type="GLint"/> <param name="type" type="GLenum"/> <param name="stride" type="GLsizei"/> @@ -3238,9 +3220,7 @@ <glx handcode="true"/> </function> - <function name="VertexPointer" es1="1.0" deprecated="3.1" marshal="async" - no_error="true" - marshal_fail="_mesa_glthread_is_non_vbo_vertex_attrib_pointer(ctx)"> + <function name="VertexPointer" es1="1.0" deprecated="3.1"> <param name="size" type="GLint"/> <param name="type" type="GLenum"/> <param name="stride" type="GLsizei"/> @@ -3254,7 +3234,7 @@ <glx rop="192"/> </function> - <function name="CopyTexImage1D" no_error="true"> + <function name="CopyTexImage1D"> <param name="target" type="GLenum"/> <param name="level" type="GLint"/> <param name="internalformat" type="GLenum"/> @@ -3265,7 +3245,7 @@ <glx rop="4119"/> </function> - <function name="CopyTexImage2D" es1="1.0" es2="2.0" no_error="true"> + <function name="CopyTexImage2D" es1="1.0" es2="2.0"> <param name="target" type="GLenum"/> <param name="level" type="GLint"/> <param name="internalformat" type="GLenum"/> @@ -3277,7 +3257,7 @@ <glx rop="4120"/> </function> - <function name="CopyTexSubImage1D" no_error="true"> + <function name="CopyTexSubImage1D"> <param name="target" type="GLenum"/> <param name="level" type="GLint"/> <param name="xoffset" type="GLint"/> @@ -3287,7 +3267,7 @@ <glx rop="4121"/> </function> - <function name="CopyTexSubImage2D" es1="1.0" es2="2.0" no_error="true"> + <function name="CopyTexSubImage2D" es1="1.0" es2="2.0"> <param name="target" type="GLenum"/> <param name="level" type="GLint"/> <param name="xoffset" type="GLint"/> @@ -3299,7 +3279,7 @@ <glx rop="4122"/> </function> - <function name="TexSubImage1D" no_error="true"> + <function name="TexSubImage1D"> <param name="target" type="GLenum"/> <param name="level" type="GLint"/> <param name="xoffset" type="GLint"/> @@ -3311,7 +3291,7 @@ <glx rop="4099" large="true"/> </function> - <function name="TexSubImage2D" es1="1.0" es2="2.0" no_error="true"> + <function name="TexSubImage2D" es1="1.0" es2="2.0"> <param name="target" type="GLenum"/> <param name="level" type="GLint"/> <param name="xoffset" type="GLint"/> @@ -3345,7 +3325,7 @@ <glx sop="144"/> </function> - <function name="GenTextures" es1="1.0" es2="2.0" no_error="true"> + <function name="GenTextures" es1="1.0" es2="2.0"> <param name="n" type="GLsizei" counter="true"/> <param name="textures" type="GLuint *" output="true" count="n"/> <glx sop="145" always_array="true"/> @@ -3743,8 +3723,7 @@ <glx rop="4097"/> </function> - <function name="DrawRangeElements" es2="3.0" exec="dynamic" marshal="draw" - marshal_fail="_mesa_glthread_is_non_vbo_draw_elements(ctx)"> + <function name="DrawRangeElements" es2="3.0" exec="dynamic"> <param name="mode" type="GLenum"/> <param name="start" type="GLuint"/> <param name="end" type="GLuint"/> @@ -4011,7 +3990,7 @@ <glx rop="4113"/> </function> - <function name="TexImage3D" es2="3.0" no_error="true"> + <function name="TexImage3D" es2="3.0"> <param name="target" type="GLenum"/> <param name="level" type="GLint"/> <param name="internalformat" type="GLint"/> @@ -4025,7 +4004,7 @@ <glx rop="4114" large="true"/> </function> - <function name="TexSubImage3D" es2="3.0" no_error="true"> + <function name="TexSubImage3D" es2="3.0"> <param name="target" type="GLenum"/> <param name="level" type="GLint"/> <param name="xoffset" type="GLint"/> @@ -4041,7 +4020,7 @@ <glx rop="4115" large="true"/> </function> - <function name="CopyTexSubImage3D" es2="3.0" no_error="true"> + <function name="CopyTexSubImage3D" es2="3.0"> <param name="target" type="GLenum"/> <param name="level" type="GLint"/> <param name="xoffset" type="GLint"/> @@ -4268,7 +4247,7 @@ <enum name="DOT3_RGB" value="0x86AE"/> <enum name="DOT3_RGBA" value="0x86AF"/> - <function name="ActiveTexture" es1="1.0" es2="2.0" no_error="true"> + <function name="ActiveTexture" es1="1.0" es2="2.0"> <param name="texture" type="GLenum"/> <glx rop="197"/> </function> @@ -4507,8 +4486,7 @@ <glx rop="229"/> </function> - <function name="CompressedTexImage3D" es2="3.0" marshal="sync" - no_error="true"> + <function name="CompressedTexImage3D" es2="3.0"> <param name="target" type="GLenum"/> <param name="level" type="GLint"/> <param name="internalformat" type="GLenum"/> @@ -4521,8 +4499,7 @@ <glx rop="216" handcode="client"/> </function> - <function name="CompressedTexImage2D" es1="1.0" es2="2.0" marshal="sync" - no_error="true"> + <function name="CompressedTexImage2D" es1="1.0" es2="2.0"> <param name="target" type="GLenum"/> <param name="level" type="GLint"/> <param name="internalformat" type="GLenum"/> @@ -4534,7 +4511,7 @@ <glx rop="215" handcode="client"/> </function> - <function name="CompressedTexImage1D" marshal="sync" no_error="true"> + <function name="CompressedTexImage1D"> <param name="target" type="GLenum"/> <param name="level" type="GLint"/> <param name="internalformat" type="GLenum"/> @@ -4545,8 +4522,7 @@ <glx rop="214" handcode="client"/> </function> - <function name="CompressedTexSubImage3D" es2="3.0" marshal="sync" - no_error="true"> + <function name="CompressedTexSubImage3D" es2="3.0"> <param name="target" type="GLenum"/> <param name="level" type="GLint"/> <param name="xoffset" type="GLint"/> @@ -4561,8 +4537,7 @@ <glx rop="219" handcode="client"/> </function> - <function name="CompressedTexSubImage2D" es1="1.0" es2="2.0" marshal="sync" - no_error="true"> + <function name="CompressedTexSubImage2D" es1="1.0" es2="2.0"> <param name="target" type="GLenum"/> <param name="level" type="GLint"/> <param name="xoffset" type="GLint"/> @@ -4575,7 +4550,7 @@ <glx rop="218" handcode="client"/> </function> - <function name="CompressedTexSubImage1D" marshal="sync" no_error="true"> + <function name="CompressedTexSubImage1D"> <param name="target" type="GLenum"/> <param name="level" type="GLint"/> <param name="xoffset" type="GLint"/> @@ -4709,7 +4684,7 @@ </enum> <enum name="COMPARE_R_TO_TEXTURE" value="0x884E"/> - <function name="BlendFuncSeparate" es2="2.0" no_error="true"> + <function name="BlendFuncSeparate" es2="2.0"> <param name="sfactorRGB" type="GLenum"/> <param name="dfactorRGB" type="GLenum"/> <param name="sfactorAlpha" type="GLenum"/> @@ -4734,16 +4709,14 @@ <glx rop="4125"/> </function> - <function name="FogCoordPointer" deprecated="3.1" marshal="async" - no_error="true" - marshal_fail="_mesa_glthread_is_non_vbo_vertex_attrib_pointer(ctx)"> + <function name="FogCoordPointer" deprecated="3.1"> <param name="type" type="GLenum"/> <param name="stride" type="GLsizei"/> <param name="pointer" type="const GLvoid *"/> <glx handcode="true"/> </function> - <function name="MultiDrawArrays" marshal="draw"> + <function name="MultiDrawArrays"> <param name="mode" type="GLenum"/> <param name="first" type="const GLint *"/> <param name="count" type="const GLsizei *"/> @@ -4872,9 +4845,7 @@ <glx rop="4132"/> </function> - <function name="SecondaryColorPointer" deprecated="3.1" marshal="async" - no_error="true" - marshal_fail="_mesa_glthread_is_non_vbo_vertex_attrib_pointer(ctx)"> + <function name="SecondaryColorPointer" deprecated="3.1"> <param name="size" type="GLint"/> <param name="type" type="GLenum"/> <param name="stride" type="GLsizei"/> @@ -5039,13 +5010,13 @@ <type name="intptr" size="4" glx_name="CARD32"/> <type name="sizeiptr" size="4" unsigned="true" glx_name="CARD32"/> - <function name="BindBuffer" es1="1.1" es2="2.0" marshal="custom" no_error="true"> + <function name="BindBuffer" es1="1.1" es2="2.0"> <param name="target" type="GLenum"/> <param name="buffer" type="GLuint"/> <glx ignore="true"/> </function> - <function name="BufferData" es1="1.1" es2="2.0" marshal="custom"> + <function name="BufferData" es1="1.1" es2="2.0"> <param name="target" type="GLenum"/> <param name="size" type="GLsizeiptr" counter="true"/> <param name="data" type="const GLvoid *" count="size" img_null_flag="true"/> @@ -5053,8 +5024,7 @@ <glx ignore="true"/> </function> - <function name="BufferSubData" es1="1.1" es2="2.0" marshal="custom" - no_error="true"> + <function name="BufferSubData" es1="1.1" es2="2.0"> <param name="target" type="GLenum"/> <param name="offset" type="GLintptr"/> <param name="size" type="GLsizeiptr" counter="true"/> @@ -5068,7 +5038,7 @@ <glx ignore="true"/> </function> - <function name="GenBuffers" es1="1.1" es2="2.0" no_error="true"> + <function name="GenBuffers" es1="1.1" es2="2.0"> <param name="n" type="GLsizei" counter="true"/> <param name="buffer" type="GLuint *" output="true" count="n"/> <glx ignore="true"/> @@ -5102,14 +5072,14 @@ <glx ignore="true"/> </function> - <function name="MapBuffer" no_error="true"> + <function name="MapBuffer"> <param name="target" type="GLenum"/> <param name="access" type="GLenum"/> <return type="GLvoid *"/> <glx ignore="true"/> </function> - <function name="UnmapBuffer" es2="3.0" no_error="true"> + <function name="UnmapBuffer" es2="3.0"> <param name="target" type="GLenum"/> <return type="GLboolean"/> <glx ignore="true"/> @@ -5273,7 +5243,7 @@ <glx rop="233" large="true"/> </function> - <function name="StencilFuncSeparate" es2="2.0" no_error="true"> + <function name="StencilFuncSeparate" es2="2.0"> <param name="face" type="GLenum"/> <param name="func" type="GLenum"/> <param name="ref" type="GLint"/> @@ -5281,7 +5251,7 @@ <glx ignore="true"/> </function> - <function name="StencilOpSeparate" es2="2.0" no_error="true"> + <function name="StencilOpSeparate" es2="2.0"> <param name="face" type="GLenum"/> <param name="sfail" type="GLenum"/> <param name="zfail" type="GLenum"/> @@ -5289,19 +5259,19 @@ <glx ignore="true"/> </function> - <function name="StencilMaskSeparate" es2="2.0" no_error="true"> + <function name="StencilMaskSeparate" es2="2.0"> <param name="face" type="GLenum"/> <param name="mask" type="GLuint"/> <glx ignore="true"/> </function> - <function name="AttachShader" es2="2.0" no_error="true"> + <function name="AttachShader" es2="2.0"> <param name="program" type="GLuint"/> <param name="shader" type="GLuint"/> <glx ignore="true"/> </function> - <function name="BindAttribLocation" es2="2.0" no_error="true"> + <function name="BindAttribLocation" es2="2.0"> <param name="program" type="GLuint"/> <param name="index" type="GLuint"/> <param name="name" type="const GLchar *"/> @@ -5318,7 +5288,7 @@ <glx ignore="true"/> </function> - <function name="CreateShader" es2="2.0" no_error="true"> + <function name="CreateShader" es2="2.0"> <param name="type" type="GLenum"/> <return type="GLuint"/> <glx ignore="true"/> @@ -5340,13 +5310,13 @@ <glx ignore="true"/> </function> - <function name="DisableVertexAttribArray" es2="2.0" no_error="true"> + <function name="DisableVertexAttribArray" es2="2.0"> <param name="index" type="GLuint"/> <glx ignore="true"/> <glx handcode="true"/> </function> - <function name="EnableVertexAttribArray" es2="2.0" no_error="true"> + <function name="EnableVertexAttribArray" es2="2.0"> <param name="index" type="GLuint"/> <glx ignore="true"/> <glx handcode="true"/> @@ -5427,7 +5397,7 @@ <glx ignore="true"/> </function> - <function name="GetUniformLocation" es2="2.0" no_error="true"> + <function name="GetUniformLocation" es2="2.0"> <param name="program" type="GLuint"/> <param name="name" type="const GLchar *"/> <return type="GLint"/> @@ -5497,7 +5467,7 @@ <glx ignore="true"/> </function> - <function name="ShaderSource" es2="2.0" marshal="custom"> + <function name="ShaderSource" es2="2.0"> <param name="shader" type="GLuint"/> <param name="count" type="GLsizei"/> <param name="string" type="const GLchar * const *"/> @@ -5505,7 +5475,7 @@ <glx ignore="true"/> </function> - <function name="UseProgram" es2="2.0" no_error="true"> + <function name="UseProgram" es2="2.0"> <param name="program" type="GLuint"/> <glx ignore="true"/> </function> @@ -5829,9 +5799,7 @@ <glx rop="4233"/> </function> - <function name="VertexAttribPointer" es2="2.0" marshal="async" - no_error="true" - marshal_fail="_mesa_glthread_is_non_vbo_vertex_attrib_pointer(ctx)"> + <function name="VertexAttribPointer" es2="2.0"> <param name="index" type="GLuint"/> <param name="size" type="GLint"/> <param name="type" type="GLenum"/> @@ -7687,7 +7655,7 @@ <glx ignore="true"/> </function> - <function name="CreateShaderObjectARB" no_error="true"> + <function name="CreateShaderObjectARB"> <param name="shaderType" type="GLenum"/> <return type="GLhandleARB"/> <glx ignore="true"/> @@ -7709,7 +7677,7 @@ <glx ignore="true"/> </function> - <function name="AttachObjectARB" no_error="true"> + <function name="AttachObjectARB"> <param name="containerObj" type="GLhandleARB"/> <param name="obj" type="GLhandleARB"/> <glx ignore="true"/> @@ -8121,7 +8089,7 @@ <enum name="MAX_TRANSFORM_FEEDBACK_BUFFERS" value="0x8E70"/> <enum name="MAX_VERTEX_STREAMS" value="0x8E71"/> - <function name="DrawTransformFeedbackStream" exec="dynamic" marshal="draw"> + <function name="DrawTransformFeedbackStream" exec="dynamic"> <param name="mode" type="GLenum"/> <param name="id" type="GLuint"/> <param name="stream" type="GLuint"/> @@ -8169,13 +8137,13 @@ <xi:include href="ARB_base_instance.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> <category name="GL_ARB_transform_feedback_instanced" number="109"> - <function name="DrawTransformFeedbackInstanced" exec="dynamic" marshal="draw"> + <function name="DrawTransformFeedbackInstanced" exec="dynamic"> <param name="mode" type="GLenum"/> <param name="id" type="GLuint"/> <param name="primcount" type="GLsizei"/> </function> - <function name="DrawTransformFeedbackStreamInstanced" exec="dynamic" marshal="draw"> + <function name="DrawTransformFeedbackStreamInstanced" exec="dynamic"> <param name="mode" type="GLenum"/> <param name="id" type="GLuint"/> <param name="stream" type="GLuint"/> @@ -8265,7 +8233,7 @@ <enum name="BUFFER_STORAGE_FLAGS" value="0x8220" /> <enum name="CLIENT_MAPPED_BUFFER_BARRIER_BIT" value="0x4000" /> - <function name="BufferStorage" no_error="true"> + <function name="BufferStorage"> <param name="target" type="GLenum"/> <param name="size" type="GLsizeiptr"/> <param name="data" type="const GLvoid *"/> @@ -8286,9 +8254,7 @@ <enum name="QUERY_BUFFER_BARRIER_BIT" value="0x00008000"/> </category> -<!-- ARB extensions 149 - 151 --> - -<xi:include href="ARB_bindless_texture.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> +<!-- ARB extensions 149 - 152 --> <xi:include href="ARB_compute_variable_group_size.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> @@ -8330,9 +8296,6 @@ <!-- ARB extension 171 --> <xi:include href="ARB_pipeline_statistics_query.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> -<!-- ARB extension 172 --> -<xi:include href="ARB_sparse_buffer.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> - <category name="es3.2"> <!-- This should be in es_EXT, but this file is included first and the alias doesn't work otherwise. --> @@ -8398,8 +8361,6 @@ </category> -<xi:include href="ARB_gpu_shader_int64.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> - <!-- Non-ARB extensions sorted by extension number. --> <category name="GL_EXT_blend_color" number="2"> @@ -9209,8 +9170,7 @@ <param name="i" type="GLint"/> </function> - <function name="ColorPointerEXT" deprecated="3.1" marshal="async" - marshal_fail="_mesa_glthread_is_non_vbo_vertex_attrib_pointer(ctx)"> + <function name="ColorPointerEXT" deprecated="3.1"> <param name="size" type="GLint"/> <param name="type" type="GLenum"/> <param name="stride" type="GLsizei"/> @@ -9225,8 +9185,7 @@ <param name="count" type="GLsizei"/> </function> - <function name="EdgeFlagPointerEXT" deprecated="3.1" marshal="async" - marshal_fail="_mesa_glthread_is_non_vbo_vertex_attrib_pointer(ctx)"> + <function name="EdgeFlagPointerEXT" deprecated="3.1"> <param name="stride" type="GLsizei"/> <param name="count" type="GLsizei"/> <param name="pointer" type="const GLboolean *"/> @@ -9238,8 +9197,7 @@ <param name="params" type="GLvoid **" output="true"/> </function> - <function name="IndexPointerEXT" deprecated="3.1" marshal="async" - marshal_fail="_mesa_glthread_is_non_vbo_vertex_attrib_pointer(ctx)"> + <function name="IndexPointerEXT" deprecated="3.1"> <param name="type" type="GLenum"/> <param name="stride" type="GLsizei"/> <param name="count" type="GLsizei"/> @@ -9247,8 +9205,7 @@ <glx handcode="true"/> </function> - <function name="NormalPointerEXT" deprecated="3.1" marshal="async" - marshal_fail="_mesa_glthread_is_non_vbo_vertex_attrib_pointer(ctx)"> + <function name="NormalPointerEXT" deprecated="3.1"> <param name="type" type="GLenum"/> <param name="stride" type="GLsizei"/> <param name="count" type="GLsizei"/> @@ -9256,8 +9213,7 @@ <glx handcode="true"/> </function> - <function name="TexCoordPointerEXT" deprecated="3.1" marshal="async" - marshal_fail="_mesa_glthread_is_non_vbo_vertex_attrib_pointer(ctx)"> + <function name="TexCoordPointerEXT" deprecated="3.1"> <param name="size" type="GLint"/> <param name="type" type="GLenum"/> <param name="stride" type="GLsizei"/> @@ -9266,8 +9222,7 @@ <glx handcode="true"/> </function> - <function name="VertexPointerEXT" deprecated="3.1" marshal="async" - marshal_fail="_mesa_glthread_is_non_vbo_vertex_attrib_pointer(ctx)"> + <function name="VertexPointerEXT" deprecated="3.1"> <param name="size" type="GLint"/> <param name="type" type="GLenum"/> <param name="stride" type="GLsizei"/> @@ -10235,15 +10190,14 @@ </category> <category name="GL_EXT_multi_draw_arrays" number="148"> - <function name="MultiDrawArraysEXT" es1="1.0" es2="2.0" exec="dynamic" alias="MultiDrawArrays"> + <function name="MultiDrawArraysEXT" es1="1.0" es2="2.0" alias="MultiDrawArrays"> <param name="mode" type="GLenum"/> <param name="first" type="const GLint *"/> <param name="count" type="const GLsizei *"/> <param name="primcount" type="GLsizei"/> </function> - <function name="MultiDrawElementsEXT" es1="1.0" es2="2.0" exec="dynamic" marshal="draw" - marshal_fail="_mesa_glthread_is_non_vbo_draw_elements(ctx)"> + <function name="MultiDrawElementsEXT" es1="1.0" es2="2.0" exec="dynamic"> <param name="mode" type="GLenum"/> <param name="count" type="const GLsizei *"/> <param name="type" type="GLenum"/> @@ -11253,7 +11207,7 @@ </category> <category name="GL_IBM_multimode_draw_arrays" number="200"> - <function name="MultiModeDrawArraysIBM" marshal="draw"> + <function name="MultiModeDrawArraysIBM"> <param name="mode" type="const GLenum *"/> <param name="first" type="const GLint *"/> <param name="count" type="const GLsizei *"/> @@ -11262,8 +11216,7 @@ <glx handcode="true" ignore="true"/> </function> - <function name="MultiModeDrawElementsIBM" marshal="draw" - marshal_fail="_mesa_glthread_is_non_vbo_draw_elements(ctx)"> + <function name="MultiModeDrawElementsIBM"> <param name="mode" type="const GLenum *"/> <param name="count" type="const GLsizei *"/> <param name="type" type="GLenum"/> @@ -12859,14 +12812,6 @@ <enum name="GPU_MEMORY_INFO_EVICTED_MEMORY_NVX" value="0x904B" /> </category> -<category name="GL_NV_fill_rectangle" number="466"> - <enum name="FILL_RECTANGLE_NV" value="0x933C"/> -</category> - -<category name="GL_INTEL_conservative_rasterization" number="491"> - <enum name="CONSERVATIVE_RASTERIZATION_INTEL" value="0x83FE"/> -</category> - <xi:include href="INTEL_performance_query.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> <category name="GL_EXT_polygon_offset_clamp" number="460"> diff --git a/lib/mesa/src/mapi/glapi/gen/gl_SPARC_asm.py b/lib/mesa/src/mapi/glapi/gen/gl_SPARC_asm.py index 7b5714eff..fa6217e1b 100644 --- a/lib/mesa/src/mapi/glapi/gen/gl_SPARC_asm.py +++ b/lib/mesa/src/mapi/glapi/gen/gl_SPARC_asm.py @@ -1,3 +1,4 @@ +#!/usr/bin/env python # (C) Copyright IBM Corporation 2004 # All Rights Reserved. diff --git a/lib/mesa/src/mapi/glapi/gen/gl_XML.py b/lib/mesa/src/mapi/glapi/gen/gl_XML.py index a5320e90a..8036a0281 100644 --- a/lib/mesa/src/mapi/glapi/gen/gl_XML.py +++ b/lib/mesa/src/mapi/glapi/gen/gl_XML.py @@ -1,3 +1,4 @@ +#!/usr/bin/env python # (C) Copyright IBM Corporation 2004, 2005 # All Rights Reserved. @@ -606,7 +607,6 @@ class gl_function( gl_item ): self.exec_flavor = 'mesa' self.desktop = True self.deprecated = None - self.has_no_error_variant = False # self.entry_point_api_map[name][api] is a decimal value # indicating the earliest version of the given API in which @@ -677,11 +677,6 @@ class gl_function( gl_item ): if not is_attr_true(element, 'desktop', 'true'): self.desktop = False - if self.has_no_error_variant or is_attr_true(element, 'no_error'): - self.has_no_error_variant = True - else: - self.has_no_error_variant = False - if alias: true_name = alias else: diff --git a/lib/mesa/src/mapi/glapi/gen/gl_apitemp.py b/lib/mesa/src/mapi/glapi/gen/gl_apitemp.py index a8e5d8145..5e985a2ec 100644 --- a/lib/mesa/src/mapi/glapi/gen/gl_apitemp.py +++ b/lib/mesa/src/mapi/glapi/gen/gl_apitemp.py @@ -1,3 +1,4 @@ +#!/usr/bin/env python # (C) Copyright IBM Corporation 2004, 2005 # All Rights Reserved. @@ -133,11 +134,11 @@ class PrintGlOffsets(gl_XML.gl_print_base): * #define KEYWORD1 * #define KEYWORD2 * #define NAME(func) gl##func - * #define DISPATCH(func, args, msg) \\ - * struct _glapi_table *dispatch = CurrentClientDispatch; \\ + * #define DISPATCH(func, args, msg) \\ + * struct _glapi_table *dispatch = CurrentDispatch; \\ * (*dispatch->func) args - * #define RETURN DISPATCH(func, args, msg) \\ - * struct _glapi_table *dispatch = CurrentClientDispatch; \\ + * #define RETURN DISPATCH(func, args, msg) \\ + * struct _glapi_table *dispatch = CurrentDispatch; \\ * return (*dispatch->func) args * */ diff --git a/lib/mesa/src/mapi/glapi/gen/gl_enums.py b/lib/mesa/src/mapi/glapi/gen/gl_enums.py index 768a54a3a..2eb9e1642 100644 --- a/lib/mesa/src/mapi/glapi/gen/gl_enums.py +++ b/lib/mesa/src/mapi/glapi/gen/gl_enums.py @@ -1,3 +1,4 @@ +#!/usr/bin/python2 # (C) Copyright Zack Rusin 2005. All Rights Reserved. # Copyright (C) 2015 Intel Corporation diff --git a/lib/mesa/src/mapi/glapi/gen/gl_genexec.py b/lib/mesa/src/mapi/glapi/gen/gl_genexec.py index 57e155bd1..183e6ff74 100644 --- a/lib/mesa/src/mapi/glapi/gen/gl_genexec.py +++ b/lib/mesa/src/mapi/glapi/gen/gl_genexec.py @@ -1,3 +1,4 @@ +#!/usr/bin/env python # Copyright (C) 2012 Intel Corporation # @@ -91,7 +92,6 @@ header = """/** #include "main/objectlabel.h" #include "main/objectpurge.h" #include "main/performance_monitor.h" -#include "main/performance_query.h" #include "main/pipelineobj.h" #include "main/pixel.h" #include "main/pixelstore.h" @@ -113,7 +113,6 @@ header = """/** #include "main/texstate.h" #include "main/texstorage.h" #include "main/barrier.h" -#include "main/texturebindless.h" #include "main/textureview.h" #include "main/transformfeedback.h" #include "main/mtypes.h" @@ -233,16 +232,8 @@ class PrintCode(gl_XML.gl_print_base): # This function is not implemented, or is dispatched # dynamically. continue - if f.has_no_error_variant: - no_error_condition = '_mesa_is_no_error_enabled(ctx) && ({0})'.format(condition) - error_condition = '!_mesa_is_no_error_enabled(ctx) && ({0})'.format(condition) - settings_by_condition[no_error_condition].append( - 'SET_{0}(exec, {1}{0}_no_error);'.format(f.name, prefix, f.name)) - settings_by_condition[error_condition].append( - 'SET_{0}(exec, {1}{0});'.format(f.name, prefix, f.name)) - else: - settings_by_condition[condition].append( - 'SET_{0}(exec, {1}{0});'.format(f.name, prefix, f.name)) + settings_by_condition[condition].append( + 'SET_{0}(exec, {1}{0});'.format(f.name, prefix, f.name)) # Print out an if statement for each unique condition, with # the SET_* calls nested inside it. for condition in sorted(settings_by_condition.keys()): diff --git a/lib/mesa/src/mapi/glapi/gen/gl_gentable.py b/lib/mesa/src/mapi/glapi/gen/gl_gentable.py index 2f54d1d57..7cd475aa2 100644 --- a/lib/mesa/src/mapi/glapi/gen/gl_gentable.py +++ b/lib/mesa/src/mapi/glapi/gen/gl_gentable.py @@ -1,3 +1,4 @@ +#!/usr/bin/env python # (C) Copyright IBM Corporation 2004, 2005 # (C) Copyright Apple Inc. 2011 diff --git a/lib/mesa/src/mapi/glapi/gen/gl_marshal.py b/lib/mesa/src/mapi/glapi/gen/gl_marshal.py deleted file mode 100644 index efa4d9e6f..000000000 --- a/lib/mesa/src/mapi/glapi/gen/gl_marshal.py +++ /dev/null @@ -1,365 +0,0 @@ -#!/usr/bin/env python - -# Copyright (C) 2012 Intel Corporation -# -# Permission is hereby granted, free of charge, to any person obtaining a -# copy of this software and associated documentation files (the "Software"), -# to deal in the Software without restriction, including without limitation -# the rights to use, copy, modify, merge, publish, distribute, sublicense, -# and/or sell copies of the Software, and to permit persons to whom the -# Software is furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice (including the next -# paragraph) shall be included in all copies or substantial portions of the -# Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS -# IN THE SOFTWARE. - -import contextlib -import getopt -import gl_XML -import license -import marshal_XML -import sys - -header = """ -#include "api_exec.h" -#include "context.h" -#include "dispatch.h" -#include "glthread.h" -#include "marshal.h" -#include "marshal_generated.h" -""" - - -current_indent = 0 - - -def out(str): - if str: - print ' '*current_indent + str - else: - print '' - - -@contextlib.contextmanager -def indent(delta = 3): - global current_indent - current_indent += delta - yield - current_indent -= delta - - -class PrintCode(gl_XML.gl_print_base): - def __init__(self): - super(PrintCode, self).__init__() - - self.name = 'gl_marshal.py' - self.license = license.bsd_license_template % ( - 'Copyright (C) 2012 Intel Corporation', 'INTEL CORPORATION') - - def printRealHeader(self): - print header - print 'static inline int safe_mul(int a, int b)' - print '{' - print ' if (a < 0 || b < 0) return -1;' - print ' if (a == 0 || b == 0) return 0;' - print ' if (a > INT_MAX / b) return -1;' - print ' return a * b;' - print '}' - print - - def printRealFooter(self): - pass - - def print_sync_call(self, func): - call = 'CALL_{0}(ctx->CurrentServerDispatch, ({1}))'.format( - func.name, func.get_called_parameter_string()) - if func.return_type == 'void': - out('{0};'.format(call)) - else: - out('return {0};'.format(call)) - - def print_sync_dispatch(self, func): - out('debug_print_sync_fallback("{0}");'.format(func.name)) - self.print_sync_call(func) - - def print_sync_body(self, func): - out('/* {0}: marshalled synchronously */'.format(func.name)) - out('static {0} GLAPIENTRY'.format(func.return_type)) - out('_mesa_marshal_{0}({1})'.format(func.name, func.get_parameter_string())) - out('{') - with indent(): - out('GET_CURRENT_CONTEXT(ctx);') - out('_mesa_glthread_finish(ctx);') - out('debug_print_sync("{0}");'.format(func.name)) - self.print_sync_call(func) - out('}') - out('') - out('') - - def print_async_dispatch(self, func): - out('cmd = _mesa_glthread_allocate_command(ctx, ' - 'DISPATCH_CMD_{0}, cmd_size);'.format(func.name)) - for p in func.fixed_params: - if p.count: - out('memcpy(cmd->{0}, {0}, {1});'.format( - p.name, p.size_string())) - else: - out('cmd->{0} = {0};'.format(p.name)) - if func.variable_params: - out('char *variable_data = (char *) (cmd + 1);') - for p in func.variable_params: - if p.img_null_flag: - out('cmd->{0}_null = !{0};'.format(p.name)) - out('if (!cmd->{0}_null) {{'.format(p.name)) - with indent(): - out(('memcpy(variable_data, {0}, {1});').format( - p.name, p.size_string(False))) - out('variable_data += {0};'.format( - p.size_string(False))) - out('}') - else: - out(('memcpy(variable_data, {0}, {1});').format( - p.name, p.size_string(False))) - out('variable_data += {0};'.format( - p.size_string(False))) - - if not func.fixed_params and not func.variable_params: - out('(void) cmd;\n') - out('_mesa_post_marshal_hook(ctx);') - - def print_async_struct(self, func): - out('struct marshal_cmd_{0}'.format(func.name)) - out('{') - with indent(): - out('struct marshal_cmd_base cmd_base;') - for p in func.fixed_params: - if p.count: - out('{0} {1}[{2}];'.format( - p.get_base_type_string(), p.name, p.count)) - else: - out('{0} {1};'.format(p.type_string(), p.name)) - - for p in func.variable_params: - if p.img_null_flag: - out('bool {0}_null; /* If set, no data follows ' - 'for "{0}" */'.format(p.name)) - - for p in func.variable_params: - if p.count_scale != 1: - out(('/* Next {0} bytes are ' - '{1} {2}[{3}][{4}] */').format( - p.size_string(), p.get_base_type_string(), - p.name, p.counter, p.count_scale)) - else: - out(('/* Next {0} bytes are ' - '{1} {2}[{3}] */').format( - p.size_string(), p.get_base_type_string(), - p.name, p.counter)) - out('};') - - def print_async_unmarshal(self, func): - out('static inline void') - out(('_mesa_unmarshal_{0}(struct gl_context *ctx, ' - 'const struct marshal_cmd_{0} *cmd)').format(func.name)) - out('{') - with indent(): - for p in func.fixed_params: - if p.count: - p_decl = '{0} * {1} = cmd->{1};'.format( - p.get_base_type_string(), p.name) - else: - p_decl = '{0} {1} = cmd->{1};'.format( - p.type_string(), p.name) - - if not p_decl.startswith('const '): - # Declare all local function variables as const, even if - # the original parameter is not const. - p_decl = 'const ' + p_decl - - out(p_decl) - - if func.variable_params: - for p in func.variable_params: - out('const {0} * {1};'.format( - p.get_base_type_string(), p.name)) - out('const char *variable_data = (const char *) (cmd + 1);') - for p in func.variable_params: - out('{0} = (const {1} *) variable_data;'.format( - p.name, p.get_base_type_string())) - - if p.img_null_flag: - out('if (cmd->{0}_null)'.format(p.name)) - with indent(): - out('{0} = NULL;'.format(p.name)) - out('else') - with indent(): - out('variable_data += {0};'.format(p.size_string(False))) - else: - out('variable_data += {0};'.format(p.size_string(False))) - - self.print_sync_call(func) - out('}') - - def validate_count_or_fallback(self, func): - # Check that any counts for variable-length arguments might be < 0, in - # which case the command alloc or the memcpy would blow up before we - # get to the validation in Mesa core. - for p in func.parameters: - if p.is_variable_length(): - out('if (unlikely({0} < 0)) {{'.format(p.size_string())) - with indent(): - out('goto fallback_to_sync;') - out('}') - return True - return False - - - def print_async_marshal(self, func): - need_fallback_sync = False - out('static void GLAPIENTRY') - out('_mesa_marshal_{0}({1})'.format( - func.name, func.get_parameter_string())) - out('{') - with indent(): - out('GET_CURRENT_CONTEXT(ctx);') - struct = 'struct marshal_cmd_{0}'.format(func.name) - size_terms = ['sizeof({0})'.format(struct)] - for p in func.variable_params: - size = p.size_string() - if p.img_null_flag: - size = '({0} ? {1} : 0)'.format(p.name, size) - size_terms.append(size) - out('size_t cmd_size = {0};'.format(' + '.join(size_terms))) - out('{0} *cmd;'.format(struct)) - - out('debug_print_marshal("{0}");'.format(func.name)) - - need_fallback_sync = self.validate_count_or_fallback(func) - - if func.marshal_fail: - out('if ({0}) {{'.format(func.marshal_fail)) - with indent(): - out('_mesa_glthread_finish(ctx);') - out('_mesa_glthread_restore_dispatch(ctx);') - self.print_sync_dispatch(func) - out('return;') - out('}') - - out('if (cmd_size <= MARSHAL_MAX_CMD_SIZE) {') - with indent(): - self.print_async_dispatch(func) - out('return;') - out('}') - - out('') - if need_fallback_sync: - out('fallback_to_sync:') - with indent(): - out('_mesa_glthread_finish(ctx);') - self.print_sync_dispatch(func) - - out('}') - - def print_async_body(self, func): - out('/* {0}: marshalled asynchronously */'.format(func.name)) - self.print_async_struct(func) - self.print_async_unmarshal(func) - self.print_async_marshal(func) - out('') - out('') - - def print_unmarshal_dispatch_cmd(self, api): - out('size_t') - out('_mesa_unmarshal_dispatch_cmd(struct gl_context *ctx, ' - 'const void *cmd)') - out('{') - with indent(): - out('const struct marshal_cmd_base *cmd_base = cmd;') - out('switch (cmd_base->cmd_id) {') - for func in api.functionIterateAll(): - flavor = func.marshal_flavor() - if flavor in ('skip', 'sync'): - continue - out('case DISPATCH_CMD_{0}:'.format(func.name)) - with indent(): - out('debug_print_unmarshal("{0}");'.format(func.name)) - out(('_mesa_unmarshal_{0}(ctx, (const struct marshal_cmd_{0} *)' - ' cmd);').format(func.name)) - out('break;') - out('default:') - with indent(): - out('assert(!"Unrecognized command ID");') - out('break;') - out('}') - out('') - out('return cmd_base->cmd_size;') - out('}') - out('') - out('') - - def print_create_marshal_table(self, api): - out('struct _glapi_table *') - out('_mesa_create_marshal_table(const struct gl_context *ctx)') - out('{') - with indent(): - out('struct _glapi_table *table;') - out('') - out('table = _mesa_alloc_dispatch_table();') - out('if (table == NULL)') - with indent(): - out('return NULL;') - out('') - for func in api.functionIterateAll(): - if func.marshal_flavor() == 'skip': - continue - out('SET_{0}(table, _mesa_marshal_{0});'.format(func.name)) - out('') - out('return table;') - out('}') - out('') - out('') - - def printBody(self, api): - async_funcs = [] - for func in api.functionIterateAll(): - flavor = func.marshal_flavor() - if flavor in ('skip', 'custom'): - continue - elif flavor == 'async': - self.print_async_body(func) - async_funcs.append(func) - elif flavor == 'sync': - self.print_sync_body(func) - self.print_unmarshal_dispatch_cmd(api) - self.print_create_marshal_table(api) - - -def show_usage(): - print 'Usage: %s [-f input_file_name]' % sys.argv[0] - sys.exit(1) - - -if __name__ == '__main__': - file_name = 'gl_API.xml' - - try: - (args, trail) = getopt.getopt(sys.argv[1:], 'm:f:') - except Exception,e: - show_usage() - - for (arg,val) in args: - if arg == '-f': - file_name = val - - printer = PrintCode() - - api = gl_XML.parse_GL_API(file_name, marshal_XML.marshal_item_factory()) - printer.Print(api) diff --git a/lib/mesa/src/mapi/glapi/gen/gl_marshal_h.py b/lib/mesa/src/mapi/glapi/gen/gl_marshal_h.py deleted file mode 100644 index 6e39148d2..000000000 --- a/lib/mesa/src/mapi/glapi/gen/gl_marshal_h.py +++ /dev/null @@ -1,86 +0,0 @@ -#!/usr/bin/env python - -# Copyright (C) 2012 Intel Corporation -# -# Permission is hereby granted, free of charge, to any person obtaining a -# copy of this software and associated documentation files (the "Software"), -# to deal in the Software without restriction, including without limitation -# the rights to use, copy, modify, merge, publish, distribute, sublicense, -# and/or sell copies of the Software, and to permit persons to whom the -# Software is furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice (including the next -# paragraph) shall be included in all copies or substantial portions of the -# Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS -# IN THE SOFTWARE. - -import getopt -import gl_XML -import license -import marshal_XML -import sys - - -header = """ -#ifndef MARSHAL_GENERATABLE_H -#define MARSHAL_GENERATABLE_H -""" - -footer = """ -#endif /* MARSHAL_GENERATABLE_H */ -""" - - -class PrintCode(gl_XML.gl_print_base): - def __init__(self): - super(PrintCode, self).__init__() - - self.name = 'gl_marshal_h.py' - self.license = license.bsd_license_template % ( - 'Copyright (C) 2012 Intel Corporation', 'INTEL CORPORATION') - - def printRealHeader(self): - print header - - def printRealFooter(self): - print footer - - def printBody(self, api): - print 'enum marshal_dispatch_cmd_id' - print '{' - for func in api.functionIterateAll(): - flavor = func.marshal_flavor() - if flavor in ('skip', 'sync'): - continue - print ' DISPATCH_CMD_{0},'.format(func.name) - print '};' - - -def show_usage(): - print 'Usage: %s [-f input_file_name]' % sys.argv[0] - sys.exit(1) - - -if __name__ == '__main__': - file_name = 'gl_API.xml' - - try: - (args, trail) = getopt.getopt(sys.argv[1:], 'm:f:') - except Exception,e: - show_usage() - - for (arg,val) in args: - if arg == '-f': - file_name = val - - printer = PrintCode() - - api = gl_XML.parse_GL_API(file_name, marshal_XML.marshal_item_factory()) - printer.Print(api) diff --git a/lib/mesa/src/mapi/glapi/gen/gl_procs.py b/lib/mesa/src/mapi/glapi/gen/gl_procs.py index d9ea1ab07..685e2fac3 100644 --- a/lib/mesa/src/mapi/glapi/gen/gl_procs.py +++ b/lib/mesa/src/mapi/glapi/gen/gl_procs.py @@ -1,3 +1,4 @@ +#!/usr/bin/env python # (C) Copyright IBM Corporation 2004, 2005 # All Rights Reserved. diff --git a/lib/mesa/src/mapi/glapi/gen/gl_table.py b/lib/mesa/src/mapi/glapi/gen/gl_table.py index 579efa80e..e25971a69 100644 --- a/lib/mesa/src/mapi/glapi/gen/gl_table.py +++ b/lib/mesa/src/mapi/glapi/gen/gl_table.py @@ -1,3 +1,4 @@ +#!/usr/bin/python2 # (C) Copyright IBM Corporation 2004 # All Rights Reserved. @@ -40,14 +41,20 @@ class PrintGlTable(gl_XML.gl_print_base): self.license = license.bsd_license_template % ( \ """Copyright (C) 1999-2003 Brian Paul All Rights Reserved. (C) Copyright IBM Corporation 2004""", "BRIAN PAUL, IBM") + self.ifdef_emitted = False return def printBody(self, api): for f in api.functionIterateByOffset(): + if not f.is_abi() and not self.ifdef_emitted: + print '#if !defined HAVE_SHARED_GLAPI' + self.ifdef_emitted = True arg_string = f.get_parameter_string() print ' %s (GLAPIENTRYP %s)(%s); /* %d */' % ( f.return_type, f.name, arg_string, f.offset) + print '#endif /* !defined HAVE_SHARED_GLAPI */' + def printRealHeader(self): print '#ifndef GLAPIENTRYP' print '# ifndef GLAPIENTRY' @@ -58,20 +65,12 @@ class PrintGlTable(gl_XML.gl_print_base): print '#endif' print '' print '' - print '#ifdef __cplusplus' - print 'extern "C" {' - print '#endif' - print '' print 'struct _glapi_table' print '{' return def printRealFooter(self): print '};' - print '' - print '#ifdef __cplusplus' - print '}' - print '#endif' return diff --git a/lib/mesa/src/mapi/glapi/gen/gl_x86-64_asm.py b/lib/mesa/src/mapi/glapi/gen/gl_x86-64_asm.py index cde80ecdc..dcd113e26 100644 --- a/lib/mesa/src/mapi/glapi/gen/gl_x86-64_asm.py +++ b/lib/mesa/src/mapi/glapi/gen/gl_x86-64_asm.py @@ -1,3 +1,4 @@ +#!/usr/bin/env python # (C) Copyright IBM Corporation 2005 # All Rights Reserved. diff --git a/lib/mesa/src/mapi/glapi/gen/gl_x86_asm.py b/lib/mesa/src/mapi/glapi/gen/gl_x86_asm.py index 24c15a708..c0c7941ce 100644 --- a/lib/mesa/src/mapi/glapi/gen/gl_x86_asm.py +++ b/lib/mesa/src/mapi/glapi/gen/gl_x86_asm.py @@ -1,3 +1,4 @@ +#!/usr/bin/env python # (C) Copyright IBM Corporation 2004, 2005 # All Rights Reserved. @@ -119,7 +120,7 @@ class PrintGenericStubs(gl_XML.gl_print_base): print '\tJMP(GL_OFFSET(off))' print '#endif' print '' - print '#ifdef HAVE_FUNC_ATTRIBUTE_ALIAS' + print '#ifdef HAVE_ALIAS' print '# define GL_STUB_ALIAS(fn,off,fn_alt,alias,alias_alt)\t\\' print '\t.globl\tGL_PREFIX(fn, fn_alt) ;\t\t\t\\' print '\t.set\tGL_PREFIX(fn, fn_alt), GL_PREFIX(alias, alias_alt)' diff --git a/lib/mesa/src/mapi/glapi/gen/marshal_XML.py b/lib/mesa/src/mapi/glapi/gen/marshal_XML.py deleted file mode 100644 index 80f7f542e..000000000 --- a/lib/mesa/src/mapi/glapi/gen/marshal_XML.py +++ /dev/null @@ -1,87 +0,0 @@ -#!/usr/bin/env python - -# Copyright (C) 2012 Intel Corporation -# -# Permission is hereby granted, free of charge, to any person obtaining a -# copy of this software and associated documentation files (the "Software"), -# to deal in the Software without restriction, including without limitation -# the rights to use, copy, modify, merge, publish, distribute, sublicense, -# and/or sell copies of the Software, and to permit persons to whom the -# Software is furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice (including the next -# paragraph) shall be included in all copies or substantial portions of the -# Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS -# IN THE SOFTWARE. - -# marshal_XML.py: factory for interpreting XML for the purpose of -# building thread marshalling code. - -import gl_XML - - -class marshal_item_factory(gl_XML.gl_item_factory): - """Factory to create objects derived from gl_item containing - information necessary to generate thread marshalling code.""" - - def create_function(self, element, context): - return marshal_function(element, context) - - -class marshal_function(gl_XML.gl_function): - def process_element(self, element): - # Do normal processing. - super(marshal_function, self).process_element(element) - - # Only do further processing when we see the canonical - # function name. - if element.get('name') != self.name: - return - - # Classify fixed and variable parameters. - self.fixed_params = [] - self.variable_params = [] - for p in self.parameters: - if p.is_padding: - continue - if p.is_variable_length(): - self.variable_params.append(p) - else: - self.fixed_params.append(p) - - # Store the "marshal" attribute, if present. - self.marshal = element.get('marshal') - self.marshal_fail = element.get('marshal_fail') - - def marshal_flavor(self): - """Find out how this function should be marshalled between - client and server threads.""" - # If a "marshal" attribute was present, that overrides any - # determination that would otherwise be made by this function. - if self.marshal not in (None, 'draw'): - return self.marshal - - if self.exec_flavor == 'skip': - # Functions marked exec="skip" are not yet implemented in - # Mesa, so don't bother trying to marshal them. - return 'skip' - - if self.return_type != 'void': - return 'sync' - for p in self.parameters: - if p.is_output: - return 'sync' - if p.is_pointer() and not (p.count or p.counter) and not (self.marshal == 'draw' and p.name == 'indices'): - return 'sync' - if p.count_parameter_list: - # Parameter size is determined by enums; haven't - # written logic to handle this yet. TODO: fix. - return 'sync' - return 'async' diff --git a/lib/mesa/src/mapi/glapi/gen/remap_helper.py b/lib/mesa/src/mapi/glapi/gen/remap_helper.py index de759d6c0..b982beb78 100644 --- a/lib/mesa/src/mapi/glapi/gen/remap_helper.py +++ b/lib/mesa/src/mapi/glapi/gen/remap_helper.py @@ -1,3 +1,4 @@ +#!/usr/bin/env python # Copyright (C) 2009 Chia-I Wu <olv@0xlab.org> # All Rights Reserved. diff --git a/lib/mesa/src/mapi/glapi/gen/static_data.py b/lib/mesa/src/mapi/glapi/gen/static_data.py index 7a8933b8d..25e78bf60 100644 --- a/lib/mesa/src/mapi/glapi/gen/static_data.py +++ b/lib/mesa/src/mapi/glapi/gen/static_data.py @@ -1,3 +1,4 @@ +#!/usr/bin/env python # Copyright (C) 2015 Intel Corporation # diff --git a/lib/mesa/src/mapi/glapi/gen/typeexpr.py b/lib/mesa/src/mapi/glapi/gen/typeexpr.py index 6da85c289..ed23d23ff 100644 --- a/lib/mesa/src/mapi/glapi/gen/typeexpr.py +++ b/lib/mesa/src/mapi/glapi/gen/typeexpr.py @@ -1,3 +1,4 @@ +#!/usr/bin/env python # (C) Copyright IBM Corporation 2005 # All Rights Reserved. |