diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2015-11-22 02:46:45 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2015-11-22 02:46:45 +0000 |
| commit | 3e40341f9dcd7c1bbc9afb8ddb812304820396cf (patch) | |
| tree | 274b3f522afe1da16ab2b5347758c908bc23fac4 /lib/mesa/src/mapi/glapi/gen | |
| parent | 7b644ad52b574bec410d557155d666ac17fdf51a (diff) | |
import Mesa 11.0.6
Diffstat (limited to 'lib/mesa/src/mapi/glapi/gen')
30 files changed, 1579 insertions, 1898 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_draw_elements_base_vertex.xml b/lib/mesa/src/mapi/glapi/gen/ARB_draw_elements_base_vertex.xml index 2f1a93dc8..120bda13d 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" 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" 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" 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_separate_shader_objects.xml b/lib/mesa/src/mapi/glapi/gen/ARB_separate_shader_objects.xml index 26a7afa94..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 @@ -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_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/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 f38a2876d..7919d6577 100644 --- a/lib/mesa/src/mapi/glapi/gen/GL3x.xml +++ b/lib/mesa/src/mapi/glapi/gen/GL3x.xml @@ -21,6 +21,8 @@ <enum name="MINOR_VERSION" value="0x821C"/> <enum name="NUM_EXTENSIONS" value="0x821D"/> <enum name="CONTEXT_FLAGS" value="0x821E"/> + <enum name="DEPTH_BUFFER" value="0x8223"/> + <enum name="STENCIL_BUFFER" value="0x8224"/> <enum name="CONTEXT_FLAG_FORWARD_COMPATIBLE_BIT" value="0x0001"/> <enum name="RGBA32F" value="0x8814"/> <enum name="RGB32F" value="0x8815"/> @@ -129,7 +131,7 @@ <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 *"/> @@ -156,7 +158,7 @@ <!-- These functions alias ones form GL_ARB_draw_buffers2 --> - <function name="ColorMaski" es2="3.2"> + <function name="ColorMaski"> <param name="buf" type="GLuint"/> <param name="r" type="GLboolean"/> <param name="g" type="GLboolean"/> @@ -176,17 +178,17 @@ <param name="data" type="GLint *"/> </function> - <function name="Enablei" es2="3.2"> + <function name="Enablei"> <param name="target" type="GLenum"/> <param name="index" type="GLuint"/> </function> - <function name="Disablei" es2="3.2"> + <function name="Disablei"> <param name="target" type="GLenum"/> <param name="index" type="GLuint"/> </function> - <function name="IsEnabledi" es2="3.2"> + <function name="IsEnabledi"> <param name="target" type="GLenum"/> <param name="index" type="GLuint"/> <return type="GLboolean"/> @@ -256,8 +258,7 @@ <!-- These functions alias ones from GL_EXT_gpu_shader4 --> - <function name="VertexAttribIPointer" es2="3.0" marshal="async" - 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"/> @@ -447,25 +448,25 @@ <!-- These functions alias ones from GL_EXT_texture_integer --> - <function name="TexParameterIiv" es2="3.2"> + <function name="TexParameterIiv"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="const GLint *"/> </function> - <function name="TexParameterIuiv" es2="3.2"> + <function name="TexParameterIuiv"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="const GLuint *"/> </function> - <function name="GetTexParameterIiv" es2="3.2"> + <function name="GetTexParameterIiv"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="GLint *"/> </function> - <function name="GetTexParameterIuiv" es2="3.2"> + <function name="GetTexParameterIuiv"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="GLuint *"/> @@ -556,7 +557,7 @@ <param name="primcount" type="GLsizei"/> </function> - <function name="TexBuffer" es2="3.2"> + <function name="TexBuffer"> <param name="target" type="GLenum"/> <param name="internalFormat" type="GLenum"/> <param name="buffer" type="GLuint"/> @@ -606,7 +607,7 @@ <param name="params" type="GLint64 *"/> </function> - <function name="FramebufferTexture" es2="3.2"> + <function name="FramebufferTexture"> <param name="target" type="GLenum"/> <param name="attachment" type="GLenum"/> <param name="texture" type="GLuint"/> diff --git a/lib/mesa/src/mapi/glapi/gen/apiexec.py b/lib/mesa/src/mapi/glapi/gen/apiexec.py index e5e1b7d78..3a0eb1869 100644 --- a/lib/mesa/src/mapi/glapi/gen/apiexec.py +++ b/lib/mesa/src/mapi/glapi/gen/apiexec.py @@ -68,10 +68,11 @@ class exec_info(): functions = { # OpenGL 3.1 / GL_ARB_texture_buffer_object. Mesa only exposes this # extension with core profile. - "TexBuffer": exec_info(core=31, es2=31), + "TexBuffer": exec_info(core=31), - # OpenGL 3.2 / GL_OES_geometry_shader. - "FramebufferTexture": exec_info(core=32, es2=31), + # OpenGL 3.2 / GL_ARB_geometry_shader4. Mesa does not support + # GL_ARB_geometry_shader4, so OpenGL 3.2 is required. + "FramebufferTexture": exec_info(core=32), # OpenGL 4.0 / GL_ARB_shader_subroutines. Mesa only exposes this # extension with core profile. @@ -133,12 +134,12 @@ functions = { # # Mesa does not support either of the geometry shader extensions, so # OpenGL 3.2 is required. - "ViewportArrayv": exec_info(core=32, es2=31), - "ViewportIndexedf": exec_info(core=32, es2=31), - "ViewportIndexedfv": exec_info(core=32, es2=31), - "ScissorArrayv": exec_info(core=32, es2=31), - "ScissorIndexed": exec_info(core=32, es2=31), - "ScissorIndexedv": exec_info(core=32, es2=31), + "ViewportArrayv": exec_info(core=32), + "ViewportIndexedf": exec_info(core=32), + "ViewportIndexedfv": exec_info(core=32), + "ScissorArrayv": exec_info(core=32), + "ScissorIndexed": exec_info(core=32), + "ScissorIndexedv": exec_info(core=32), "DepthRangeArrayv": exec_info(core=32), "DepthRangeIndexed": exec_info(core=32), # GetFloati_v also GL_ARB_shader_atomic_counters @@ -146,12 +147,12 @@ functions = { # OpenGL 4.3 / GL_ARB_texture_buffer_range. Mesa can expose the extension # with OpenGL 3.1. - "TexBufferRange": exec_info(core=31, es2=31), + "TexBufferRange": exec_info(core=31), # OpenGL 4.3 / GL_ARB_framebuffer_no_attachments. Mesa can expose the # extension with OpenGL 3.0. - "FramebufferParameteri": exec_info(compatibility=30, core=31, es2=31), - "GetFramebufferParameteri": exec_info(compatibility=30, core=31, es2=31), + "FramebufferParameteri": exec_info(compatibility=30, core=31), + "GetFramebufferParameteri": exec_info(compatibility=30, core=31), # OpenGL 4.5 / GL_ARB_direct_state_access. Mesa can expose the extension # with core profile. @@ -252,43 +253,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), } diff --git a/lib/mesa/src/mapi/glapi/gen/glX_XML.py b/lib/mesa/src/mapi/glapi/gen/glX_XML.py index b6d305c87..12ff291fc 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. @@ -356,7 +357,7 @@ class glx_function(gl_XML.gl_function): # FIXME adds some extra diffs to the generated # FIXME code. - size_string = size_string + " + safe_pad(%s)" % (p.size_string(1)) + size_string = size_string + " + __GLX_PAD(%s)" % (p.size_string(1)) return size_string 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..5d95f278a 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. @@ -54,15 +55,15 @@ class PrintGlxDispatch_h(gl_XML.gl_print_base): if not func.ignore and not func.vectorequiv: if func.glx_rop: print 'extern _X_HIDDEN void __glXDisp_%s(GLbyte * pc);' % (func.name) - print 'extern _X_HIDDEN _X_COLD void __glXDispSwap_%s(GLbyte * pc);' % (func.name) + print 'extern _X_HIDDEN void __glXDispSwap_%s(GLbyte * pc);' % (func.name) elif func.glx_sop or func.glx_vendorpriv: print 'extern _X_HIDDEN int __glXDisp_%s(struct __GLXclientStateRec *, GLbyte *);' % (func.name) - print 'extern _X_HIDDEN _X_COLD int __glXDispSwap_%s(struct __GLXclientStateRec *, GLbyte *);' % (func.name) + print 'extern _X_HIDDEN int __glXDispSwap_%s(struct __GLXclientStateRec *, GLbyte *);' % (func.name) if func.glx_sop and func.glx_vendorpriv: n = func.glx_vendorpriv_names[0] print 'extern _X_HIDDEN int __glXDisp_%s(struct __GLXclientStateRec *, GLbyte *);' % (n) - print 'extern _X_HIDDEN _X_COLD int __glXDispSwap_%s(struct __GLXclientStateRec *, GLbyte *);' % (n) + print 'extern _X_HIDDEN int __glXDispSwap_%s(struct __GLXclientStateRec *, GLbyte *);' % (n) return @@ -79,14 +80,23 @@ class PrintGlxDispatchFunctions(glX_proto_common.glx_print_proto): def printRealHeader(self): + print '#include <X11/Xmd.h>' + print '#include <GL/gl.h>' + print '#include <GL/glxproto.h>' + print '#include <inttypes.h>' - print '#include "glxserver.h"' print '#include "indirect_size.h"' print '#include "indirect_size_get.h"' print '#include "indirect_dispatch.h"' + print '#include "glxserver.h"' print '#include "glxbyteorder.h"' print '#include "indirect_util.h"' print '#include "singlesize.h"' + print '#include "glapi.h"' + print '#include "glapitable.h"' + print '#include "dispatch.h"' + print '' + print '#define __GLX_PAD(x) (((x) + 3) & ~3)' print '' print 'typedef struct {' print ' __GLX_PIXEL_3D_HDR;' @@ -114,9 +124,6 @@ class PrintGlxDispatchFunctions(glX_proto_common.glx_print_proto): return - def fptrType(self, name): - fptr = "pfngl" + name + "proc" - return fptr.upper() def printFunction(self, f, name): if (f.glx_sop or f.glx_vendorpriv) and (len(f.get_images()) != 0): @@ -134,9 +141,6 @@ class PrintGlxDispatchFunctions(glX_proto_common.glx_print_proto): print '{' - if not f.is_abi(): - print ' %s %s = __glGetProcAddress("gl%s");' % (self.fptrType(name), name, name) - if f.glx_rop or f.vectorequiv: self.printRenderFunction(f) elif f.glx_sop or f.glx_vendorpriv: @@ -170,11 +174,11 @@ class PrintGlxDispatchFunctions(glX_proto_common.glx_print_proto): if t.glx_name not in already_done: real_name = self.real_types[t_size] - print 'static _X_UNUSED %s' % (t_name) - print 'bswap_%s(const void * src)' % (t.glx_name) + print 'static %s' % (t_name) + print 'bswap_%s( const void * src )' % (t.glx_name) print '{' print ' union { %s dst; %s ret; } x;' % (real_name, t_name) - print ' x.dst = bswap_%u(*(%s *) src);' % (t_size * 8, real_name) + print ' x.dst = bswap_%u( *(%s *) src );' % (t_size * 8, real_name) print ' return x.ret;' print '}' print '' @@ -182,12 +186,12 @@ class PrintGlxDispatchFunctions(glX_proto_common.glx_print_proto): for bits in [16, 32, 64]: print 'static void *' - print 'bswap_%u_array(uint%u_t * src, unsigned count)' % (bits, bits) + print 'bswap_%u_array( uint%u_t * src, unsigned count )' % (bits, bits) print '{' print ' unsigned i;' print '' - print ' for (i = 0 ; i < count ; i++) {' - print ' uint%u_t temp = bswap_%u(src[i]);' % (bits, bits) + print ' for ( i = 0 ; i < count ; i++ ) {' + print ' uint%u_t temp = bswap_%u( src[i] );' % (bits, bits) print ' src[i] = temp;' print ' }' print '' @@ -221,7 +225,6 @@ class PrintGlxDispatchFunctions(glX_proto_common.glx_print_proto): def emit_function_call(self, f, retval_assign, indent): list = [] - prefix = "gl" if f.is_abi() else "" for param in f.parameterIterator(): if param.is_padding: @@ -234,7 +237,14 @@ class PrintGlxDispatchFunctions(glX_proto_common.glx_print_proto): list.append( '%s %s' % (indent, location) ) - print '%s %s%s%s(%s);' % (indent, retval_assign, prefix, f.name, string.join(list, ',\n')) + + if len( list ): + print '%s %sCALL_%s( GET_DISPATCH(), (' % (indent, retval_assign, f.name) + print string.join( list, ",\n" ) + print '%s ) );' % (indent) + else: + print '%s %sCALL_%s( GET_DISPATCH(), () );' % (indent, retval_assign, f.name) + return def common_func_print_just_start(self, f, indent): @@ -434,10 +444,6 @@ class PrintGlxDispatchFunctions(glX_proto_common.glx_print_proto): print ' %s %s = __glXGetAnswerBuffer(cl, %s%s, answerBuffer, sizeof(answerBuffer), %u);' % (param.type_string(), param.name, param.counter, size_scale, type_size) answer_string = param.name answer_count = param.counter - print '' - print ' if (%s == NULL) return BadAlloc;' % (param.name) - print ' __glXClearErrorOccured();' - print '' elif c >= 1: print ' %s %s[%u];' % (answer_type, param.name, c) answer_string = param.name @@ -501,18 +507,18 @@ class PrintGlxDispatchFunctions(glX_proto_common.glx_print_proto): # the must NEVER be byte-swapped. if not (img.img_type == "GL_BITMAP" and img.img_format == "GL_COLOR_INDEX"): - print ' glPixelStorei(GL_UNPACK_SWAP_BYTES, hdr->swapBytes);' + print ' CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SWAP_BYTES, hdr->swapBytes) );' - print ' glPixelStorei(GL_UNPACK_LSB_FIRST, hdr->lsbFirst);' + print ' CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_LSB_FIRST, hdr->lsbFirst) );' - print ' glPixelStorei(GL_UNPACK_ROW_LENGTH, (GLint) %shdr->rowLength%s);' % (pre, post) + print ' CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_ROW_LENGTH, (GLint) %shdr->rowLength%s) );' % (pre, post) if img.depth: - print ' glPixelStorei(GL_UNPACK_IMAGE_HEIGHT, (GLint) %shdr->imageHeight%s);' % (pre, post) - print ' glPixelStorei(GL_UNPACK_SKIP_ROWS, (GLint) %shdr->skipRows%s);' % (pre, post) + print ' CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_IMAGE_HEIGHT, (GLint) %shdr->imageHeight%s) );' % (pre, post) + print ' CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SKIP_ROWS, (GLint) %shdr->skipRows%s) );' % (pre, post) if img.depth: - print ' glPixelStorei(GL_UNPACK_SKIP_IMAGES, (GLint) %shdr->skipImages%s);' % (pre, post) - print ' glPixelStorei(GL_UNPACK_SKIP_PIXELS, (GLint) %shdr->skipPixels%s);' % (pre, post) - print ' glPixelStorei(GL_UNPACK_ALIGNMENT, (GLint) %shdr->alignment%s);' % (pre, post) + print ' CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SKIP_IMAGES, (GLint) %shdr->skipImages%s) );' % (pre, post) + print ' CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SKIP_PIXELS, (GLint) %shdr->skipPixels%s) );' % (pre, post) + print ' CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_ALIGNMENT, (GLint) %shdr->alignment%s) );' % (pre, post) print '' 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..2b3303078 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. @@ -173,35 +174,13 @@ class PrintGlxProtoStubs(glX_proto_common.glx_print_proto): print '#include <X11/Xlib-xcb.h>' print '#include <xcb/xcb.h>' print '#include <xcb/glx.h>' - print '#include <limits.h>' print '' + print '#define __GLX_PAD(n) (((n) + 3) & ~3)' + print '' self.printFastcall() self.printNoinline() print '' - - print 'static _X_INLINE int safe_add(int a, int b)' - print '{' - print ' if (a < 0 || b < 0) return -1;' - print ' if (INT_MAX - a < b) return -1;' - print ' return a + b;' - print '}' - print 'static _X_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 'static _X_INLINE int safe_pad(int a)' - print '{' - print ' int ret;' - print ' if (a < 0) return -1;' - print ' if ((ret = safe_add(a, 3)) < 0) return -1;' - print ' return ret & (GLuint)~3;' - print '}' - print '' - print '#ifndef __GNUC__' print '# define __builtin_expect(x, y) x' print '#endif' @@ -382,7 +361,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 +397,7 @@ __indirect_get_proc_address(const char *name) return (pair) ? pair->proc : NULL; } -#endif /* GLX_INDIRECT_RENDERING */ +#endif /* GLX_SHARED_GLAPI */ """ return @@ -572,7 +551,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 '}' @@ -634,15 +613,6 @@ generic_%u_byte( GLint rop, const void * ptr ) if name != None and name not in f.glx_vendorpriv_names: print '#endif' - if f.command_variable_length() != "": - print " if (0%s < 0) {" % f.command_variable_length() - print " __glXSetError(gc, GL_INVALID_VALUE);" - if f.return_type != 'void': - print " return 0;" - else: - print " return;" - print " }" - condition_list = [] for p in f.parameterIterateCounters(): condition_list.append( "%s >= 0" % (p.name) ) @@ -1113,7 +1083,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..75fc26f5d 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. @@ -290,7 +291,7 @@ class glx_server_enum_function(glx_enum_function): print '' print ' compsize = __gl%s_size(%s);' % (f.name, string.join(f.count_parameter_list, ",")) p = f.variable_length_parameter() - print ' return safe_pad(%s);' % (p.size_string()) + print ' return __GLX_PAD(%s);' % (p.size_string()) print '}' print '' @@ -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 )));' @@ -424,7 +428,7 @@ class PrintGlxReqSize_h(PrintGlxReqSize_common): def printBody(self, api): for func in api.functionIterateGlx(): if not func.ignore and func.has_variable_size_request(): - print 'extern PURE _X_HIDDEN int __glX%sReqSize(const GLbyte *pc, Bool swap, int reqlen);' % (func.name) + print 'extern PURE _X_HIDDEN int __glX%sReqSize(const GLbyte *pc, Bool swap);' % (func.name) class PrintGlxReqSize_c(PrintGlxReqSize_common): @@ -448,15 +452,20 @@ class PrintGlxReqSize_c(PrintGlxReqSize_common): print '#include "indirect_size.h"' print '#include "indirect_reqsize.h"' print '' - print '#ifdef HAVE_FUNC_ATTRIBUTE_ALIAS' + print '#define __GLX_PAD(x) (((x) + 3) & ~3)' + print '' + 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 ' GLint __glX ## from ## ReqSize( const GLbyte * pc, Bool swap ) \\' print ' __attribute__ ((alias( # to )));' print '# define ALIAS(from,to) ALIAS2( from, __glX ## to ## ReqSize )' print '#else' print '# define ALIAS(from,to) \\' - print ' GLint __glX ## from ## ReqSize( const GLbyte * pc, Bool swap, int reqlen ) \\' - print ' { return __glX ## to ## ReqSize( pc, swap, reqlen ); }' + print ' GLint __glX ## from ## ReqSize( const GLbyte * pc, Bool swap ) \\' + print ' { return __glX ## to ## ReqSize( pc, swap ); }' print '#endif' print '' print '' @@ -538,7 +547,7 @@ class PrintGlxReqSize_c(PrintGlxReqSize_common): def common_func_print_just_header(self, f): print 'int' - print '__glX%sReqSize( const GLbyte * pc, Bool swap, int reqlen )' % (f.name) + print '__glX%sReqSize( const GLbyte * pc, Bool swap )' % (f.name) print '{' @@ -593,6 +602,7 @@ class PrintGlxReqSize_c(PrintGlxReqSize_common): offset = 0 fixup = [] params = [] + plus = '' size = '' param_offsets = {} @@ -610,10 +620,9 @@ class PrintGlxReqSize_c(PrintGlxReqSize_common): if s == 0: s = 1 sig += "(%u,%u)" % (f.offset_of(p.counter), s) - if size == '': - size = p.size_string() - else: - size = "safe_add(%s, %s)" % (size, p.size_string()) + size += '%s%s' % (plus, p.size_string()) + plus = ' + ' + # If the calculated signature matches a function that has # already be emitted, don't emit this function. Instead, add @@ -636,7 +645,7 @@ class PrintGlxReqSize_c(PrintGlxReqSize_common): self.common_emit_fixups(fixup) print '' - print ' return safe_pad(%s);' % (size) + print ' return __GLX_PAD(%s);' % (size) print '}' print '' 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 522d2e5e8..658efa485 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> @@ -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> @@ -2605,21 +2598,21 @@ <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"/> @@ -3146,15 +3139,15 @@ <enum name="EDGE_FLAG_ARRAY_POINTER" value="0x8093"/> <enum name="CLIENT_PIXEL_STORE_BIT" value="0x00000001"/> <enum name="CLIENT_VERTEX_ARRAY_BIT" value="0x00000002"/> + <enum name="ALL_CLIENT_ATTRIB_BITS" value="0xFFFFFFFF"/> <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" - 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"/> @@ -3167,15 +3160,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"/> @@ -3183,8 +3175,7 @@ <glx handcode="true"/> </function> - <function name="EdgeFlagPointer" deprecated="3.1" marshal="async" - 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"/> @@ -3195,14 +3186,13 @@ <glx handcode="true"/> </function> - <function name="GetPointerv" es1="1.1" es2="3.2"> + <function name="GetPointerv" es1="1.1"> <param name="pname" type="GLenum"/> <param name="params" type="GLvoid **" output="true"/> <glx handcode="true"/> </function> - <function name="IndexPointer" deprecated="3.1" marshal="async" - 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 *"/> @@ -3216,16 +3206,14 @@ <glx handcode="true"/> </function> - <function name="NormalPointer" es1="1.0" deprecated="3.1" marshal="async" - 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" - 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"/> @@ -3233,8 +3221,7 @@ <glx handcode="true"/> </function> - <function name="VertexPointer" es1="1.0" deprecated="3.1" marshal="async" - 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"/> @@ -3737,8 +3724,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"/> @@ -4501,7 +4487,7 @@ <glx rop="229"/> </function> - <function name="CompressedTexImage3D" es2="3.0" marshal="sync"> + <function name="CompressedTexImage3D" es2="3.0"> <param name="target" type="GLenum"/> <param name="level" type="GLint"/> <param name="internalformat" type="GLenum"/> @@ -4514,7 +4500,7 @@ <glx rop="216" handcode="client"/> </function> - <function name="CompressedTexImage2D" es1="1.0" es2="2.0" marshal="sync"> + <function name="CompressedTexImage2D" es1="1.0" es2="2.0"> <param name="target" type="GLenum"/> <param name="level" type="GLint"/> <param name="internalformat" type="GLenum"/> @@ -4526,7 +4512,7 @@ <glx rop="215" handcode="client"/> </function> - <function name="CompressedTexImage1D" marshal="sync"> + <function name="CompressedTexImage1D"> <param name="target" type="GLenum"/> <param name="level" type="GLint"/> <param name="internalformat" type="GLenum"/> @@ -4537,7 +4523,7 @@ <glx rop="214" handcode="client"/> </function> - <function name="CompressedTexSubImage3D" es2="3.0" marshal="sync"> + <function name="CompressedTexSubImage3D" es2="3.0"> <param name="target" type="GLenum"/> <param name="level" type="GLint"/> <param name="xoffset" type="GLint"/> @@ -4552,7 +4538,7 @@ <glx rop="219" handcode="client"/> </function> - <function name="CompressedTexSubImage2D" es1="1.0" es2="2.0" marshal="sync"> + <function name="CompressedTexSubImage2D" es1="1.0" es2="2.0"> <param name="target" type="GLenum"/> <param name="level" type="GLint"/> <param name="xoffset" type="GLint"/> @@ -4565,7 +4551,7 @@ <glx rop="218" handcode="client"/> </function> - <function name="CompressedTexSubImage1D" marshal="sync"> + <function name="CompressedTexSubImage1D"> <param name="target" type="GLenum"/> <param name="level" type="GLint"/> <param name="xoffset" type="GLint"/> @@ -4724,15 +4710,14 @@ <glx rop="4125"/> </function> - <function name="FogCoordPointer" deprecated="3.1" marshal="async" - 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 *"/> @@ -4861,8 +4846,7 @@ <glx rop="4132"/> </function> - <function name="SecondaryColorPointer" deprecated="3.1" marshal="async" - 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"/> @@ -5027,13 +5011,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"> + <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"/> @@ -5041,7 +5025,7 @@ <glx ignore="true"/> </function> - <function name="BufferSubData" es1="1.1" es2="2.0" marshal="custom"> + <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"/> @@ -5484,7 +5468,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 *"/> @@ -5816,8 +5800,7 @@ <glx rop="4233"/> </function> - <function name="VertexAttribPointer" es2="2.0" marshal="async" - 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"/> @@ -5876,7 +5859,7 @@ <param name="location" type="GLint"/> <param name="count" type="GLsizei" counter="true"/> <param name="transpose" type="GLboolean"/> - <param name="value" type="const GLfloat *" count="count" count_scale="8"/> + <param name="value" type="const GLfloat *" count="count" count_scale="6"/> <glx ignore="true"/> </function> <function name="UniformMatrix4x2fv" es2="3.0"> @@ -7992,7 +7975,7 @@ <!-- 46. GL_ARB_framebuffer_sRGB --> -<!-- 47. GL_ARB_geometry_shader4. There are no intentions to implement this extension --> +<xi:include href="ARB_geometry_shader4.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> <!-- 48. GL_ARB_half_float_vertex --> @@ -8107,7 +8090,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"/> @@ -8155,13 +8138,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"/> @@ -8185,7 +8168,7 @@ <xi:include href="ARB_texture_storage.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> -<xi:include href="KHR_texture_compression_astc.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> +<!-- ARB extension #118 --> <xi:include href="KHR_debug.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> @@ -8213,7 +8196,7 @@ <xi:include href="ARB_framebuffer_no_attachments.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> -<xi:include href="ARB_internalformat_query2.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> +<!-- ARB extensions #131 --> <category name="GL_ARB_explicit_uniform_location" number="128"> <enum name="MAX_UNIFORM_LOCATIONS" count="1" value="0x826E" > @@ -8228,11 +8211,7 @@ <xi:include href="ARB_program_interface_query.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> -<!-- ARB extensions #135...#136 --> - -<xi:include href="ARB_shader_storage_buffer_object.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> - -<!-- ARB extensions #138 --> +<!-- ARB extensions #135...#138 --> <xi:include href="ARB_texture_buffer_range.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> @@ -8265,20 +8244,7 @@ <xi:include href="ARB_multi_bind.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> -<category name="GL_ARB_query_buffer_object" number="148"> - <enum name="QUERY_RESULT_NO_WAIT" value="0x9194"/> - <enum name="QUERY_BUFFER" value="0x9192"/> - <enum name="QUERY_BUFFER_BINDING" value="0x9193"/> - <enum name="QUERY_BUFFER_BARRIER_BIT" value="0x00008000"/> -</category> - -<!-- ARB extensions 149 - 152 --> - -<xi:include href="ARB_compute_variable_group_size.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> - -<xi:include href="ARB_indirect_parameters.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> - -<!-- ARB extensions 155 - 159 --> +<!-- ARB extensions 148 - 159 --> <xi:include href="ARB_clip_control.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> @@ -8289,14 +8255,7 @@ <enum name="QUERY_BY_REGION_NO_WAIT_INVERTED" value="0x8E1A"/> </category> -<category name="ARB_cull_distance" number="162"> - <enum name="MAX_CULL_DISTANCES" value="0x82F9"/> - <enum name="MAX_COMBINED_CLIP_AND_CULL_DISTANCES" value="0x82FA"/> -</category> - -<!-- ARB extensions 163 --> - -<xi:include href="OES_texture_compression_astc.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> +<!-- ARB extensions 162 - 163 --> <xi:include href="ARB_direct_state_access.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> @@ -8308,82 +8267,9 @@ <xi:include href="KHR_context_flush_control.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> -<!-- ARB extension 170 --> -<xi:include href="KHR_robustness.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> - <!-- 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. --> - <function name="PrimitiveBoundingBox" es2="3.2" desktop="false"> - <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> - - <function name="BlendBarrier" es2="3.2"/> -</category> - -<category name="KHR_blend_equation_advanced" number="174"> - <enum name="BLEND_ADVANCED_COHERENT_KHR" value="0x9285"/> - - <enum name="MULTIPLY_KHR" value="0x9294"/> - <enum name="SCREEN_KHR" value="0x9295"/> - <enum name="OVERLAY_KHR" value="0x9296"/> - <enum name="DARKEN_KHR" value="0x9297"/> - <enum name="LIGHTEN_KHR" value="0x9298"/> - <enum name="COLORDODGE_KHR" value="0x9299"/> - <enum name="COLORBURN_KHR" value="0x929A"/> - <enum name="HARDLIGHT_KHR" value="0x929B"/> - <enum name="SOFTLIGHT_KHR" value="0x929C"/> - <enum name="DIFFERENCE_KHR" value="0x929E"/> - <enum name="EXCLUSION_KHR" value="0x92A0"/> - - <enum name="HSL_HUE_KHR" value="0x92AD"/> - <enum name="HSL_SATURATION_KHR" value="0x92AE"/> - <enum name="HSL_COLOR_KHR" value="0x92AF"/> - <enum name="HSL_LUMINOSITY_KHR" value="0x92B0"/> - - <function name="BlendBarrierKHR" alias="BlendBarrier" es2="2.0"/> -</category> - -<category name="ARB_ES3_2_compatibility" number="177"> - - <enum name="PRIMITIVE_BOUNDING_BOX_ARB" count="8" value="0x92BE"> - <size name="Get" mode="get"/> - </enum> - <enum name="MULTISAMPLE_LINE_WIDTH_RANGE_ARB" count="2" value="0x9381"> - <size name="Get" mode="get"/> - </enum> - <enum name="MULTISAMPLE_LINE_WIDTH_GRANULARITY_ARB" value="0x9382"> - <size name="Get" mode="get"/> - </enum> - - <function name="PrimitiveBoundingBoxARB" 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="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"> @@ -9193,8 +9079,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"/> @@ -9209,8 +9094,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 *"/> @@ -9222,8 +9106,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"/> @@ -9231,8 +9114,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"/> @@ -9240,8 +9122,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"/> @@ -9250,8 +9131,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"/> @@ -9803,11 +9683,11 @@ <category name="GL_EXT_cull_vertex" number="98"> <enum name="CULL_VERTEX_EXT" value="0x81AA"/> - <enum name="CULL_VERTEX_EYE_POSITION_EXT" count="4" value="0x81AB"> + <enum name="CULL_VERTEX_OBJECT_POSITION_EXT" count="4" value="0x81AB"> <size name="CullParameterfv"/> <size name="CullParameterdv"/> </enum> - <enum name="CULL_VERTEX_OBJECT_POSITION_EXT" count="4" value="0x81AC"> + <enum name="CULL_VERTEX_EYE_POSITION_EXT" count="4" value="0x81AC"> <size name="CullParameterfv"/> <size name="CullParameterdv"/> </enum> @@ -10219,15 +10099,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"/> @@ -11237,7 +11116,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 *"/> @@ -11246,8 +11125,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"/> @@ -12735,8 +12613,6 @@ <xi:include href="EXT_framebuffer_object.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> -<xi:include href="GREMEDY_string_marker.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> - <xi:include href="EXT_packed_depth_stencil.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> <xi:include href="EXT_provoking_vertex.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> @@ -12776,12 +12652,6 @@ <enum name="FRAMEBUFFER_SRGB_CAPABLE_EXT" value="0x8DBA"/> </category> -<category name="GL_ATI_meminfo" number="359"> - <enum name="VBO_FREE_MEMORY_ATI" value="0x87FB" /> - <enum name="TEXTURE_FREE_MEMORY_ATI" value="0x87FC" /> - <enum name="RENDERBUFFER_FREE_MEMORY_ATI" value="0x87FD" /> -</category> - <xi:include href="AMD_performance_monitor.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> <category name="GL_APPLE_texture_range" number="367"> @@ -12835,37 +12705,19 @@ <enum name="EXTERNAL_VIRTUAL_MEMORY_BUFFER_AMD" value="0x9160"/> </category> -<category name="GL_NVX_gpu_memory_info" number="438"> - <enum name="GPU_MEMORY_INFO_DEDICATED_VIDMEM_NVX" value="0x9047" /> - <enum name="GPU_MEMORY_INFO_TOTAL_AVAILABLE_MEMORY_NVX" value="0x9048" /> - <enum name="GPU_MEMORY_INFO_CURRENT_AVAILABLE_VIDMEM_NVX" value="0x9049" /> - <enum name="GPU_MEMORY_INFO_EVICTION_COUNT_NVX" value="0x904A" /> - <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"> <enum name="POLYGON_OFFSET_CLAMP_EXT" value="0x8E1B"> <size name="Get" mode="get"/> </enum> - <function name="PolygonOffsetClampEXT" es1="1.0" es2="2.0"> + <function name="PolygonOffsetClampEXT"> <param name="factor" type="GLfloat"/> <param name="units" type="GLfloat"/> <param name="clamp" type="GLfloat"/> </function> </category> -<xi:include href="EXT_window_rectangles.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> - <!-- Unnumbered extensions sorted by name. --> <category name="GL_ATI_blend_equation_separate"> 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 c688906e8..67aba81a7 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. @@ -129,7 +130,7 @@ class gl_print_base(object): % (self.name) print '' print '/*' - print (' * ' + self.license.replace('\n', '\n * ')).replace(' \n', '\n') + print ' * ' + self.license.replace('\n', '\n * ') print ' */' print '' if self.header_tag: @@ -222,7 +223,7 @@ class gl_print_base(object): """ self.undef_list.append(S) - print """# if defined(__GNUC__) && !defined(__CYGWIN__) && !defined(__MINGW32__) + print """# if (defined(__GNUC__) && !defined(__CYGWIN__) && !defined(__MINGW32__)) || (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590) && defined(__ELF__)) # define %s __attribute__((visibility("%s"))) # else # define %s @@ -242,7 +243,7 @@ class gl_print_base(object): """ self.undef_list.append("NOINLINE") - print """# if defined(__GNUC__) + print """# if defined(__GNUC__) || (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590)) # define NOINLINE __attribute__((noinline)) # else # define NOINLINE @@ -575,7 +576,7 @@ class gl_parameter(object): list.append( str(s) ) if len(list) > 1 and use_parens : - return "safe_mul(%s)" % (string.join(list, ", ")) + return "(%s)" % (string.join(list, " * ")) else: return string.join(list, " * ") 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..041c2f8dd 100644 --- a/lib/mesa/src/mapi/glapi/gen/gl_enums.py +++ b/lib/mesa/src/mapi/glapi/gen/gl_enums.py @@ -1,7 +1,8 @@ +#!/usr/bin/python2 +# -*- Mode: Python; py-indent-offset: 8 -*- # (C) Copyright Zack Rusin 2005. All Rights Reserved. # Copyright (C) 2015 Intel Corporation -# Copyright (C) 2015 Broadcom Corporation # # Permission is hereby granted, free of charge, to any person obtaining a # copy of this software and associated documentation files (the "Software"), @@ -29,9 +30,7 @@ import argparse import license import gl_XML -import xml.etree.ElementTree as ET import sys, getopt -import re class PrintGlEnums(gl_XML.gl_print_base): @@ -41,10 +40,7 @@ class PrintGlEnums(gl_XML.gl_print_base): self.name = "gl_enums.py (from Mesa)" self.license = license.bsd_license_template % ( \ """Copyright (C) 1999-2005 Brian Paul All Rights Reserved.""", "BRIAN PAUL") - # Mapping from enum value to (name, priority) tuples. self.enum_table = {} - # Mapping from enum name to value - self.string_to_int = {} def printRealHeader(self): @@ -54,7 +50,7 @@ class PrintGlEnums(gl_XML.gl_print_base): print '#include "main/mtypes.h"' print '' print 'typedef struct PACKED {' - print ' uint32_t offset;' + print ' uint16_t offset;' print ' int n;' print '} enum_elt;' print '' @@ -82,15 +78,12 @@ static int compar_nr( const int *a, enum_elt *b ) static char token_tmp[20]; -/** - * This function always returns a string. If the number is a valid enum, it - * returns the enum name. Otherwise, it returns a numeric string. - */ -const char * -_mesa_enum_to_string(int nr) +const char *_mesa_enum_to_string( int nr ) { enum_elt *elt; + STATIC_ASSERT(sizeof(enum_string_table) < (1 << 16)); + elt = bsearch(& nr, enum_string_table_offsets, ARRAY_SIZE(enum_string_table_offsets), sizeof(enum_string_table_offsets[0]), @@ -148,10 +141,23 @@ _mesa_lookup_prim_by_nr(GLuint nr) return - def printBody(self, xml): - self.process_enums(xml) + def printBody(self, api_list): + self.enum_table = {} + for api in api_list: + self.process_enums( api ) + + enum_table = [] + + for enum in sorted(self.enum_table.keys()): + low_pri = 9 + best_name = '' + for [name, pri] in self.enum_table[ enum ]: + if pri < low_pri: + low_pri = pri + best_name = name + + enum_table.append((enum, best_name)) - sorted_enum_values = sorted(self.enum_table.keys()) string_offsets = {} i = 0; print '#if defined(__GNUC__)' @@ -160,28 +166,19 @@ _mesa_lookup_prim_by_nr(GLuint nr) print '# define LONGSTRING' print '#endif' print '' - print 'LONGSTRING static const char enum_string_table[] = {' - # We express the very long concatenation of enum strings as an array - # of characters rather than as a string literal to work-around MSVC's - # 65535 character limit. - for enum in sorted_enum_values: - (name, pri) = self.enum_table[enum] - print " ", - for ch in name: - print "'%c'," % ch, - print "'\\0'," - + print 'LONGSTRING static const char enum_string_table[] = ' + for enum, name in enum_table: + print ' "%s\\0"' % (name) string_offsets[ enum ] = i i += len(name) + 1 - print '};' + print ' ;' print '' - print 'static const enum_elt enum_string_table_offsets[%u] =' % (len(self.enum_table)) + print 'static const enum_elt enum_string_table_offsets[%u] =' % (len(enum_table)) print '{' - for enum in sorted_enum_values: - (name, pri) = self.enum_table[enum] + for enum, name in enum_table: print ' { %5u, 0x%08X }, /* %s */' % (string_offsets[enum], enum, name) print '};' print '' @@ -189,86 +186,22 @@ _mesa_lookup_prim_by_nr(GLuint nr) self.print_code() return - def add_enum_provider(self, name, priority): - value = self.string_to_int[name] - - # We don't want the weird GL_SKIP_COMPONENTS1_NV enums. - if value < 0: - return - # We don't want the 64-bit GL_TIMEOUT_IGNORED "enums" - if value > 0xffffffff: - return - - # We don't want bitfields in the enum-to-string table -- - # individual bits have so many names, it's pointless. Note - # that we check for power-of-two, since some getters have - # "_BITS" in their name, but none have a power-of-two enum - # number. - if not (value & (value - 1)) and '_BIT' in name: - return - - # Also drop the GL_*_ATTRIB_BITS bitmasks. - if value == 0xffffffff: - return - - if value in self.enum_table: - (n, p) = self.enum_table[value] - if priority < p: - self.enum_table[value] = (name, priority) - else: - self.enum_table[value] = (name, priority) - - def process_extension(self, extension): - if extension.get('name').startswith('GL_ARB_'): - extension_prio = 400 - elif extension.get('name').startswith('GL_EXT_'): - extension_prio = 600 - else: - extension_prio = 800 - - for enum in extension.findall('require/enum'): - self.add_enum_provider(enum.get('name'), extension_prio) - - def process_enums(self, xml): - # First, process the XML entries that define the hex values - # for all of the enum names. - for enum in xml.findall('enums/enum'): - name = enum.get('name') - value = int(enum.get('value'), base=16) - - # If the same name ever maps to multiple values, that can - # confuse us. GL_ACTIVE_PROGRAM_EXT is OK to lose because - # we choose GL_ACTIVE PROGRAM instead. - if name in self.string_to_int and name != "GL_ACTIVE_PROGRAM_EXT": - print "#error Renumbering {0} from {1} to {2}".format(name, self.string_to_int[name], value) - - self.string_to_int[name] = value - - # Now, process all of the API versions and extensions that - # provide enums, so we can decide what name to call any hex - # value. - for feature in xml.findall('feature'): - feature_name = feature.get('name') - - # When an enum gets renamed in a newer version (generally - # because of some generalization of the functionality), - # prefer the newer name. Also, prefer desktop GL names to - # ES. - m = re.match('GL_VERSION_([0-9])_([0-9])', feature_name) - if m: - feature_prio = 100 - int(m.group(1) + m.group(2)) - else: - m = re.match('GL_ES_VERSION_([0-9])_([0-9])', feature_name) - if m: - feature_prio = 200 - int(m.group(1) + m.group(2)) - else: - feature_prio = 200 - - for enum in feature.findall('require/enum'): - self.add_enum_provider(enum.get('name'), feature_prio) - - for extension in xml.findall('extensions/extension'): - self.process_extension(extension) + + def process_enums(self, api): + for obj in api.enumIterateByName(): + if obj.value not in self.enum_table: + self.enum_table[ obj.value ] = [] + + + enum = self.enum_table[ obj.value ] + name = "GL_" + obj.name + priority = obj.priority() + already_in = False; + for n, p in enum: + if n == name: + already_in = True + if not already_in: + enum.append( [name, priority] ) def _parser(): @@ -281,10 +214,10 @@ def _parser(): def main(): args = _parser() - xml = ET.parse(args.input_file) + api_list = [gl_XML.parse_GL_API(args.input_file)] printer = PrintGlEnums() - printer.Print(xml) + printer.Print(api_list) if __name__ == '__main__': diff --git a/lib/mesa/src/mapi/glapi/gen/gl_genexec.py b/lib/mesa/src/mapi/glapi/gen/gl_genexec.py index 3a75419a7..26d8e7bfb 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 # @@ -55,7 +56,6 @@ header = """/** #include "main/blit.h" #include "main/bufferobj.h" #include "main/arrayobj.h" -#include "main/bbox.h" #include "main/buffers.h" #include "main/clear.h" #include "main/clip.h" @@ -66,7 +66,6 @@ header = """/** #include "main/convolve.h" #include "main/copyimage.h" #include "main/depth.h" -#include "main/debug_output.h" #include "main/dlist.h" #include "main/drawpix.h" #include "main/drawtex.h" @@ -89,9 +88,7 @@ header = """/** #include "main/matrix.h" #include "main/multisample.h" #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" @@ -112,7 +109,7 @@ header = """/** #include "main/texparam.h" #include "main/texstate.h" #include "main/texstorage.h" -#include "main/barrier.h" +#include "main/texturebarrier.h" #include "main/textureview.h" #include "main/transformfeedback.h" #include "main/mtypes.h" diff --git a/lib/mesa/src/mapi/glapi/gen/gl_gentable.py b/lib/mesa/src/mapi/glapi/gen/gl_gentable.py index 2f54d1d57..1b3eb7247 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 @@ -112,9 +113,6 @@ __glapi_gentable_set_remaining_noop(struct _glapi_table *disp) { dispatch[i] = p.v; } -""" - -footer = """ struct _glapi_table * _glapi_create_table_from_handle(void *handle, const char *symbol_prefix) { struct _glapi_table *disp = calloc(_glapi_get_dispatch_table_size(), sizeof(_glapi_proc)); @@ -125,28 +123,27 @@ _glapi_create_table_from_handle(void *handle, const char *symbol_prefix) { if(symbol_prefix == NULL) symbol_prefix = ""; +""" - /* Note: This code relies on _glapi_table_func_names being sorted by the - * entry point index of each function. - */ - for (int func_index = 0; func_index < GLAPI_TABLE_COUNT; ++func_index) { - const char *name = _glapi_table_func_names[func_index]; - void ** procp = &((void **)disp)[func_index]; +footer = """ + __glapi_gentable_set_remaining_noop(disp); - snprintf(symboln, sizeof(symboln), \"%s%s\", symbol_prefix, name); + return disp; +} +""" + +body_template = """ + if(!disp->%(name)s) { + void ** procp = (void **) &disp->%(name)s; + snprintf(symboln, sizeof(symboln), "%%s%(entry_point)s", symbol_prefix); #ifdef _WIN32 *procp = GetProcAddress(handle, symboln); #else *procp = dlsym(handle, symboln); #endif } - __glapi_gentable_set_remaining_noop(disp); - - return disp; -} """ - class PrintCode(gl_XML.gl_print_base): def __init__(self): @@ -183,33 +180,12 @@ class PrintCode(gl_XML.gl_print_base): def printBody(self, api): + for f in api.functionIterateByOffset(): + for entry_point in f.entry_points: + vars = { 'entry_point' : entry_point, + 'name' : f.name } - # Determine how many functions have a defined offset. - func_count = 0 - for f in api.functions_by_name.itervalues(): - if f.offset != -1: - func_count += 1 - - # Build the mapping from offset to function name. - funcnames = [None] * func_count - for f in api.functions_by_name.itervalues(): - if f.offset != -1: - if not (funcnames[f.offset] is None): - raise Exception("Function table has more than one function with same offset (offset %d, func %s)" % (f.offset, f.name)) - funcnames[f.offset] = f.name - - # Check that the table has no gaps. We expect a function at every offset, - # and the code which generates the table relies on this. - for i in xrange(0, func_count): - if funcnames[i] is None: - raise Exception("Function table has no function at offset %d" % (i)) - - print "#define GLAPI_TABLE_COUNT %d" % func_count - print "static const char * const _glapi_table_func_names[GLAPI_TABLE_COUNT] = {" - for i in xrange(0, func_count): - print " /* %5d */ \"%s\"," % (i, funcnames[i]) - print "};" - + print body_template % vars return 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 43c9135d2..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. 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..cf42371f8 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. @@ -143,6 +144,12 @@ class PrintGenericStubs(gl_XML.gl_print_base): print '' print '#ifdef GLX_USE_TLS' print '' + print '\t.globl _x86_64_get_get_dispatch; HIDDEN(_x86_64_get_get_dispatch)' + print '_x86_64_get_get_dispatch:' + print '\tlea\t_x86_64_get_dispatch(%rip), %rax' + print '\tret' + print '' + print '\t.p2align\t4,,15' print '_x86_64_get_dispatch:' print '\tmovq\t_glapi_tls_Dispatch@GOTTPOFF(%rip), %rax' print '\tmovq\t%fs:(%rax), %rax' 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/remap_helper.py b/lib/mesa/src/mapi/glapi/gen/remap_helper.py index de759d6c0..edc6c3e14 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. @@ -120,6 +121,48 @@ class PrintGlRemap(gl_XML.gl_print_base): print ' { -1, -1 }' print '};' print '' + + # collect functions by versions/extensions + extension_functions = {} + abi_extensions = [] + for f in api.functionIterateAll(): + for n in f.entry_points: + category, num = api.get_category_for_name(n) + # consider only GL_VERSION_X_Y or extensions + c = gl_XML.real_category_name(category) + if c.startswith("GL_"): + if not extension_functions.has_key(c): + extension_functions[c] = [] + extension_functions[c].append(f) + # remember the ext names of the ABI + if (f.is_abi() and n == f.name and + c not in abi_extensions): + abi_extensions.append(c) + # ignore the ABI itself + for ext in abi_extensions: + extension_functions.pop(ext) + + extensions = extension_functions.keys() + extensions.sort() + + # output ABI functions that have alternative names (with ext suffix) + print '/* these functions are in the ABI, but have alternative names */' + print 'static const struct gl_function_remap MESA_alt_functions[] = {' + for ext in extensions: + funcs = [] + for f in extension_functions[ext]: + # test if the function is in the ABI and has alt names + if f.is_abi() and len(f.entry_points) > 1: + funcs.append(f) + if not funcs: + continue + print ' /* from %s */' % ext + for f in funcs: + print ' { %5d, _gloffset_%s },' \ + % (pool_indices[f], f.name) + print ' { -1, -1 }' + print '};' + print '' return diff --git a/lib/mesa/src/mapi/glapi/gen/static_data.py b/lib/mesa/src/mapi/glapi/gen/static_data.py index 7a8933b8d..142c503b0 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 # @@ -435,1303 +436,1240 @@ offsets = { } functions = [ - "Accum", - "ActiveShaderProgram", - "ActiveTexture", - "ActiveTextureARB", - "AlphaFunc", - "AlphaFuncx", - "AreTexturesResident", - "AreTexturesResidentEXT", - "ArrayElement", - "ArrayElementEXT", - "AttachObjectARB", - "AttachShader", - "Begin", - "BeginConditionalRender", - "BeginConditionalRenderNV", - "BeginQuery", - "BeginQueryARB", - "BeginQueryIndexed", - "BeginTransformFeedback", - "BindAttribLocation", - "BindAttribLocationARB", - "BindBuffer", - "BindBufferARB", - "BindBufferBase", - "BindBufferRange", - "BindBuffersBase", - "BindBuffersRange", - "BindFragDataLocation", - "BindFragDataLocationEXT", - "BindFragDataLocationIndexed", - "BindFramebuffer", - "BindFramebufferEXT", - "BindImageTexture", - "BindImageTextures", - "BindProgramARB", - "BindProgramPipeline", - "BindRenderbuffer", - "BindRenderbufferEXT", - "BindSampler", - "BindSamplers", - "BindTexture", - "BindTextureEXT", - "BindTextures", - "BindTransformFeedback", - "BindVertexArray", - "BindVertexBuffer", - "BindVertexBuffers", - "Bitmap", - "BlendBarrier", - "BlendColor", - "BlendColorEXT", - "BlendEquation", - "BlendEquationEXT", - "BlendEquationi", - "BlendEquationiARB", - "BlendEquationSeparate", - "BlendEquationSeparatei", - "BlendEquationSeparateiARB", - "BlendFunc", - "BlendFunci", - "BlendFunciARB", - "BlendFuncSeparate", - "BlendFuncSeparateEXT", - "BlendFuncSeparatei", - "BlendFuncSeparateiARB", - "BlitFramebuffer", - "BufferData", - "BufferDataARB", - "BufferStorage", - "BufferSubData", - "BufferSubDataARB", - "CallList", - "CallLists", - "CheckFramebufferStatus", - "CheckFramebufferStatusEXT", - "ClampColor", - "ClampColorARB", - "Clear", - "ClearAccum", - "ClearBufferData", - "ClearBufferfi", - "ClearBufferfv", - "ClearBufferiv", - "ClearBufferSubData", - "ClearBufferuiv", - "ClearColor", - "ClearColorIiEXT", - "ClearColorIuiEXT", - "ClearColorx", - "ClearDepth", - "ClearDepthf", - "ClearDepthx", - "ClearIndex", - "ClearStencil", - "ClearTexImage", - "ClearTexSubImage", - "ClientActiveTexture", - "ClientActiveTextureARB", - "ClientWaitSync", - "ClipPlane", - "ClipPlanef", - "ClipPlanex", - "Color3b", - "Color3bv", - "Color3d", - "Color3dv", - "Color3f", - "Color3fv", - "Color3i", - "Color3iv", - "Color3s", - "Color3sv", - "Color3ub", - "Color3ubv", - "Color3ui", - "Color3uiv", - "Color3us", - "Color3usv", - "Color4b", - "Color4bv", - "Color4d", - "Color4dv", - "Color4f", - "Color4fv", - "Color4i", - "Color4iv", - "Color4s", - "Color4sv", - "Color4ub", - "Color4ubv", - "Color4ui", - "Color4uiv", - "Color4us", - "Color4usv", - "Color4x", - "ColorMask", - "ColorMaski", - "ColorMaskIndexedEXT", - "ColorMaterial", - "ColorP3ui", - "ColorP3uiv", - "ColorP4ui", - "ColorP4uiv", - "ColorPointer", - "ColorPointerEXT", - "ColorSubTable", - "ColorTable", - "ColorTableParameterfv", - "ColorTableParameteriv", - "CompileShader", - "CompileShaderARB", - "CompressedTexImage1D", - "CompressedTexImage1DARB", - "CompressedTexImage2D", - "CompressedTexImage2DARB", - "CompressedTexImage3D", - "CompressedTexImage3DARB", - "CompressedTexSubImage1D", - "CompressedTexSubImage1DARB", - "CompressedTexSubImage2D", - "CompressedTexSubImage2DARB", - "CompressedTexSubImage3D", - "CompressedTexSubImage3DARB", - "ConvolutionFilter1D", - "ConvolutionFilter2D", - "ConvolutionParameterf", - "ConvolutionParameterfv", - "ConvolutionParameteri", - "ConvolutionParameteriv", - "CopyBufferSubData", - "CopyColorSubTable", - "CopyColorTable", - "CopyConvolutionFilter1D", - "CopyConvolutionFilter2D", - "CopyImageSubData", - "CopyPixels", - "CopyTexImage1D", - "CopyTexImage2D", - "CopyTexSubImage1D", - "CopyTexSubImage2D", - "CopyTexSubImage3D", - "CopyTexSubImage3DEXT", - "CreateProgram", - "CreateProgramObjectARB", - "CreateShader", - "CreateShaderObjectARB", - "CreateShaderProgramv", - "CullFace", - "DebugMessageCallback", - "DebugMessageCallbackARB", - "DebugMessageControl", - "DebugMessageControlARB", - "DebugMessageInsert", - "DebugMessageInsertARB", - "DeleteBuffers", - "DeleteBuffersARB", - "DeleteFramebuffers", - "DeleteFramebuffersEXT", - "DeleteLists", - "DeleteObjectARB", - "DeleteProgram", - "DeleteProgramPipelines", - "DeleteProgramsARB", - "DeleteQueries", - "DeleteQueriesARB", - "DeleteRenderbuffers", - "DeleteRenderbuffersEXT", - "DeleteSamplers", - "DeleteShader", - "DeleteSync", - "DeleteTextures", - "DeleteTexturesEXT", - "DeleteTransformFeedbacks", - "DeleteVertexArrays", - "DepthFunc", - "DepthMask", - "DepthRange", - "DepthRangeArrayv", - "DepthRangef", - "DepthRangeIndexed", - "DepthRangex", - "DetachObjectARB", - "DetachShader", - "Disable", - "DisableClientState", - "Disablei", - "DisableIndexedEXT", - "DisableVertexAttribArray", - "DisableVertexAttribArrayARB", - "DispatchCompute", - "DispatchComputeIndirect", - "DrawArrays", - "DrawArraysEXT", - "DrawArraysIndirect", - "DrawArraysInstanced", - "DrawArraysInstancedARB", - "DrawArraysInstancedBaseInstance", - "DrawArraysInstancedEXT", - "DrawBuffer", - "DrawBuffers", - "DrawBuffersARB", - "DrawBuffersATI", - "DrawElements", - "DrawElementsBaseVertex", - "DrawElementsIndirect", - "DrawElementsInstanced", - "DrawElementsInstancedARB", - "DrawElementsInstancedBaseInstance", - "DrawElementsInstancedBaseVertex", - "DrawElementsInstancedBaseVertexBaseInstance", - "DrawElementsInstancedEXT", - "DrawPixels", - "DrawRangeElements", - "DrawRangeElementsBaseVertex", - "DrawRangeElementsEXT", - "DrawTransformFeedback", - "DrawTransformFeedbackInstanced", - "DrawTransformFeedbackStream", - "DrawTransformFeedbackStreamInstanced", - "EdgeFlag", - "EdgeFlagPointer", - "EdgeFlagPointerEXT", - "EdgeFlagv", - "Enable", - "EnableClientState", - "Enablei", - "EnableIndexedEXT", - "EnableVertexAttribArray", - "EnableVertexAttribArrayARB", - "End", - "EndConditionalRender", - "EndConditionalRenderNV", - "EndList", - "EndQuery", - "EndQueryARB", - "EndQueryIndexed", - "EndTransformFeedback", - "EvalCoord1d", - "EvalCoord1dv", - "EvalCoord1f", - "EvalCoord1fv", - "EvalCoord2d", - "EvalCoord2dv", - "EvalCoord2f", - "EvalCoord2fv", - "EvalMesh1", - "EvalMesh2", - "EvalPoint1", - "EvalPoint2", - "FeedbackBuffer", - "FenceSync", - "Finish", - "Flush", - "FlushMappedBufferRange", - "FogCoordd", - "FogCoorddEXT", - "FogCoorddv", - "FogCoorddvEXT", - "FogCoordf", - "FogCoordfEXT", - "FogCoordfv", - "FogCoordfvEXT", - "FogCoordPointer", - "FogCoordPointerEXT", - "Fogf", - "Fogfv", - "Fogi", - "Fogiv", - "Fogx", - "Fogxv", - "FramebufferParameteri", - "FramebufferRenderbuffer", - "FramebufferRenderbufferEXT", - "FramebufferTexture", - "FramebufferTexture1D", - "FramebufferTexture1DEXT", - "FramebufferTexture2D", - "FramebufferTexture2DEXT", - "FramebufferTexture3D", - "FramebufferTexture3DEXT", - "FramebufferTextureARB", - "FramebufferTextureLayer", - "FramebufferTextureLayerARB", - "FramebufferTextureLayerEXT", - "FrontFace", - "Frustum", - "Frustumf", - "Frustumx", - "GenBuffers", - "GenBuffersARB", - "GenerateMipmap", - "GenerateMipmapEXT", - "GenFramebuffers", - "GenFramebuffersEXT", - "GenLists", - "GenProgramPipelines", - "GenProgramsARB", - "GenQueries", - "GenQueriesARB", - "GenRenderbuffers", - "GenRenderbuffersEXT", - "GenSamplers", - "GenTextures", - "GenTexturesEXT", - "GenTransformFeedbacks", - "GenVertexArrays", - "GetActiveAtomicCounterBufferiv", - "GetActiveAttrib", - "GetActiveAttribARB", - "GetActiveUniform", - "GetActiveUniformARB", - "GetActiveUniformBlockiv", - "GetActiveUniformBlockName", - "GetActiveUniformName", - "GetActiveUniformsiv", - "GetAttachedObjectsARB", - "GetAttachedShaders", - "GetAttribLocation", - "GetAttribLocationARB", - "GetBooleani_v", - "GetBooleanIndexedvEXT", - "GetBooleanv", - "GetBufferParameteri64v", - "GetBufferParameteriv", - "GetBufferParameterivARB", - "GetBufferPointerv", - "GetBufferPointervARB", - "GetBufferSubData", - "GetBufferSubDataARB", - "GetClipPlane", - "GetClipPlanef", - "GetClipPlanex", - "GetColorTable", - "GetColorTableParameterfv", - "GetColorTableParameteriv", - "GetCompressedTexImage", - "GetCompressedTexImageARB", - "GetConvolutionFilter", - "GetConvolutionParameterfv", - "GetConvolutionParameteriv", - "GetDebugMessageLog", - "GetDebugMessageLogARB", - "GetDoublei_v", - "GetDoublev", - "GetError", - "GetFixedv", - "GetFloati_v", - "GetFloatv", - "GetFragDataIndex", - "GetFragDataLocation", - "GetFragDataLocationEXT", - "GetFramebufferAttachmentParameteriv", - "GetFramebufferAttachmentParameterivEXT", - "GetFramebufferParameteriv", - "GetGraphicsResetStatus", - "GetGraphicsResetStatusARB", - "GetHandleARB", - "GetHistogram", - "GetHistogramParameterfv", - "GetHistogramParameteriv", - "GetInfoLogARB", - "GetInteger64i_v", - "GetInteger64v", - "GetIntegeri_v", - "GetIntegerIndexedvEXT", - "GetIntegerv", - "GetLightfv", - "GetLightiv", - "GetLightxv", - "GetMapdv", - "GetMapfv", - "GetMapiv", - "GetMaterialfv", - "GetMaterialiv", - "GetMaterialxv", - "GetMinmax", - "GetMinmaxParameterfv", - "GetMinmaxParameteriv", - "GetMultisamplefv", - "GetnColorTableARB", - "GetnCompressedTexImageARB", - "GetnConvolutionFilterARB", - "GetnHistogramARB", - "GetnMapdvARB", - "GetnMapfvARB", - "GetnMapivARB", - "GetnMinmaxARB", - "GetnPixelMapfvARB", - "GetnPixelMapuivARB", - "GetnPixelMapusvARB", - "GetnPolygonStippleARB", - "GetnSeparableFilterARB", - "GetnTexImageARB", - "GetnUniformdvARB", - "GetnUniformfv", - "GetnUniformfvARB", - "GetnUniformiv", - "GetnUniformivARB", - "GetnUniformuiv", - "GetnUniformuivARB", - "GetObjectLabel", - "GetObjectParameterfvARB", - "GetObjectParameterivARB", - "GetObjectPtrLabel", - "GetPixelMapfv", - "GetPixelMapuiv", - "GetPixelMapusv", - "GetPointerv", - "GetPointervEXT", - "GetPolygonStipple", - "GetProgramBinary", - "GetProgramEnvParameterdvARB", - "GetProgramEnvParameterfvARB", - "GetProgramInfoLog", - "GetProgramInterfaceiv", - "GetProgramiv", - "GetProgramivARB", - "GetProgramLocalParameterdvARB", - "GetProgramLocalParameterfvARB", - "GetProgramPipelineInfoLog", - "GetProgramPipelineiv", - "GetProgramResourceIndex", - "GetProgramResourceiv", - "GetProgramResourceLocation", - "GetProgramResourceName", - "GetProgramStringARB", - "GetQueryIndexediv", - "GetQueryiv", - "GetQueryivARB", - "GetQueryObjectiv", - "GetQueryObjectivARB", - "GetQueryObjectuiv", - "GetQueryObjectuivARB", - "GetRenderbufferParameteriv", - "GetRenderbufferParameterivEXT", - "GetSamplerParameterfv", - "GetSamplerParameterIiv", - "GetSamplerParameterIuiv", - "GetSamplerParameteriv", - "GetSeparableFilter", - "GetShaderInfoLog", - "GetShaderiv", - "GetShaderPrecisionFormat", - "GetShaderSource", - "GetShaderSourceARB", - "GetString", - "GetStringi", - "GetSynciv", - "GetTexEnvfv", - "GetTexEnviv", - "GetTexEnvxv", - "GetTexGendv", - "GetTexGenfv", - "GetTexGeniv", - "GetTexImage", - "GetTexLevelParameterfv", - "GetTexLevelParameteriv", - "GetTexParameterfv", - "GetTexParameterIiv", - "GetTexParameterIivEXT", - "GetTexParameterIuiv", - "GetTexParameterIuivEXT", - "GetTexParameteriv", - "GetTexParameterxv", - "GetTransformFeedbackVarying", - "GetUniformBlockIndex", - "GetUniformfv", - "GetUniformfvARB", - "GetUniformIndices", - "GetUniformiv", - "GetUniformivARB", - "GetUniformLocation", - "GetUniformLocationARB", - "GetUniformuiv", - "GetUniformuivEXT", - "GetVertexAttribdv", - "GetVertexAttribdvARB", - "GetVertexAttribfv", - "GetVertexAttribfvARB", - "GetVertexAttribIiv", - "GetVertexAttribIivEXT", - "GetVertexAttribIuiv", - "GetVertexAttribIuivEXT", - "GetVertexAttribiv", - "GetVertexAttribivARB", - "GetVertexAttribPointerv", - "GetVertexAttribPointervARB", - "Hint", - "Histogram", - "Indexd", - "Indexdv", - "Indexf", - "Indexfv", - "Indexi", - "Indexiv", - "IndexMask", - "IndexPointer", - "IndexPointerEXT", - "Indexs", - "Indexsv", - "Indexub", - "Indexubv", - "InitNames", - "InterleavedArrays", - "InvalidateBufferData", - "InvalidateBufferSubData", - "InvalidateFramebuffer", - "InvalidateSubFramebuffer", - "InvalidateTexImage", - "InvalidateTexSubImage", - "IsBuffer", - "IsBufferARB", - "IsEnabled", - "IsEnabledi", - "IsEnabledIndexedEXT", - "IsFramebuffer", - "IsFramebufferEXT", - "IsList", - "IsProgram", - "IsProgramARB", - "IsProgramPipeline", - "IsQuery", - "IsQueryARB", - "IsRenderbuffer", - "IsRenderbufferEXT", - "IsSampler", - "IsShader", - "IsSync", - "IsTexture", - "IsTextureEXT", - "IsTransformFeedback", - "IsVertexArray", - "Lightf", - "Lightfv", - "Lighti", - "Lightiv", - "LightModelf", - "LightModelfv", - "LightModeli", - "LightModeliv", - "LightModelx", - "LightModelxv", - "Lightx", - "Lightxv", - "LineStipple", - "LineWidth", - "LineWidthx", - "LinkProgram", - "LinkProgramARB", - "ListBase", - "LoadIdentity", - "LoadMatrixd", - "LoadMatrixf", - "LoadMatrixx", - "LoadName", - "LoadTransposeMatrixd", - "LoadTransposeMatrixdARB", - "LoadTransposeMatrixf", - "LoadTransposeMatrixfARB", - "LockArraysEXT", - "LogicOp", - "Map1d", - "Map1f", - "Map2d", - "Map2f", - "MapBuffer", - "MapBufferARB", - "MapBufferRange", - "MapGrid1d", - "MapGrid1f", - "MapGrid2d", - "MapGrid2f", - "Materialf", - "Materialfv", - "Materiali", - "Materialiv", - "Materialx", - "Materialxv", - "MatrixMode", - "MemoryBarrier", - "MemoryBarrierByRegion", - "Minmax", - "MinSampleShading", - "MinSampleShadingARB", - "MultiDrawArrays", - "MultiDrawArraysEXT", - "MultiDrawArraysIndirect", - "MultiDrawElements", - "MultiDrawElementsBaseVertex", - "MultiDrawElementsEXT", - "MultiDrawElementsIndirect", - "MultiTexCoord1d", - "MultiTexCoord1dARB", - "MultiTexCoord1dv", - "MultiTexCoord1dvARB", - "MultiTexCoord1f", - "MultiTexCoord1fARB", - "MultiTexCoord1fv", - "MultiTexCoord1fvARB", - "MultiTexCoord1i", - "MultiTexCoord1iARB", - "MultiTexCoord1iv", - "MultiTexCoord1ivARB", - "MultiTexCoord1s", - "MultiTexCoord1sARB", - "MultiTexCoord1sv", - "MultiTexCoord1svARB", - "MultiTexCoord2d", - "MultiTexCoord2dARB", - "MultiTexCoord2dv", - "MultiTexCoord2dvARB", - "MultiTexCoord2f", - "MultiTexCoord2fARB", - "MultiTexCoord2fv", - "MultiTexCoord2fvARB", - "MultiTexCoord2i", - "MultiTexCoord2iARB", - "MultiTexCoord2iv", - "MultiTexCoord2ivARB", - "MultiTexCoord2s", - "MultiTexCoord2sARB", - "MultiTexCoord2sv", - "MultiTexCoord2svARB", - "MultiTexCoord3d", - "MultiTexCoord3dARB", - "MultiTexCoord3dv", - "MultiTexCoord3dvARB", - "MultiTexCoord3f", - "MultiTexCoord3fARB", - "MultiTexCoord3fv", - "MultiTexCoord3fvARB", - "MultiTexCoord3i", - "MultiTexCoord3iARB", - "MultiTexCoord3iv", - "MultiTexCoord3ivARB", - "MultiTexCoord3s", - "MultiTexCoord3sARB", - "MultiTexCoord3sv", - "MultiTexCoord3svARB", - "MultiTexCoord4d", - "MultiTexCoord4dARB", - "MultiTexCoord4dv", - "MultiTexCoord4dvARB", - "MultiTexCoord4f", - "MultiTexCoord4fARB", - "MultiTexCoord4fv", - "MultiTexCoord4fvARB", - "MultiTexCoord4i", - "MultiTexCoord4iARB", - "MultiTexCoord4iv", - "MultiTexCoord4ivARB", - "MultiTexCoord4s", - "MultiTexCoord4sARB", - "MultiTexCoord4sv", - "MultiTexCoord4svARB", - "MultiTexCoord4x", - "MultiTexCoordP1ui", - "MultiTexCoordP1uiv", - "MultiTexCoordP2ui", - "MultiTexCoordP2uiv", - "MultiTexCoordP3ui", - "MultiTexCoordP3uiv", - "MultiTexCoordP4ui", - "MultiTexCoordP4uiv", - "MultMatrixd", - "MultMatrixf", - "MultMatrixx", - "MultTransposeMatrixd", - "MultTransposeMatrixdARB", - "MultTransposeMatrixf", - "MultTransposeMatrixfARB", - "NewList", - "Normal3b", - "Normal3bv", - "Normal3d", - "Normal3dv", - "Normal3f", - "Normal3fv", - "Normal3i", - "Normal3iv", - "Normal3s", - "Normal3sv", - "Normal3x", - "NormalP3ui", - "NormalP3uiv", - "NormalPointer", - "NormalPointerEXT", - "ObjectLabel", - "ObjectPtrLabel", - "Ortho", - "Orthof", - "Orthox", - "PassThrough", - "PatchParameteri", - "PauseTransformFeedback", - "PixelMapfv", - "PixelMapuiv", - "PixelMapusv", - "PixelStoref", - "PixelStorei", - "PixelTransferf", - "PixelTransferi", - "PixelZoom", - "PointParameterf", - "PointParameterfARB", - "PointParameterfEXT", - "PointParameterfv", - "PointParameterfvARB", - "PointParameterfvEXT", - "PointParameteri", - "PointParameteriv", - "PointParameterx", - "PointParameterxv", - "PointSize", - "PointSizePointerOES", - "PointSizex", - "PolygonMode", - "PolygonOffset", - "PolygonOffsetx", - "PolygonStipple", - "PopAttrib", - "PopClientAttrib", - "PopDebugGroup", - "PopMatrix", - "PopName", - "PrimitiveBoundingBox", - "PrimitiveRestartIndex", - "PrimitiveRestartIndexNV", - "PrimitiveRestartNV", - "PrioritizeTextures", - "PrioritizeTexturesEXT", - "ProgramBinary", - "ProgramEnvParameter4dARB", - "ProgramEnvParameter4dvARB", - "ProgramEnvParameter4fARB", - "ProgramEnvParameter4fvARB", - "ProgramLocalParameter4dARB", - "ProgramLocalParameter4dvARB", - "ProgramLocalParameter4fARB", - "ProgramLocalParameter4fvARB", - "ProgramParameteri", - "ProgramParameteriARB", - "ProgramStringARB", - "ProgramUniform1f", - "ProgramUniform1fv", - "ProgramUniform1i", - "ProgramUniform1iv", - "ProgramUniform1ui", - "ProgramUniform1uiv", - "ProgramUniform2f", - "ProgramUniform2fv", - "ProgramUniform2i", - "ProgramUniform2iv", - "ProgramUniform2ui", - "ProgramUniform2uiv", - "ProgramUniform3f", - "ProgramUniform3fv", - "ProgramUniform3i", - "ProgramUniform3iv", - "ProgramUniform3ui", - "ProgramUniform3uiv", - "ProgramUniform4f", - "ProgramUniform4fv", - "ProgramUniform4i", - "ProgramUniform4iv", - "ProgramUniform4ui", - "ProgramUniform4uiv", - "ProgramUniformMatrix2fv", - "ProgramUniformMatrix2x3fv", - "ProgramUniformMatrix2x4fv", - "ProgramUniformMatrix3fv", - "ProgramUniformMatrix3x2fv", - "ProgramUniformMatrix3x4fv", - "ProgramUniformMatrix4fv", - "ProgramUniformMatrix4x2fv", - "ProgramUniformMatrix4x3fv", - "ProvokingVertex", - "ProvokingVertexEXT", - "PushAttrib", - "PushClientAttrib", - "PushDebugGroup", - "PushMatrix", - "PushName", - "RasterPos2d", - "RasterPos2dv", - "RasterPos2f", - "RasterPos2fv", - "RasterPos2i", - "RasterPos2iv", - "RasterPos2s", - "RasterPos2sv", - "RasterPos3d", - "RasterPos3dv", - "RasterPos3f", - "RasterPos3fv", - "RasterPos3i", - "RasterPos3iv", - "RasterPos3s", - "RasterPos3sv", - "RasterPos4d", - "RasterPos4dv", - "RasterPos4f", - "RasterPos4fv", - "RasterPos4i", - "RasterPos4iv", - "RasterPos4s", - "RasterPos4sv", - "ReadBuffer", - "ReadnPixels", - "ReadnPixelsARB", - "ReadPixels", - "Rectd", - "Rectdv", - "Rectf", - "Rectfv", - "Recti", - "Rectiv", - "Rects", - "Rectsv", - "ReleaseShaderCompiler", - "RenderbufferStorage", - "RenderbufferStorageEXT", - "RenderbufferStorageMultisample", - "RenderbufferStorageMultisampleEXT", - "RenderMode", - "ResetHistogram", - "ResetMinmax", - "ResumeTransformFeedback", - "Rotated", - "Rotatef", - "Rotatex", - "SampleCoverage", - "SampleCoverageARB", - "SampleCoveragex", - "SampleMaski", - "SamplerParameterf", - "SamplerParameterfv", - "SamplerParameteri", - "SamplerParameterIiv", - "SamplerParameterIuiv", - "SamplerParameteriv", - "Scaled", - "Scalef", - "Scalex", - "Scissor", - "ScissorArrayv", - "ScissorIndexed", - "ScissorIndexedv", - "SecondaryColor3b", - "SecondaryColor3bEXT", - "SecondaryColor3bv", - "SecondaryColor3bvEXT", - "SecondaryColor3d", - "SecondaryColor3dEXT", - "SecondaryColor3dv", - "SecondaryColor3dvEXT", - "SecondaryColor3f", - "SecondaryColor3fEXT", - "SecondaryColor3fv", - "SecondaryColor3fvEXT", - "SecondaryColor3i", - "SecondaryColor3iEXT", - "SecondaryColor3iv", - "SecondaryColor3ivEXT", - "SecondaryColor3s", - "SecondaryColor3sEXT", - "SecondaryColor3sv", - "SecondaryColor3svEXT", - "SecondaryColor3ub", - "SecondaryColor3ubEXT", - "SecondaryColor3ubv", - "SecondaryColor3ubvEXT", - "SecondaryColor3ui", - "SecondaryColor3uiEXT", - "SecondaryColor3uiv", - "SecondaryColor3uivEXT", - "SecondaryColor3us", - "SecondaryColor3usEXT", - "SecondaryColor3usv", - "SecondaryColor3usvEXT", - "SecondaryColorP3ui", - "SecondaryColorP3uiv", - "SecondaryColorPointer", - "SecondaryColorPointerEXT", - "SelectBuffer", - "SeparableFilter2D", - "ShadeModel", - "ShaderBinary", - "ShaderSource", - "ShaderSourceARB", - "StencilFunc", - "StencilFuncSeparate", - "StencilMask", - "StencilMaskSeparate", - "StencilOp", - "StencilOpSeparate", - "TexBuffer", - "TexBufferARB", - "TexBufferRange", - "TexCoord1d", - "TexCoord1dv", - "TexCoord1f", - "TexCoord1fv", - "TexCoord1i", - "TexCoord1iv", - "TexCoord1s", - "TexCoord1sv", - "TexCoord2d", - "TexCoord2dv", - "TexCoord2f", - "TexCoord2fv", - "TexCoord2i", - "TexCoord2iv", - "TexCoord2s", - "TexCoord2sv", - "TexCoord3d", - "TexCoord3dv", - "TexCoord3f", - "TexCoord3fv", - "TexCoord3i", - "TexCoord3iv", - "TexCoord3s", - "TexCoord3sv", - "TexCoord4d", - "TexCoord4dv", - "TexCoord4f", - "TexCoord4fv", - "TexCoord4i", - "TexCoord4iv", - "TexCoord4s", - "TexCoord4sv", - "TexCoordP1ui", - "TexCoordP1uiv", - "TexCoordP2ui", - "TexCoordP2uiv", - "TexCoordP3ui", - "TexCoordP3uiv", - "TexCoordP4ui", - "TexCoordP4uiv", - "TexCoordPointer", - "TexCoordPointerEXT", - "TexEnvf", - "TexEnvfv", - "TexEnvi", - "TexEnviv", - "TexEnvx", - "TexEnvxv", - "TexGend", - "TexGendv", - "TexGenf", - "TexGenfv", - "TexGeni", - "TexGeniv", - "TexImage1D", - "TexImage2D", - "TexImage2DMultisample", - "TexImage3D", - "TexImage3DEXT", - "TexImage3DMultisample", - "TexParameterf", - "TexParameterfv", - "TexParameteri", - "TexParameterIiv", - "TexParameterIivEXT", - "TexParameterIuiv", - "TexParameterIuivEXT", - "TexParameteriv", - "TexParameterx", - "TexParameterxv", - "TexStorage1D", - "TexStorage2D", - "TexStorage2DMultisample", - "TexStorage3D", - "TexStorage3DMultisample", - "TexSubImage1D", - "TexSubImage2D", - "TexSubImage3D", - "TexSubImage3DEXT", - "TextureBarrierNV", - "TextureStorage1DEXT", - "TextureStorage2DEXT", - "TextureStorage3DEXT", - "TextureView", - "TransformFeedbackVaryings", - "Translated", - "Translatef", - "Translatex", - "Uniform1f", - "Uniform1fARB", - "Uniform1fv", - "Uniform1fvARB", - "Uniform1i", - "Uniform1iARB", - "Uniform1iv", - "Uniform1ivARB", - "Uniform1ui", - "Uniform1uiEXT", - "Uniform1uiv", - "Uniform1uivEXT", - "Uniform2f", - "Uniform2fARB", - "Uniform2fv", - "Uniform2fvARB", - "Uniform2i", - "Uniform2iARB", - "Uniform2iv", - "Uniform2ivARB", - "Uniform2ui", - "Uniform2uiEXT", - "Uniform2uiv", - "Uniform2uivEXT", - "Uniform3f", - "Uniform3fARB", - "Uniform3fv", - "Uniform3fvARB", - "Uniform3i", - "Uniform3iARB", - "Uniform3iv", - "Uniform3ivARB", - "Uniform3ui", - "Uniform3uiEXT", - "Uniform3uiv", - "Uniform3uivEXT", - "Uniform4f", - "Uniform4fARB", - "Uniform4fv", - "Uniform4fvARB", - "Uniform4i", - "Uniform4iARB", - "Uniform4iv", - "Uniform4ivARB", - "Uniform4ui", - "Uniform4uiEXT", - "Uniform4uiv", - "Uniform4uivEXT", - "UniformBlockBinding", - "UniformMatrix2fv", - "UniformMatrix2fvARB", - "UniformMatrix2x3fv", - "UniformMatrix2x4fv", - "UniformMatrix3fv", - "UniformMatrix3fvARB", - "UniformMatrix3x2fv", - "UniformMatrix3x4fv", - "UniformMatrix4fv", - "UniformMatrix4fvARB", - "UniformMatrix4x2fv", - "UniformMatrix4x3fv", - "UnlockArraysEXT", - "UnmapBuffer", - "UnmapBufferARB", - "UseProgram", - "UseProgramObjectARB", - "UseProgramStages", - "ValidateProgram", - "ValidateProgramARB", - "ValidateProgramPipeline", - "Vertex2d", - "Vertex2dv", - "Vertex2f", - "Vertex2fv", - "Vertex2i", - "Vertex2iv", - "Vertex2s", - "Vertex2sv", - "Vertex3d", - "Vertex3dv", - "Vertex3f", - "Vertex3fv", - "Vertex3i", - "Vertex3iv", - "Vertex3s", - "Vertex3sv", - "Vertex4d", - "Vertex4dv", - "Vertex4f", - "Vertex4fv", - "Vertex4i", - "Vertex4iv", - "Vertex4s", - "Vertex4sv", - "VertexAttrib1d", - "VertexAttrib1dARB", - "VertexAttrib1dv", - "VertexAttrib1dvARB", - "VertexAttrib1f", - "VertexAttrib1fARB", - "VertexAttrib1fv", - "VertexAttrib1fvARB", - "VertexAttrib1s", - "VertexAttrib1sARB", - "VertexAttrib1sv", - "VertexAttrib1svARB", - "VertexAttrib2d", - "VertexAttrib2dARB", - "VertexAttrib2dv", - "VertexAttrib2dvARB", - "VertexAttrib2f", - "VertexAttrib2fARB", - "VertexAttrib2fv", - "VertexAttrib2fvARB", - "VertexAttrib2s", - "VertexAttrib2sARB", - "VertexAttrib2sv", - "VertexAttrib2svARB", - "VertexAttrib3d", - "VertexAttrib3dARB", - "VertexAttrib3dv", - "VertexAttrib3dvARB", - "VertexAttrib3f", - "VertexAttrib3fARB", - "VertexAttrib3fv", - "VertexAttrib3fvARB", - "VertexAttrib3s", - "VertexAttrib3sARB", - "VertexAttrib3sv", - "VertexAttrib3svARB", - "VertexAttrib4bv", - "VertexAttrib4bvARB", - "VertexAttrib4d", - "VertexAttrib4dARB", - "VertexAttrib4dv", - "VertexAttrib4dvARB", - "VertexAttrib4f", - "VertexAttrib4fARB", - "VertexAttrib4fv", - "VertexAttrib4fvARB", - "VertexAttrib4iv", - "VertexAttrib4ivARB", - "VertexAttrib4Nbv", - "VertexAttrib4NbvARB", - "VertexAttrib4Niv", - "VertexAttrib4NivARB", - "VertexAttrib4Nsv", - "VertexAttrib4NsvARB", - "VertexAttrib4Nub", - "VertexAttrib4NubARB", - "VertexAttrib4Nubv", - "VertexAttrib4NubvARB", - "VertexAttrib4Nuiv", - "VertexAttrib4NuivARB", - "VertexAttrib4Nusv", - "VertexAttrib4NusvARB", - "VertexAttrib4s", - "VertexAttrib4sARB", - "VertexAttrib4sv", - "VertexAttrib4svARB", - "VertexAttrib4ubv", - "VertexAttrib4ubvARB", - "VertexAttrib4uiv", - "VertexAttrib4uivARB", - "VertexAttrib4usv", - "VertexAttrib4usvARB", - "VertexAttribBinding", - "VertexAttribDivisor", - "VertexAttribDivisorARB", - "VertexAttribFormat", - "VertexAttribI1i", - "VertexAttribI1iEXT", - "VertexAttribI1iv", - "VertexAttribI1ivEXT", - "VertexAttribI1ui", - "VertexAttribI1uiEXT", - "VertexAttribI1uiv", - "VertexAttribI1uivEXT", - "VertexAttribI2i", - "VertexAttribI2iEXT", - "VertexAttribI2iv", - "VertexAttribI2ivEXT", - "VertexAttribI2ui", - "VertexAttribI2uiEXT", - "VertexAttribI2uiv", - "VertexAttribI2uivEXT", - "VertexAttribI3i", - "VertexAttribI3iEXT", - "VertexAttribI3iv", - "VertexAttribI3ivEXT", - "VertexAttribI3ui", - "VertexAttribI3uiEXT", - "VertexAttribI3uiv", - "VertexAttribI3uivEXT", - "VertexAttribI4bv", - "VertexAttribI4bvEXT", - "VertexAttribI4i", - "VertexAttribI4iEXT", - "VertexAttribI4iv", - "VertexAttribI4ivEXT", - "VertexAttribI4sv", - "VertexAttribI4svEXT", - "VertexAttribI4ubv", - "VertexAttribI4ubvEXT", - "VertexAttribI4ui", - "VertexAttribI4uiEXT", - "VertexAttribI4uiv", - "VertexAttribI4uivEXT", - "VertexAttribI4usv", - "VertexAttribI4usvEXT", - "VertexAttribIFormat", - "VertexAttribIPointer", - "VertexAttribIPointerEXT", - "VertexAttribLFormat", - "VertexAttribP1ui", - "VertexAttribP1uiv", - "VertexAttribP2ui", - "VertexAttribP2uiv", - "VertexAttribP3ui", - "VertexAttribP3uiv", - "VertexAttribP4ui", - "VertexAttribP4uiv", - "VertexAttribPointer", - "VertexAttribPointerARB", - "VertexBindingDivisor", - "VertexP2ui", - "VertexP2uiv", - "VertexP3ui", - "VertexP3uiv", - "VertexP4ui", - "VertexP4uiv", - "VertexPointer", - "VertexPointerEXT", - "Viewport", - "ViewportArrayv", - "ViewportIndexedf", - "ViewportIndexedfv", - "WaitSync", - "WindowPos2d", - "WindowPos2dARB", - "WindowPos2dv", - "WindowPos2dvARB", - "WindowPos2f", - "WindowPos2fARB", - "WindowPos2fv", - "WindowPos2fvARB", - "WindowPos2i", - "WindowPos2iARB", - "WindowPos2iv", - "WindowPos2ivARB", - "WindowPos2s", - "WindowPos2sARB", - "WindowPos2sv", - "WindowPos2svARB", - "WindowPos3d", - "WindowPos3dARB", - "WindowPos3dv", - "WindowPos3dvARB", - "WindowPos3f", - "WindowPos3fARB", - "WindowPos3fv", - "WindowPos3fvARB", - "WindowPos3i", - "WindowPos3iARB", - "WindowPos3iv", - "WindowPos3ivARB", - "WindowPos3s", - "WindowPos3sARB", - "WindowPos3sv", - "WindowPos3svARB", + "Accum", + "ActiveTexture", + "ActiveTextureARB", + "AlphaFunc", + "AlphaFuncx", + "AreTexturesResident", + "AreTexturesResidentEXT", + "ArrayElement", + "ArrayElementEXT", + "AttachObjectARB", + "AttachShader", + "Begin", + "BeginConditionalRender", + "BeginConditionalRenderNV", + "BeginQuery", + "BeginQueryARB", + "BeginQueryIndexed", + "BeginTransformFeedback", + "BindAttribLocation", + "BindAttribLocationARB", + "BindBuffer", + "BindBufferARB", + "BindBufferBase", + "BindBufferRange", + "BindBuffersBase", + "BindBuffersRange", + "BindFragDataLocation", + "BindFragDataLocationEXT", + "BindFragDataLocationIndexed", + "BindFramebuffer", + "BindFramebufferEXT", + "BindImageTexture", + "BindImageTextures", + "BindProgramARB", + "BindRenderbuffer", + "BindRenderbufferEXT", + "BindSampler", + "BindSamplers", + "BindTexture", + "BindTextureEXT", + "BindTextures", + "BindTransformFeedback", + "BindVertexArray", + "BindVertexBuffer", + "BindVertexBuffers", + "Bitmap", + "BlendColor", + "BlendColorEXT", + "BlendEquation", + "BlendEquationEXT", + "BlendEquationiARB", + "BlendEquationSeparate", + "BlendEquationSeparateiARB", + "BlendFunc", + "BlendFunciARB", + "BlendFuncSeparate", + "BlendFuncSeparateEXT", + "BlendFuncSeparateiARB", + "BlitFramebuffer", + "BufferData", + "BufferDataARB", + "BufferStorage", + "BufferSubData", + "BufferSubDataARB", + "CallList", + "CallLists", + "CheckFramebufferStatus", + "CheckFramebufferStatusEXT", + "ClampColor", + "ClampColorARB", + "Clear", + "ClearAccum", + "ClearBufferData", + "ClearBufferfi", + "ClearBufferfv", + "ClearBufferiv", + "ClearBufferSubData", + "ClearBufferuiv", + "ClearColor", + "ClearColorIiEXT", + "ClearColorIuiEXT", + "ClearColorx", + "ClearDepth", + "ClearDepthf", + "ClearDepthx", + "ClearIndex", + "ClearStencil", + "ClearTexImage", + "ClearTexSubImage", + "ClientActiveTexture", + "ClientActiveTextureARB", + "ClientWaitSync", + "ClipPlane", + "ClipPlanef", + "ClipPlanex", + "Color3b", + "Color3bv", + "Color3d", + "Color3dv", + "Color3f", + "Color3fv", + "Color3i", + "Color3iv", + "Color3s", + "Color3sv", + "Color3ub", + "Color3ubv", + "Color3ui", + "Color3uiv", + "Color3us", + "Color3usv", + "Color4b", + "Color4bv", + "Color4d", + "Color4dv", + "Color4f", + "Color4fv", + "Color4i", + "Color4iv", + "Color4s", + "Color4sv", + "Color4ub", + "Color4ubv", + "Color4ui", + "Color4uiv", + "Color4us", + "Color4usv", + "Color4x", + "ColorMask", + "ColorMaski", + "ColorMaskIndexedEXT", + "ColorMaterial", + "ColorP3ui", + "ColorP3uiv", + "ColorP4ui", + "ColorP4uiv", + "ColorPointer", + "ColorPointerEXT", + "ColorSubTable", + "ColorTable", + "ColorTableParameterfv", + "ColorTableParameteriv", + "CompileShader", + "CompileShaderARB", + "CompressedTexImage1D", + "CompressedTexImage1DARB", + "CompressedTexImage2D", + "CompressedTexImage2DARB", + "CompressedTexImage3D", + "CompressedTexImage3DARB", + "CompressedTexSubImage1D", + "CompressedTexSubImage1DARB", + "CompressedTexSubImage2D", + "CompressedTexSubImage2DARB", + "CompressedTexSubImage3D", + "CompressedTexSubImage3DARB", + "ConvolutionFilter1D", + "ConvolutionFilter2D", + "ConvolutionParameterf", + "ConvolutionParameterfv", + "ConvolutionParameteri", + "ConvolutionParameteriv", + "CopyBufferSubData", + "CopyColorSubTable", + "CopyColorTable", + "CopyConvolutionFilter1D", + "CopyConvolutionFilter2D", + "CopyImageSubData", + "CopyPixels", + "CopyTexImage1D", + "CopyTexImage2D", + "CopyTexSubImage1D", + "CopyTexSubImage2D", + "CopyTexSubImage3D", + "CopyTexSubImage3DEXT", + "CreateProgram", + "CreateProgramObjectARB", + "CreateShader", + "CreateShaderObjectARB", + "CullFace", + "DebugMessageCallback", + "DebugMessageCallbackARB", + "DebugMessageControl", + "DebugMessageControlARB", + "DebugMessageInsert", + "DebugMessageInsertARB", + "DeleteBuffers", + "DeleteBuffersARB", + "DeleteFramebuffers", + "DeleteFramebuffersEXT", + "DeleteLists", + "DeleteObjectARB", + "DeleteProgram", + "DeleteProgramsARB", + "DeleteQueries", + "DeleteQueriesARB", + "DeleteRenderbuffers", + "DeleteRenderbuffersEXT", + "DeleteSamplers", + "DeleteShader", + "DeleteSync", + "DeleteTextures", + "DeleteTexturesEXT", + "DeleteTransformFeedbacks", + "DeleteVertexArrays", + "DepthFunc", + "DepthMask", + "DepthRange", + "DepthRangeArrayv", + "DepthRangef", + "DepthRangeIndexed", + "DepthRangex", + "DetachObjectARB", + "DetachShader", + "Disable", + "DisableClientState", + "Disablei", + "DisableIndexedEXT", + "DisableVertexAttribArray", + "DisableVertexAttribArrayARB", + "DispatchCompute", + "DispatchComputeIndirect", + "DrawArrays", + "DrawArraysEXT", + "DrawArraysIndirect", + "DrawArraysInstanced", + "DrawArraysInstancedARB", + "DrawArraysInstancedBaseInstance", + "DrawArraysInstancedEXT", + "DrawBuffer", + "DrawBuffers", + "DrawBuffersARB", + "DrawBuffersATI", + "DrawElements", + "DrawElementsBaseVertex", + "DrawElementsIndirect", + "DrawElementsInstanced", + "DrawElementsInstancedARB", + "DrawElementsInstancedBaseInstance", + "DrawElementsInstancedBaseVertex", + "DrawElementsInstancedBaseVertexBaseInstance", + "DrawElementsInstancedEXT", + "DrawPixels", + "DrawRangeElements", + "DrawRangeElementsBaseVertex", + "DrawRangeElementsEXT", + "DrawTransformFeedback", + "DrawTransformFeedbackInstanced", + "DrawTransformFeedbackStream", + "DrawTransformFeedbackStreamInstanced", + "EdgeFlag", + "EdgeFlagPointer", + "EdgeFlagPointerEXT", + "EdgeFlagv", + "Enable", + "EnableClientState", + "Enablei", + "EnableIndexedEXT", + "EnableVertexAttribArray", + "EnableVertexAttribArrayARB", + "End", + "EndConditionalRender", + "EndConditionalRenderNV", + "EndList", + "EndQuery", + "EndQueryARB", + "EndQueryIndexed", + "EndTransformFeedback", + "EvalCoord1d", + "EvalCoord1dv", + "EvalCoord1f", + "EvalCoord1fv", + "EvalCoord2d", + "EvalCoord2dv", + "EvalCoord2f", + "EvalCoord2fv", + "EvalMesh1", + "EvalMesh2", + "EvalPoint1", + "EvalPoint2", + "FeedbackBuffer", + "FenceSync", + "Finish", + "Flush", + "FlushMappedBufferRange", + "FogCoordd", + "FogCoorddEXT", + "FogCoorddv", + "FogCoorddvEXT", + "FogCoordf", + "FogCoordfEXT", + "FogCoordfv", + "FogCoordfvEXT", + "FogCoordPointer", + "FogCoordPointerEXT", + "Fogf", + "Fogfv", + "Fogi", + "Fogiv", + "Fogx", + "Fogxv", + "FramebufferRenderbuffer", + "FramebufferRenderbufferEXT", + "FramebufferTexture", + "FramebufferTexture1D", + "FramebufferTexture1DEXT", + "FramebufferTexture2D", + "FramebufferTexture2DEXT", + "FramebufferTexture3D", + "FramebufferTexture3DEXT", + "FramebufferTextureARB", + "FramebufferTextureLayer", + "FramebufferTextureLayerARB", + "FramebufferTextureLayerEXT", + "FrontFace", + "Frustum", + "Frustumf", + "Frustumx", + "GenBuffers", + "GenBuffersARB", + "GenerateMipmap", + "GenerateMipmapEXT", + "GenFramebuffers", + "GenFramebuffersEXT", + "GenLists", + "GenProgramsARB", + "GenQueries", + "GenQueriesARB", + "GenRenderbuffers", + "GenRenderbuffersEXT", + "GenSamplers", + "GenTextures", + "GenTexturesEXT", + "GenTransformFeedbacks", + "GenVertexArrays", + "GetActiveAtomicCounterBufferiv", + "GetActiveAttrib", + "GetActiveAttribARB", + "GetActiveUniform", + "GetActiveUniformARB", + "GetActiveUniformBlockiv", + "GetActiveUniformBlockName", + "GetActiveUniformName", + "GetActiveUniformsiv", + "GetAttachedObjectsARB", + "GetAttachedShaders", + "GetAttribLocation", + "GetAttribLocationARB", + "GetBooleanIndexedvEXT", + "GetBooleani_v", + "GetBooleanv", + "GetBufferParameteri64v", + "GetBufferParameteriv", + "GetBufferParameterivARB", + "GetBufferPointerv", + "GetBufferPointervARB", + "GetBufferSubData", + "GetBufferSubDataARB", + "GetClipPlane", + "GetClipPlanef", + "GetClipPlanex", + "GetColorTable", + "GetColorTableParameterfv", + "GetColorTableParameteriv", + "GetCompressedTexImage", + "GetCompressedTexImageARB", + "GetConvolutionFilter", + "GetConvolutionParameterfv", + "GetConvolutionParameteriv", + "GetDebugMessageLog", + "GetDebugMessageLogARB", + "GetDoublei_v", + "GetDoublev", + "GetError", + "GetFixedv", + "GetFloati_v", + "GetFloatv", + "GetFragDataIndex", + "GetFragDataLocation", + "GetFragDataLocationEXT", + "GetFramebufferAttachmentParameteriv", + "GetFramebufferAttachmentParameterivEXT", + "GetGraphicsResetStatusARB", + "GetHandleARB", + "GetHistogram", + "GetHistogramParameterfv", + "GetHistogramParameteriv", + "GetInfoLogARB", + "GetInteger64i_v", + "GetInteger64v", + "GetIntegerIndexedvEXT", + "GetIntegeri_v", + "GetIntegerv", + "GetLightfv", + "GetLightiv", + "GetLightxv", + "GetMapdv", + "GetMapfv", + "GetMapiv", + "GetMaterialfv", + "GetMaterialiv", + "GetMaterialxv", + "GetMinmax", + "GetMinmaxParameterfv", + "GetMinmaxParameteriv", + "GetMultisamplefv", + "GetnColorTableARB", + "GetnCompressedTexImageARB", + "GetnConvolutionFilterARB", + "GetnHistogramARB", + "GetnMapdvARB", + "GetnMapfvARB", + "GetnMapivARB", + "GetnMinmaxARB", + "GetnPixelMapfvARB", + "GetnPixelMapuivARB", + "GetnPixelMapusvARB", + "GetnPolygonStippleARB", + "GetnSeparableFilterARB", + "GetnTexImageARB", + "GetnUniformdvARB", + "GetnUniformfvARB", + "GetnUniformivARB", + "GetnUniformuivARB", + "GetObjectLabel", + "GetObjectParameterfvARB", + "GetObjectParameterivARB", + "GetObjectPtrLabel", + "GetPixelMapfv", + "GetPixelMapuiv", + "GetPixelMapusv", + "GetPointerv", + "GetPointervEXT", + "GetPolygonStipple", + "GetProgramBinary", + "GetProgramEnvParameterdvARB", + "GetProgramEnvParameterfvARB", + "GetProgramInfoLog", + "GetProgramiv", + "GetProgramivARB", + "GetProgramLocalParameterdvARB", + "GetProgramLocalParameterfvARB", + "GetProgramStringARB", + "GetQueryIndexediv", + "GetQueryiv", + "GetQueryivARB", + "GetQueryObjectiv", + "GetQueryObjectivARB", + "GetQueryObjectuiv", + "GetQueryObjectuivARB", + "GetRenderbufferParameteriv", + "GetRenderbufferParameterivEXT", + "GetSamplerParameterfv", + "GetSamplerParameterIiv", + "GetSamplerParameterIuiv", + "GetSamplerParameteriv", + "GetSeparableFilter", + "GetShaderInfoLog", + "GetShaderiv", + "GetShaderPrecisionFormat", + "GetShaderSource", + "GetShaderSourceARB", + "GetString", + "GetStringi", + "GetSynciv", + "GetTexEnvfv", + "GetTexEnviv", + "GetTexEnvxv", + "GetTexGendv", + "GetTexGenfv", + "GetTexGeniv", + "GetTexImage", + "GetTexLevelParameterfv", + "GetTexLevelParameteriv", + "GetTexParameterfv", + "GetTexParameterIiv", + "GetTexParameterIivEXT", + "GetTexParameterIuiv", + "GetTexParameterIuivEXT", + "GetTexParameteriv", + "GetTexParameterxv", + "GetTransformFeedbackVarying", + "GetUniformBlockIndex", + "GetUniformfv", + "GetUniformfvARB", + "GetUniformIndices", + "GetUniformiv", + "GetUniformivARB", + "GetUniformLocation", + "GetUniformLocationARB", + "GetUniformuiv", + "GetUniformuivEXT", + "GetVertexAttribdv", + "GetVertexAttribdvARB", + "GetVertexAttribfv", + "GetVertexAttribfvARB", + "GetVertexAttribIiv", + "GetVertexAttribIivEXT", + "GetVertexAttribIuiv", + "GetVertexAttribIuivEXT", + "GetVertexAttribiv", + "GetVertexAttribivARB", + "GetVertexAttribPointerv", + "GetVertexAttribPointervARB", + "Hint", + "Histogram", + "Indexd", + "Indexdv", + "Indexf", + "Indexfv", + "Indexi", + "Indexiv", + "IndexMask", + "IndexPointer", + "IndexPointerEXT", + "Indexs", + "Indexsv", + "Indexub", + "Indexubv", + "InitNames", + "InterleavedArrays", + "InvalidateBufferData", + "InvalidateBufferSubData", + "InvalidateFramebuffer", + "InvalidateSubFramebuffer", + "InvalidateTexImage", + "InvalidateTexSubImage", + "IsBuffer", + "IsBufferARB", + "IsEnabled", + "IsEnabledi", + "IsEnabledIndexedEXT", + "IsFramebuffer", + "IsFramebufferEXT", + "IsList", + "IsProgram", + "IsProgramARB", + "IsQuery", + "IsQueryARB", + "IsRenderbuffer", + "IsRenderbufferEXT", + "IsSampler", + "IsShader", + "IsSync", + "IsTexture", + "IsTextureEXT", + "IsTransformFeedback", + "IsVertexArray", + "Lightf", + "Lightfv", + "Lighti", + "Lightiv", + "LightModelf", + "LightModelfv", + "LightModeli", + "LightModeliv", + "LightModelx", + "LightModelxv", + "Lightx", + "Lightxv", + "LineStipple", + "LineWidth", + "LineWidthx", + "LinkProgram", + "LinkProgramARB", + "ListBase", + "LoadIdentity", + "LoadMatrixd", + "LoadMatrixf", + "LoadMatrixx", + "LoadName", + "LoadTransposeMatrixd", + "LoadTransposeMatrixdARB", + "LoadTransposeMatrixf", + "LoadTransposeMatrixfARB", + "LockArraysEXT", + "LogicOp", + "Map1d", + "Map1f", + "Map2d", + "Map2f", + "MapBuffer", + "MapBufferARB", + "MapBufferRange", + "MapGrid1d", + "MapGrid1f", + "MapGrid2d", + "MapGrid2f", + "Materialf", + "Materialfv", + "Materiali", + "Materialiv", + "Materialx", + "Materialxv", + "MatrixMode", + "MemoryBarrier", + "Minmax", + "MinSampleShading", + "MinSampleShadingARB", + "MultiDrawArrays", + "MultiDrawArraysEXT", + "MultiDrawArraysIndirect", + "MultiDrawElements", + "MultiDrawElementsBaseVertex", + "MultiDrawElementsEXT", + "MultiDrawElementsIndirect", + "MultiTexCoord1d", + "MultiTexCoord1dARB", + "MultiTexCoord1dv", + "MultiTexCoord1dvARB", + "MultiTexCoord1f", + "MultiTexCoord1fARB", + "MultiTexCoord1fv", + "MultiTexCoord1fvARB", + "MultiTexCoord1i", + "MultiTexCoord1iARB", + "MultiTexCoord1iv", + "MultiTexCoord1ivARB", + "MultiTexCoord1s", + "MultiTexCoord1sARB", + "MultiTexCoord1sv", + "MultiTexCoord1svARB", + "MultiTexCoord2d", + "MultiTexCoord2dARB", + "MultiTexCoord2dv", + "MultiTexCoord2dvARB", + "MultiTexCoord2f", + "MultiTexCoord2fARB", + "MultiTexCoord2fv", + "MultiTexCoord2fvARB", + "MultiTexCoord2i", + "MultiTexCoord2iARB", + "MultiTexCoord2iv", + "MultiTexCoord2ivARB", + "MultiTexCoord2s", + "MultiTexCoord2sARB", + "MultiTexCoord2sv", + "MultiTexCoord2svARB", + "MultiTexCoord3d", + "MultiTexCoord3dARB", + "MultiTexCoord3dv", + "MultiTexCoord3dvARB", + "MultiTexCoord3f", + "MultiTexCoord3fARB", + "MultiTexCoord3fv", + "MultiTexCoord3fvARB", + "MultiTexCoord3i", + "MultiTexCoord3iARB", + "MultiTexCoord3iv", + "MultiTexCoord3ivARB", + "MultiTexCoord3s", + "MultiTexCoord3sARB", + "MultiTexCoord3sv", + "MultiTexCoord3svARB", + "MultiTexCoord4d", + "MultiTexCoord4dARB", + "MultiTexCoord4dv", + "MultiTexCoord4dvARB", + "MultiTexCoord4f", + "MultiTexCoord4fARB", + "MultiTexCoord4fv", + "MultiTexCoord4fvARB", + "MultiTexCoord4i", + "MultiTexCoord4iARB", + "MultiTexCoord4iv", + "MultiTexCoord4ivARB", + "MultiTexCoord4s", + "MultiTexCoord4sARB", + "MultiTexCoord4sv", + "MultiTexCoord4svARB", + "MultiTexCoord4x", + "MultiTexCoordP1ui", + "MultiTexCoordP1uiv", + "MultiTexCoordP2ui", + "MultiTexCoordP2uiv", + "MultiTexCoordP3ui", + "MultiTexCoordP3uiv", + "MultiTexCoordP4ui", + "MultiTexCoordP4uiv", + "MultMatrixd", + "MultMatrixf", + "MultMatrixx", + "MultTransposeMatrixd", + "MultTransposeMatrixdARB", + "MultTransposeMatrixf", + "MultTransposeMatrixfARB", + "NewList", + "Normal3b", + "Normal3bv", + "Normal3d", + "Normal3dv", + "Normal3f", + "Normal3fv", + "Normal3i", + "Normal3iv", + "Normal3s", + "Normal3sv", + "Normal3x", + "NormalP3ui", + "NormalP3uiv", + "NormalPointer", + "NormalPointerEXT", + "ObjectLabel", + "ObjectPtrLabel", + "Ortho", + "Orthof", + "Orthox", + "PassThrough", + "PauseTransformFeedback", + "PixelMapfv", + "PixelMapuiv", + "PixelMapusv", + "PixelStoref", + "PixelStorei", + "PixelTransferf", + "PixelTransferi", + "PixelZoom", + "PointParameterf", + "PointParameterfARB", + "PointParameterfEXT", + "PointParameterfv", + "PointParameterfvARB", + "PointParameterfvEXT", + "PointParameteri", + "PointParameteriv", + "PointParameterx", + "PointParameterxv", + "PointSize", + "PointSizePointerOES", + "PointSizex", + "PolygonMode", + "PolygonOffset", + "PolygonOffsetx", + "PolygonStipple", + "PopAttrib", + "PopClientAttrib", + "PopDebugGroup", + "PopMatrix", + "PopName", + "PrimitiveRestartIndex", + "PrimitiveRestartIndexNV", + "PrimitiveRestartNV", + "PrioritizeTextures", + "PrioritizeTexturesEXT", + "ProgramBinary", + "ProgramEnvParameter4dARB", + "ProgramEnvParameter4dvARB", + "ProgramEnvParameter4fARB", + "ProgramEnvParameter4fvARB", + "ProgramLocalParameter4dARB", + "ProgramLocalParameter4dvARB", + "ProgramLocalParameter4fARB", + "ProgramLocalParameter4fvARB", + "ProgramParameteri", + "ProgramParameteriARB", + "ProgramStringARB", + "ProvokingVertex", + "ProvokingVertexEXT", + "PushAttrib", + "PushClientAttrib", + "PushDebugGroup", + "PushMatrix", + "PushName", + "RasterPos2d", + "RasterPos2dv", + "RasterPos2f", + "RasterPos2fv", + "RasterPos2i", + "RasterPos2iv", + "RasterPos2s", + "RasterPos2sv", + "RasterPos3d", + "RasterPos3dv", + "RasterPos3f", + "RasterPos3fv", + "RasterPos3i", + "RasterPos3iv", + "RasterPos3s", + "RasterPos3sv", + "RasterPos4d", + "RasterPos4dv", + "RasterPos4f", + "RasterPos4fv", + "RasterPos4i", + "RasterPos4iv", + "RasterPos4s", + "RasterPos4sv", + "ReadBuffer", + "ReadnPixelsARB", + "ReadPixels", + "Rectd", + "Rectdv", + "Rectf", + "Rectfv", + "Recti", + "Rectiv", + "Rects", + "Rectsv", + "ReleaseShaderCompiler", + "RenderbufferStorage", + "RenderbufferStorageEXT", + "RenderbufferStorageMultisample", + "RenderbufferStorageMultisampleEXT", + "RenderMode", + "ResetHistogram", + "ResetMinmax", + "ResumeTransformFeedback", + "Rotated", + "Rotatef", + "Rotatex", + "SampleCoverage", + "SampleCoverageARB", + "SampleCoveragex", + "SampleMaski", + "SamplerParameterf", + "SamplerParameterfv", + "SamplerParameteri", + "SamplerParameterIiv", + "SamplerParameterIuiv", + "SamplerParameteriv", + "Scaled", + "Scalef", + "Scalex", + "Scissor", + "ScissorArrayv", + "ScissorIndexed", + "ScissorIndexedv", + "SecondaryColor3b", + "SecondaryColor3bEXT", + "SecondaryColor3bv", + "SecondaryColor3bvEXT", + "SecondaryColor3d", + "SecondaryColor3dEXT", + "SecondaryColor3dv", + "SecondaryColor3dvEXT", + "SecondaryColor3f", + "SecondaryColor3fEXT", + "SecondaryColor3fv", + "SecondaryColor3fvEXT", + "SecondaryColor3i", + "SecondaryColor3iEXT", + "SecondaryColor3iv", + "SecondaryColor3ivEXT", + "SecondaryColor3s", + "SecondaryColor3sEXT", + "SecondaryColor3sv", + "SecondaryColor3svEXT", + "SecondaryColor3ub", + "SecondaryColor3ubEXT", + "SecondaryColor3ubv", + "SecondaryColor3ubvEXT", + "SecondaryColor3ui", + "SecondaryColor3uiEXT", + "SecondaryColor3uiv", + "SecondaryColor3uivEXT", + "SecondaryColor3us", + "SecondaryColor3usEXT", + "SecondaryColor3usv", + "SecondaryColor3usvEXT", + "SecondaryColorP3ui", + "SecondaryColorP3uiv", + "SecondaryColorPointer", + "SecondaryColorPointerEXT", + "SelectBuffer", + "SeparableFilter2D", + "ShadeModel", + "ShaderBinary", + "ShaderSource", + "ShaderSourceARB", + "StencilFunc", + "StencilFuncSeparate", + "StencilMask", + "StencilMaskSeparate", + "StencilOp", + "StencilOpSeparate", + "TexBuffer", + "TexBufferARB", + "TexBufferRange", + "TexCoord1d", + "TexCoord1dv", + "TexCoord1f", + "TexCoord1fv", + "TexCoord1i", + "TexCoord1iv", + "TexCoord1s", + "TexCoord1sv", + "TexCoord2d", + "TexCoord2dv", + "TexCoord2f", + "TexCoord2fv", + "TexCoord2i", + "TexCoord2iv", + "TexCoord2s", + "TexCoord2sv", + "TexCoord3d", + "TexCoord3dv", + "TexCoord3f", + "TexCoord3fv", + "TexCoord3i", + "TexCoord3iv", + "TexCoord3s", + "TexCoord3sv", + "TexCoord4d", + "TexCoord4dv", + "TexCoord4f", + "TexCoord4fv", + "TexCoord4i", + "TexCoord4iv", + "TexCoord4s", + "TexCoord4sv", + "TexCoordP1ui", + "TexCoordP1uiv", + "TexCoordP2ui", + "TexCoordP2uiv", + "TexCoordP3ui", + "TexCoordP3uiv", + "TexCoordP4ui", + "TexCoordP4uiv", + "TexCoordPointer", + "TexCoordPointerEXT", + "TexEnvf", + "TexEnvfv", + "TexEnvi", + "TexEnviv", + "TexEnvx", + "TexEnvxv", + "TexGend", + "TexGendv", + "TexGenf", + "TexGenfv", + "TexGeni", + "TexGeniv", + "TexImage1D", + "TexImage2D", + "TexImage2DMultisample", + "TexImage3D", + "TexImage3DEXT", + "TexImage3DMultisample", + "TexParameterf", + "TexParameterfv", + "TexParameteri", + "TexParameterIiv", + "TexParameterIivEXT", + "TexParameterIuiv", + "TexParameterIuivEXT", + "TexParameteriv", + "TexParameterx", + "TexParameterxv", + "TexStorage1D", + "TexStorage2D", + "TexStorage2DMultisample", + "TexStorage3D", + "TexStorage3DMultisample", + "TexSubImage1D", + "TexSubImage2D", + "TexSubImage3D", + "TexSubImage3DEXT", + "TextureBarrierNV", + "TextureStorage1DEXT", + "TextureStorage2DEXT", + "TextureStorage3DEXT", + "TextureView", + "TransformFeedbackVaryings", + "Translated", + "Translatef", + "Translatex", + "Uniform1f", + "Uniform1fARB", + "Uniform1fv", + "Uniform1fvARB", + "Uniform1i", + "Uniform1iARB", + "Uniform1iv", + "Uniform1ivARB", + "Uniform1ui", + "Uniform1uiEXT", + "Uniform1uiv", + "Uniform1uivEXT", + "Uniform2f", + "Uniform2fARB", + "Uniform2fv", + "Uniform2fvARB", + "Uniform2i", + "Uniform2iARB", + "Uniform2iv", + "Uniform2ivARB", + "Uniform2ui", + "Uniform2uiEXT", + "Uniform2uiv", + "Uniform2uivEXT", + "Uniform3f", + "Uniform3fARB", + "Uniform3fv", + "Uniform3fvARB", + "Uniform3i", + "Uniform3iARB", + "Uniform3iv", + "Uniform3ivARB", + "Uniform3ui", + "Uniform3uiEXT", + "Uniform3uiv", + "Uniform3uivEXT", + "Uniform4f", + "Uniform4fARB", + "Uniform4fv", + "Uniform4fvARB", + "Uniform4i", + "Uniform4iARB", + "Uniform4iv", + "Uniform4ivARB", + "Uniform4ui", + "Uniform4uiEXT", + "Uniform4uiv", + "Uniform4uivEXT", + "UniformBlockBinding", + "UniformMatrix2fv", + "UniformMatrix2fvARB", + "UniformMatrix2x3fv", + "UniformMatrix2x4fv", + "UniformMatrix3fv", + "UniformMatrix3fvARB", + "UniformMatrix3x2fv", + "UniformMatrix3x4fv", + "UniformMatrix4fv", + "UniformMatrix4fvARB", + "UniformMatrix4x2fv", + "UniformMatrix4x3fv", + "UnlockArraysEXT", + "UnmapBuffer", + "UnmapBufferARB", + "UseProgram", + "UseProgramObjectARB", + "ValidateProgram", + "ValidateProgramARB", + "Vertex2d", + "Vertex2dv", + "Vertex2f", + "Vertex2fv", + "Vertex2i", + "Vertex2iv", + "Vertex2s", + "Vertex2sv", + "Vertex3d", + "Vertex3dv", + "Vertex3f", + "Vertex3fv", + "Vertex3i", + "Vertex3iv", + "Vertex3s", + "Vertex3sv", + "Vertex4d", + "Vertex4dv", + "Vertex4f", + "Vertex4fv", + "Vertex4i", + "Vertex4iv", + "Vertex4s", + "Vertex4sv", + "VertexAttrib1d", + "VertexAttrib1dARB", + "VertexAttrib1dv", + "VertexAttrib1dvARB", + "VertexAttrib1f", + "VertexAttrib1fARB", + "VertexAttrib1fv", + "VertexAttrib1fvARB", + "VertexAttrib1s", + "VertexAttrib1sARB", + "VertexAttrib1sv", + "VertexAttrib1svARB", + "VertexAttrib2d", + "VertexAttrib2dARB", + "VertexAttrib2dv", + "VertexAttrib2dvARB", + "VertexAttrib2f", + "VertexAttrib2fARB", + "VertexAttrib2fv", + "VertexAttrib2fvARB", + "VertexAttrib2s", + "VertexAttrib2sARB", + "VertexAttrib2sv", + "VertexAttrib2svARB", + "VertexAttrib3d", + "VertexAttrib3dARB", + "VertexAttrib3dv", + "VertexAttrib3dvARB", + "VertexAttrib3f", + "VertexAttrib3fARB", + "VertexAttrib3fv", + "VertexAttrib3fvARB", + "VertexAttrib3s", + "VertexAttrib3sARB", + "VertexAttrib3sv", + "VertexAttrib3svARB", + "VertexAttrib4bv", + "VertexAttrib4bvARB", + "VertexAttrib4d", + "VertexAttrib4dARB", + "VertexAttrib4dv", + "VertexAttrib4dvARB", + "VertexAttrib4f", + "VertexAttrib4fARB", + "VertexAttrib4fv", + "VertexAttrib4fvARB", + "VertexAttrib4iv", + "VertexAttrib4ivARB", + "VertexAttrib4Nbv", + "VertexAttrib4NbvARB", + "VertexAttrib4Niv", + "VertexAttrib4NivARB", + "VertexAttrib4Nsv", + "VertexAttrib4NsvARB", + "VertexAttrib4Nub", + "VertexAttrib4NubARB", + "VertexAttrib4Nubv", + "VertexAttrib4NubvARB", + "VertexAttrib4Nuiv", + "VertexAttrib4NuivARB", + "VertexAttrib4Nusv", + "VertexAttrib4NusvARB", + "VertexAttrib4s", + "VertexAttrib4sARB", + "VertexAttrib4sv", + "VertexAttrib4svARB", + "VertexAttrib4ubv", + "VertexAttrib4ubvARB", + "VertexAttrib4uiv", + "VertexAttrib4uivARB", + "VertexAttrib4usv", + "VertexAttrib4usvARB", + "VertexAttribBinding", + "VertexAttribDivisor", + "VertexAttribDivisorARB", + "VertexAttribFormat", + "VertexAttribI1i", + "VertexAttribI1iEXT", + "VertexAttribI1iv", + "VertexAttribI1ivEXT", + "VertexAttribI1ui", + "VertexAttribI1uiEXT", + "VertexAttribI1uiv", + "VertexAttribI1uivEXT", + "VertexAttribI2i", + "VertexAttribI2iEXT", + "VertexAttribI2iv", + "VertexAttribI2ivEXT", + "VertexAttribI2ui", + "VertexAttribI2uiEXT", + "VertexAttribI2uiv", + "VertexAttribI2uivEXT", + "VertexAttribI3i", + "VertexAttribI3iEXT", + "VertexAttribI3iv", + "VertexAttribI3ivEXT", + "VertexAttribI3ui", + "VertexAttribI3uiEXT", + "VertexAttribI3uiv", + "VertexAttribI3uivEXT", + "VertexAttribI4bv", + "VertexAttribI4bvEXT", + "VertexAttribI4i", + "VertexAttribI4iEXT", + "VertexAttribI4iv", + "VertexAttribI4ivEXT", + "VertexAttribI4sv", + "VertexAttribI4svEXT", + "VertexAttribI4ubv", + "VertexAttribI4ubvEXT", + "VertexAttribI4ui", + "VertexAttribI4uiEXT", + "VertexAttribI4uiv", + "VertexAttribI4uivEXT", + "VertexAttribI4usv", + "VertexAttribI4usvEXT", + "VertexAttribIFormat", + "VertexAttribIPointer", + "VertexAttribIPointerEXT", + "VertexAttribLFormat", + "VertexAttribP1ui", + "VertexAttribP1uiv", + "VertexAttribP2ui", + "VertexAttribP2uiv", + "VertexAttribP3ui", + "VertexAttribP3uiv", + "VertexAttribP4ui", + "VertexAttribP4uiv", + "VertexAttribPointer", + "VertexAttribPointerARB", + "VertexBindingDivisor", + "VertexP2ui", + "VertexP2uiv", + "VertexP3ui", + "VertexP3uiv", + "VertexP4ui", + "VertexP4uiv", + "VertexPointer", + "VertexPointerEXT", + "Viewport", + "ViewportArrayv", + "ViewportIndexedf", + "ViewportIndexedfv", + "WaitSync", + "WindowPos2d", + "WindowPos2dARB", + "WindowPos2dv", + "WindowPos2dvARB", + "WindowPos2f", + "WindowPos2fARB", + "WindowPos2fv", + "WindowPos2fvARB", + "WindowPos2i", + "WindowPos2iARB", + "WindowPos2iv", + "WindowPos2ivARB", + "WindowPos2s", + "WindowPos2sARB", + "WindowPos2sv", + "WindowPos2svARB", + "WindowPos3d", + "WindowPos3dARB", + "WindowPos3dv", + "WindowPos3dvARB", + "WindowPos3f", + "WindowPos3fARB", + "WindowPos3fv", + "WindowPos3fvARB", + "WindowPos3i", + "WindowPos3iARB", + "WindowPos3iv", + "WindowPos3ivARB", + "WindowPos3s", + "WindowPos3sARB", + "WindowPos3sv", + "WindowPos3svARB", ] """Functions that need dispatch slots but are not used 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. |