diff options
Diffstat (limited to 'mesalib/src/mapi')
28 files changed, 723 insertions, 970 deletions
diff --git a/mesalib/src/mapi/glapi/gen/ARB_ES2_compatibility.xml b/mesalib/src/mapi/glapi/gen/ARB_ES2_compatibility.xml index d52a88c60..d15736612 100644 --- a/mesalib/src/mapi/glapi/gen/ARB_ES2_compatibility.xml +++ b/mesalib/src/mapi/glapi/gen/ARB_ES2_compatibility.xml @@ -18,17 +18,17 @@ <enum name="MAX_VARYING_VECTORS" value="0x8DFC"/> <enum name="MAX_FRAGMENT_UNIFORM_VECTORS" value="0x8DFD"/> - <function name="GetShaderPrecisionFormat" offset="assign"> + <function name="GetShaderPrecisionFormat" offset="assign" es2="2.0"> <param name="shadertype" type="GLenum"/> <param name="precisiontype" type="GLenum"/> <param name="range" type="GLint *"/> <param name="precision" type="GLint *"/> </function> - <function name="ReleaseShaderCompiler" offset="assign"> + <function name="ReleaseShaderCompiler" offset="assign" es2="2.0"> </function> - <function name="ShaderBinary" offset="assign"> + <function name="ShaderBinary" offset="assign" es2="2.0"> <param name="n" type="GLsizei"/> <param name="shaders" type="const GLuint *"/> <param name="binaryformat" type="GLenum"/> @@ -45,11 +45,11 @@ <enum name="IMPLEMENTATION_COLOR_READ_FORMAT" value="0x8B9B"/> <!-- from GL_OES_single_precision --> - <function name="ClearDepthf" offset="assign"> + <function name="ClearDepthf" offset="assign" es1="1.0" es2="2.0"> <param name="depth" type="GLclampf"/> </function> - <function name="DepthRangef" offset="assign"> + <function name="DepthRangef" offset="assign" es1="1.0" es2="2.0"> <param name="zNear" type="GLclampf"/> <param name="zFar" type="GLclampf"/> </function> diff --git a/mesalib/src/mapi/glapi/gen/ARB_copy_buffer.xml b/mesalib/src/mapi/glapi/gen/ARB_copy_buffer.xml index 719816d81..6982ed1d2 100644 --- a/mesalib/src/mapi/glapi/gen/ARB_copy_buffer.xml +++ b/mesalib/src/mapi/glapi/gen/ARB_copy_buffer.xml @@ -11,7 +11,7 @@ <enum name="COPY_READ_BUFFER" value="0x8F36"/> <enum name="COPY_WRITE_BUFFER" value="0x8F37"/> - <function name="CopyBufferSubData" offset="assign"> + <function name="CopyBufferSubData" offset="assign" es2="3.0"> <param name="readTarget" type="GLenum"/> <param name="writeTarget" type="GLenum"/> <param name="readOffset" type="GLintptr"/> diff --git a/mesalib/src/mapi/glapi/gen/ARB_framebuffer_object.xml b/mesalib/src/mapi/glapi/gen/ARB_framebuffer_object.xml index e6bdcd6e5..c9649aced 100644 --- a/mesalib/src/mapi/glapi/gen/ARB_framebuffer_object.xml +++ b/mesalib/src/mapi/glapi/gen/ARB_framebuffer_object.xml @@ -140,34 +140,36 @@ - <function name="IsRenderbuffer" alias="IsRenderbufferEXT"> + <function name="IsRenderbuffer" alias="IsRenderbufferEXT" es2="2.0"> <param name="renderbuffer" type="GLuint"/> <return type="GLboolean"/> </function> - <function name="BindRenderbuffer" alias="BindRenderbufferEXT"> + <function name="BindRenderbuffer" alias="BindRenderbufferEXT" es2="2.0"> <param name="target" type="GLenum"/> <param name="renderbuffer" type="GLuint"/> </function> - <function name="DeleteRenderbuffers" alias="DeleteRenderbuffersEXT"> + <function name="DeleteRenderbuffers" alias="DeleteRenderbuffersEXT" + es2="2.0"> <param name="n" type="GLsizei" counter="true"/> <param name="renderbuffers" type="const GLuint *" count="n"/> </function> - <function name="GenRenderbuffers" alias="GenRenderbuffersEXT"> + <function name="GenRenderbuffers" alias="GenRenderbuffersEXT" es2="2.0"> <param name="n" type="GLsizei" counter="true"/> <param name="renderbuffers" type="GLuint *" count="n" output="true"/> </function> - <function name="RenderbufferStorage" alias="RenderbufferStorageEXT"> + <function name="RenderbufferStorage" alias="RenderbufferStorageEXT" + es2="2.0"> <param name="target" type="GLenum"/> <param name="internalformat" type="GLenum"/> <param name="width" type="GLsizei"/> <param name="height" type="GLsizei"/> </function> - <function name="RenderbufferStorageMultisample" offset="assign"> + <function name="RenderbufferStorageMultisample" offset="assign" es2="3.0"> <param name="target" type="GLenum"/> <param name="samples" type="GLsizei"/> <param name="internalformat" type="GLenum"/> @@ -176,33 +178,36 @@ <glx rop="4331"/> </function> - <function name="GetRenderbufferParameteriv" alias="GetRenderbufferParameterivEXT"> + <function name="GetRenderbufferParameteriv" + alias="GetRenderbufferParameterivEXT" es2="2.0"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="GLint *" output="true"/> </function> - <function name="IsFramebuffer" alias="IsFramebufferEXT"> + <function name="IsFramebuffer" alias="IsFramebufferEXT" es2="2.0"> <param name="framebuffer" type="GLuint"/> <return type="GLboolean"/> </function> - <function name="BindFramebuffer" alias="BindFramebufferEXT"> + <function name="BindFramebuffer" alias="BindFramebufferEXT" es2="2.0"> <param name="target" type="GLenum"/> <param name="framebuffer" type="GLuint"/> </function> - <function name="DeleteFramebuffers" alias="DeleteFramebuffersEXT"> + <function name="DeleteFramebuffers" alias="DeleteFramebuffersEXT" + es2="2.0"> <param name="n" type="GLsizei" counter="true"/> <param name="framebuffers" type="const GLuint *" count="n"/> </function> - <function name="GenFramebuffers" alias="GenFramebuffersEXT"> + <function name="GenFramebuffers" alias="GenFramebuffersEXT" es2="2.0"> <param name="n" type="GLsizei" counter="true"/> <param name="framebuffers" type="GLuint *" count="n" output="true"/> </function> - <function name="CheckFramebufferStatus" alias="CheckFramebufferStatusEXT"> + <function name="CheckFramebufferStatus" alias="CheckFramebufferStatusEXT" + es2="2.0"> <param name="target" type="GLenum"/> <return type="GLenum"/> </function> @@ -215,7 +220,8 @@ <param name="level" type="GLint"/> </function> - <function name="FramebufferTexture2D" alias="FramebufferTexture2DEXT"> + <function name="FramebufferTexture2D" alias="FramebufferTexture2DEXT" + es2="2.0"> <param name="target" type="GLenum"/> <param name="attachment" type="GLenum"/> <param name="textarget" type="GLenum"/> @@ -232,7 +238,7 @@ <param name="zoffset" type="GLint"/> </function> - <function name="FramebufferTextureLayer" alias="FramebufferTextureLayerEXT"> + <function name="FramebufferTextureLayer" alias="FramebufferTextureLayerEXT" es2="3.0"> <param name="target" type="GLenum"/> <param name="attachment" type="GLenum"/> <param name="texture" type="GLuint"/> @@ -240,21 +246,23 @@ <param name="layer" type="GLint"/> </function> - <function name="FramebufferRenderbuffer" alias="FramebufferRenderbufferEXT"> + <function name="FramebufferRenderbuffer" alias="FramebufferRenderbufferEXT" + es2="2.0"> <param name="target" type="GLenum"/> <param name="attachment" type="GLenum"/> <param name="renderbuffertarget" type="GLenum"/> <param name="renderbuffer" type="GLuint"/> </function> - <function name="GetFramebufferAttachmentParameteriv" alias="GetFramebufferAttachmentParameterivEXT"> + <function name="GetFramebufferAttachmentParameteriv" + alias="GetFramebufferAttachmentParameterivEXT" es2="2.0"> <param name="target" type="GLenum"/> <param name="attachment" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="GLint *" output="true"/> </function> - <function name="BlitFramebuffer" alias="BlitFramebufferEXT"> + <function name="BlitFramebuffer" alias="BlitFramebufferEXT" es2="3.0"> <param name="srcX0" type="GLint"/> <param name="srcY0" type="GLint"/> <param name="srcX1" type="GLint"/> @@ -267,7 +275,7 @@ <param name="filter" type="GLenum"/> </function> - <function name="GenerateMipmap" alias="GenerateMipmapEXT"> + <function name="GenerateMipmap" alias="GenerateMipmapEXT" es2="2.0"> <param name="target" type="GLenum"/> </function> </category> diff --git a/mesalib/src/mapi/glapi/gen/ARB_get_program_binary.xml b/mesalib/src/mapi/glapi/gen/ARB_get_program_binary.xml index a3665e540..8da5c41e8 100644 --- a/mesalib/src/mapi/glapi/gen/ARB_get_program_binary.xml +++ b/mesalib/src/mapi/glapi/gen/ARB_get_program_binary.xml @@ -11,7 +11,7 @@ <enum name="NUM_PROGRAM_BINARY_FORMATS" value="0x87FE"/> <enum name="PROGRAM_BINARY_FORMATS" value="0x87FF"/> - <function name="GetProgramBinary" offset="assign" static_dispatch="false"> + <function name="GetProgramBinary" offset="assign" static_dispatch="false" es2="3.0"> <param name="program" type="GLuint"/> <param name="bufSize" type="GLsizei"/> <param name="length" type="GLsizei *"/> @@ -19,14 +19,14 @@ <param name="binary" type="GLvoid *"/> </function> - <function name="ProgramBinary" offset="assign" static_dispatch="false"> + <function name="ProgramBinary" offset="assign" static_dispatch="false" es2="3.0"> <param name="program" type="GLuint"/> <param name="binaryFormat" type="GLenum"/> <param name="binary" type="const GLvoid *"/> <param name="length" type="GLsizei"/> </function> - <function name="ProgramParameteri" offset="assign" static_dispatch="false"> + <function name="ProgramParameteri" offset="assign" static_dispatch="false" es2="3.0"> <param name="program" type="GLuint"/> <param name="pname" type="GLenum"/> <param name="value" type="GLint"/> diff --git a/mesalib/src/mapi/glapi/gen/ARB_invalidate_subdata.xml b/mesalib/src/mapi/glapi/gen/ARB_invalidate_subdata.xml index 3e4ffc300..31b515cdb 100644 --- a/mesalib/src/mapi/glapi/gen/ARB_invalidate_subdata.xml +++ b/mesalib/src/mapi/glapi/gen/ARB_invalidate_subdata.xml @@ -29,7 +29,7 @@ <param name="buffer" type="GLuint"/> </function> - <function name="InvalidateSubFramebuffer" offset="assign"> + <function name="InvalidateSubFramebuffer" offset="assign" es2="3.0"> <param name="target" type="GLenum"/> <param name="numAttachments" type="GLsizei" counter="true"/> <param name="attachments" type="const GLenum *" count="numAttachments"/> @@ -39,7 +39,7 @@ <param name="height" type="GLsizei"/> </function> - <function name="InvalidateFramebuffer" offset="assign"> + <function name="InvalidateFramebuffer" offset="assign" es2="3.0"> <param name="target" type="GLenum"/> <param name="numAttachments" type="GLsizei" counter="true"/> <param name="attachments" type="const GLenum *" count="numAttachments"/> diff --git a/mesalib/src/mapi/glapi/gen/ARB_map_buffer_range.xml b/mesalib/src/mapi/glapi/gen/ARB_map_buffer_range.xml index afcb9b6ba..d87450446 100644 --- a/mesalib/src/mapi/glapi/gen/ARB_map_buffer_range.xml +++ b/mesalib/src/mapi/glapi/gen/ARB_map_buffer_range.xml @@ -15,7 +15,7 @@ <enum name="MAP_FLUSH_EXPLICIT_BIT" value="0x0010"/> <enum name="MAP_UNSYNCHRONIZED_BIT" value="0x0020"/> - <function name="MapBufferRange" offset="assign"> + <function name="MapBufferRange" offset="assign" es2="3.0"> <param name="target" type="GLenum"/> <param name="offset" type="GLintptr"/> <param name="length" type="GLsizeiptr"/> @@ -23,7 +23,7 @@ <return type="GLvoid *"/> </function> - <function name="FlushMappedBufferRange" offset="assign"> + <function name="FlushMappedBufferRange" offset="assign" es2="3.0"> <param name="target" type="GLenum"/> <param name="offset" type="GLintptr"/> <param name="length" type="GLsizeiptr"/> diff --git a/mesalib/src/mapi/glapi/gen/ARB_sampler_objects.xml b/mesalib/src/mapi/glapi/gen/ARB_sampler_objects.xml index 0d39db4d3..9173dee5c 100644 --- a/mesalib/src/mapi/glapi/gen/ARB_sampler_objects.xml +++ b/mesalib/src/mapi/glapi/gen/ARB_sampler_objects.xml @@ -7,45 +7,45 @@ <category name="GL_ARB_sampler_objects" number="81"> - <function name="GenSamplers" offset="assign"> + <function name="GenSamplers" offset="assign" es2="3.0"> <param name="count" type="GLsizei"/> <param name="samplers" type="GLuint *"/> </function> - <function name="DeleteSamplers" offset="assign"> + <function name="DeleteSamplers" offset="assign" es2="3.0"> <param name="count" type="GLsizei"/> <param name="samplers" type="const GLuint *"/> </function> - <function name="IsSampler" offset="assign"> + <function name="IsSampler" offset="assign" es2="3.0"> <param name="sampler" type="GLuint"/> <return type="GLboolean"/> </function> - <function name="BindSampler" offset="assign"> + <function name="BindSampler" offset="assign" es2="3.0"> <param name="unit" type="GLuint"/> <param name="sampler" type="GLuint"/> </function> - <function name="SamplerParameteri" offset="assign"> + <function name="SamplerParameteri" offset="assign" es2="3.0"> <param name="sampler" type="GLuint"/> <param name="pname" type="GLenum"/> <param name="param" type="GLint"/> </function> - <function name="SamplerParameterf" offset="assign"> + <function name="SamplerParameterf" offset="assign" es2="3.0"> <param name="sampler" type="GLuint"/> <param name="pname" type="GLenum"/> <param name="param" type="GLfloat"/> </function> - <function name="SamplerParameteriv" offset="assign"> + <function name="SamplerParameteriv" offset="assign" es2="3.0"> <param name="sampler" type="GLuint"/> <param name="pname" type="GLenum"/> <param name="params" type="const GLint *"/> </function> - <function name="SamplerParameterfv" offset="assign"> + <function name="SamplerParameterfv" offset="assign" es2="3.0"> <param name="sampler" type="GLuint"/> <param name="pname" type="GLenum"/> <param name="params" type="const GLfloat *"/> @@ -63,13 +63,13 @@ <param name="params" type="const GLuint *"/> </function> - <function name="GetSamplerParameteriv" offset="assign"> + <function name="GetSamplerParameteriv" offset="assign" es2="3.0"> <param name="sampler" type="GLuint"/> <param name="pname" type="GLenum"/> <param name="params" type="GLint *"/> </function> - <function name="GetSamplerParameterfv" offset="assign"> + <function name="GetSamplerParameterfv" offset="assign" es2="3.0"> <param name="sampler" type="GLuint"/> <param name="pname" type="GLenum"/> <param name="params" type="GLfloat *"/> diff --git a/mesalib/src/mapi/glapi/gen/ARB_sync.xml b/mesalib/src/mapi/glapi/gen/ARB_sync.xml index 4e4eebac3..58f1639c4 100644 --- a/mesalib/src/mapi/glapi/gen/ARB_sync.xml +++ b/mesalib/src/mapi/glapi/gen/ARB_sync.xml @@ -39,40 +39,40 @@ --> - <function name="FenceSync" offset="assign"> + <function name="FenceSync" offset="assign" es2="3.0"> <param name="condition" type="GLenum"/> <param name="flags" type="GLbitfield"/> <return type="GLsync"/> </function> - <function name="IsSync" offset="assign"> + <function name="IsSync" offset="assign" es2="3.0"> <param name="sync" type="GLsync"/> <return type="GLboolean"/> </function> - <function name="DeleteSync" offset="assign"> + <function name="DeleteSync" offset="assign" es2="3.0"> <param name="sync" type="GLsync"/> </function> - <function name="ClientWaitSync" offset="assign"> + <function name="ClientWaitSync" offset="assign" es2="3.0"> <param name="sync" type="GLsync"/> <param name="flags" type="GLbitfield"/> <param name="timeout" type="GLuint64"/> <return type="GLenum"/> </function> - <function name="WaitSync" offset="assign"> + <function name="WaitSync" offset="assign" es2="3.0"> <param name="sync" type="GLsync"/> <param name="flags" type="GLbitfield"/> <param name="timeout" type="GLuint64"/> </function> - <function name="GetInteger64v" offset="assign"> + <function name="GetInteger64v" offset="assign" es2="3.0"> <param name="pname" type="GLenum"/> <param name="params" type="GLint64 *" output="true" variable_param="pname"/> </function> - <function name="GetSynciv" offset="assign"> + <function name="GetSynciv" offset="assign" es2="3.0"> <param name="sync" type="GLsync"/> <param name="pname" type="GLenum"/> <param name="bufSize" type="GLsizei"/> diff --git a/mesalib/src/mapi/glapi/gen/ARB_texture_storage.xml b/mesalib/src/mapi/glapi/gen/ARB_texture_storage.xml index 045913806..1d63e7ce3 100644 --- a/mesalib/src/mapi/glapi/gen/ARB_texture_storage.xml +++ b/mesalib/src/mapi/glapi/gen/ARB_texture_storage.xml @@ -17,7 +17,7 @@ <param name="width" type="GLsizei"/> </function> - <function name="TexStorage2D" offset="assign"> + <function name="TexStorage2D" offset="assign" es2="3.0"> <param name="target" type="GLenum"/> <param name="levels" type="GLsizei"/> <param name="internalFormat" type="GLenum"/> @@ -25,7 +25,7 @@ <param name="height" type="GLsizei"/> </function> - <function name="TexStorage3D" offset="assign"> + <function name="TexStorage3D" offset="assign" es2="3.0"> <param name="target" type="GLenum"/> <param name="levels" type="GLsizei"/> <param name="internalFormat" type="GLenum"/> diff --git a/mesalib/src/mapi/glapi/gen/ARB_uniform_buffer_object.xml b/mesalib/src/mapi/glapi/gen/ARB_uniform_buffer_object.xml index 80541a821..11aacb033 100644 --- a/mesalib/src/mapi/glapi/gen/ARB_uniform_buffer_object.xml +++ b/mesalib/src/mapi/glapi/gen/ARB_uniform_buffer_object.xml @@ -39,14 +39,14 @@ <enum name="UNIFORM_BLOCK_REFERENCED_BY_FRAGMENT_SHADER" value="0x8A46" /> <enum name="INVALID_INDEX" value="0xFFFFFFFF" /> -<function name="GetUniformIndices" offset="assign"> +<function name="GetUniformIndices" offset="assign" es2="3.0"> <param name="program" type="GLuint" /> <param name="uniformCount" type="GLsizei" /> <param name="uniformNames" type="const GLchar * const *" /> <param name="uniformIndices" type="GLuint *" /> </function> -<function name="GetActiveUniformsiv" offset="assign"> +<function name="GetActiveUniformsiv" offset="assign" es2="3.0"> <param name="program" type="GLuint" /> <param name="uniformCount" type="GLsizei" /> <param name="uniformIndices" type="const GLuint *" /> @@ -62,20 +62,20 @@ <param name="uniformName" type="GLchar *" /> </function> -<function name="GetUniformBlockIndex" offset="assign"> +<function name="GetUniformBlockIndex" offset="assign" es2="3.0"> <return type="GLuint"/> <param name="program" type="GLuint" /> <param name="uniformBlockName" type="const GLchar *" /> </function> -<function name="GetActiveUniformBlockiv" offset="assign"> +<function name="GetActiveUniformBlockiv" offset="assign" es2="3.0"> <param name="program" type="GLuint" /> <param name="uniformBlockIndex" type="GLuint" /> <param name="pname" type="GLenum" /> <param name="params" type="GLint *" /> </function> -<function name="GetActiveUniformBlockName" offset="assign"> +<function name="GetActiveUniformBlockName" offset="assign" es2="3.0"> <param name="program" type="GLuint" /> <param name="uniformBlockIndex" type="GLuint" /> <param name="bufSize" type="GLsizei" /> @@ -86,7 +86,7 @@ <!-- Duplicated with GL3x.xml: BindBufferRange, BindBufferBase, GetIntegeri_v --> -<function name="UniformBlockBinding" offset="assign" > +<function name="UniformBlockBinding" offset="assign" es2="3.0"> <param name="program" type="GLuint" /> <param name="uniformBlockIndex" type="GLuint" /> <param name="uniformBlockBinding" type="GLuint" /> diff --git a/mesalib/src/mapi/glapi/gen/ARB_vertex_array_object.xml b/mesalib/src/mapi/glapi/gen/ARB_vertex_array_object.xml index 3b4ab64f5..872548d1a 100644 --- a/mesalib/src/mapi/glapi/gen/ARB_vertex_array_object.xml +++ b/mesalib/src/mapi/glapi/gen/ARB_vertex_array_object.xml @@ -10,21 +10,21 @@ <enum name="VERTEX_ARRAY_BINDING" value="0x85B5"/> - <function name="BindVertexArray" offset="assign"> + <function name="BindVertexArray" offset="assign" es2="3.0"> <param name="array" type="GLuint"/> </function> - <function name="DeleteVertexArrays" alias="DeleteVertexArraysAPPLE"> + <function name="DeleteVertexArrays" alias="DeleteVertexArraysAPPLE" es2="3.0"> <param name="n" type="GLsizei"/> <param name="arrays" type="const GLuint *"/> </function> - <function name="GenVertexArrays" offset="assign"> + <function name="GenVertexArrays" offset="assign" es2="3.0"> <param name="n" type="GLsizei"/> <param name="arrays" type="GLuint *"/> </function> - <function name="IsVertexArray" alias="IsVertexArrayAPPLE"> + <function name="IsVertexArray" alias="IsVertexArrayAPPLE" es2="3.0"> <param name="array" type="GLuint"/> <return type="GLboolean"/> </function> diff --git a/mesalib/src/mapi/glapi/gen/EXT_transform_feedback.xml b/mesalib/src/mapi/glapi/gen/EXT_transform_feedback.xml index 051f1e0cc..dbd7513c7 100644 --- a/mesalib/src/mapi/glapi/gen/EXT_transform_feedback.xml +++ b/mesalib/src/mapi/glapi/gen/EXT_transform_feedback.xml @@ -82,30 +82,30 @@ <enum name="TRANSFORM_FEEDBACK_BUFFER_ACTIVE" value="0x8E24"/> <enum name="TRANSFORM_FEEDBACK_BINDING" value="0x8E25"/> - <function name="BindTransformFeedback" offset="assign"> + <function name="BindTransformFeedback" offset="assign" es2="3.0"> <param name="target" type="GLenum"/> <param name="id" type="GLuint"/> </function> - <function name="DeleteTransformFeedbacks" offset="assign"> + <function name="DeleteTransformFeedbacks" offset="assign" es2="3.0"> <param name="n" type="GLsizei"/> <param name="ids" type="const GLuint *"/> </function> - <function name="GenTransformFeedbacks" offset="assign"> + <function name="GenTransformFeedbacks" offset="assign" es2="3.0"> <param name="n" type="GLsizei"/> <param name="ids" type="GLuint *"/> </function> - <function name="IsTransformFeedback" offset="assign"> + <function name="IsTransformFeedback" offset="assign" es2="3.0"> <param name="id" type="GLuint"/> <return type="GLboolean"/> </function> - <function name="PauseTransformFeedback" offset="assign"> + <function name="PauseTransformFeedback" offset="assign" es2="3.0"> </function> - <function name="ResumeTransformFeedback" offset="assign"> + <function name="ResumeTransformFeedback" offset="assign" es2="3.0"> </function> <function name="DrawTransformFeedback" offset="assign"> diff --git a/mesalib/src/mapi/glapi/gen/GL3x.xml b/mesalib/src/mapi/glapi/gen/GL3x.xml index d287ac2b0..7642a27c4 100644 --- a/mesalib/src/mapi/glapi/gen/GL3x.xml +++ b/mesalib/src/mapi/glapi/gen/GL3x.xml @@ -119,32 +119,32 @@ <!-- These functions are unique to GL3 --> - <function name="ClearBufferiv" offset="assign"> + <function name="ClearBufferiv" offset="assign" es2="3.0"> <param name="buffer" type="GLenum"/> <param name="drawbuffer" type="GLint"/> <param name="value" type="const GLint *"/> </function> - <function name="ClearBufferuiv" offset="assign"> + <function name="ClearBufferuiv" offset="assign" es2="3.0"> <param name="buffer" type="GLenum"/> <param name="drawbuffer" type="GLint"/> <param name="value" type="const GLuint *"/> </function> - <function name="ClearBufferfv" offset="assign"> + <function name="ClearBufferfv" offset="assign" es2="3.0"> <param name="buffer" type="GLenum"/> <param name="drawbuffer" type="GLint"/> <param name="value" type="const GLfloat *"/> </function> - <function name="ClearBufferfi" offset="assign"> + <function name="ClearBufferfi" offset="assign" es2="3.0"> <param name="buffer" type="GLenum"/> <param name="drawbuffer" type="GLint"/> <param name="depth" type="GLfloat"/> <param name="stencil" type="GLint"/> </function> - <function name="GetStringi" offset="assign"> + <function name="GetStringi" offset="assign" es2="3.0"> <param name="name" type="GLenum"/> <param name="index" type="GLuint"/> <return type="const GLubyte *"/> @@ -171,7 +171,7 @@ <param name="data" type="GLboolean *"/> </function> - <function name="GetIntegeri_v" alias="GetIntegerIndexedvEXT"> + <function name="GetIntegeri_v" alias="GetIntegerIndexedvEXT" es2="3.0"> <param name="value" type="GLenum"/> <param name="index" type="GLuint"/> <param name="data" type="GLint *"/> @@ -195,7 +195,7 @@ <!-- These functions alias ones form GL_EXT_transform_feedback --> - <function name="GetFragDataLocation" alias="GetFragDataLocationEXT"> + <function name="GetFragDataLocation" alias="GetFragDataLocationEXT" es2="3.0"> <param name="program" type="GLuint"/> <param name="name" type="const GLchar *"/> <return type="GLint"/> @@ -207,14 +207,14 @@ <param name="name" type="const GLchar *"/> </function> - <function name="BeginTransformFeedback" alias="BeginTransformFeedbackEXT"> + <function name="BeginTransformFeedback" alias="BeginTransformFeedbackEXT" es2="3.0"> <param name="mode" type="GLenum"/> </function> - <function name="EndTransformFeedback" alias="EndTransformFeedbackEXT"> + <function name="EndTransformFeedback" alias="EndTransformFeedbackEXT" es2="3.0"> </function> - <function name="BindBufferRange" alias="BindBufferRangeEXT"> + <function name="BindBufferRange" alias="BindBufferRangeEXT" es2="3.0"> <param name="target" type="GLenum"/> <param name="index" type="GLuint"/> <param name="buffer" type="GLuint"/> @@ -222,20 +222,20 @@ <param name="size" type="GLsizeiptr"/> </function> - <function name="BindBufferBase" alias="BindBufferBaseEXT"> + <function name="BindBufferBase" alias="BindBufferBaseEXT" es2="3.0"> <param name="target" type="GLenum"/> <param name="index" type="GLuint"/> <param name="buffer" type="GLuint"/> </function> - <function name="TransformFeedbackVaryings" alias="TransformFeedbackVaryingsEXT"> + <function name="TransformFeedbackVaryings" alias="TransformFeedbackVaryingsEXT" es2="3.0"> <param name="program" type="GLuint"/> <param name="count" type="GLsizei"/> <param name="varyings" type="const GLchar * const *"/> <param name="bufferMode" type="GLenum"/> </function> - <function name="GetTransformFeedbackVarying" alias="GetTransformFeedbackVaryingEXT"> + <function name="GetTransformFeedbackVarying" alias="GetTransformFeedbackVaryingEXT" es2="3.0"> <param name="program" type="GLuint"/> <param name="index" type="GLuint"/> <param name="bufSize" type="GLsizei"/> @@ -257,7 +257,7 @@ <!-- These functions alias ones from GL_EXT_gpu_shader4 --> - <function name="VertexAttribIPointer" alias="VertexAttribIPointerEXT"> + <function name="VertexAttribIPointer" alias="VertexAttribIPointerEXT" es2="3.0"> <param name="index" type="GLuint"/> <param name="size" type="GLint"/> <param name="type" type="GLenum"/> @@ -265,13 +265,13 @@ <param name="pointer" type="const GLvoid *"/> </function> - <function name="GetVertexAttribIiv" alias="GetVertexAttribIivEXT"> + <function name="GetVertexAttribIiv" alias="GetVertexAttribIivEXT" es2="3.0"> <param name="index" type="GLuint"/> <param name="pname" type="GLenum"/> <param name="params" type="GLint *"/> </function> - <function name="GetVertexAttribIuiv" alias="GetVertexAttribIuivEXT"> + <function name="GetVertexAttribIuiv" alias="GetVertexAttribIuivEXT" es2="3.0"> <param name="index" type="GLuint"/> <param name="pname" type="GLenum"/> <param name="params" type="GLuint *"/> @@ -295,7 +295,7 @@ <param name="z" type="GLint"/> </function> - <function name="VertexAttribI4i" alias="VertexAttribI4iEXT"> + <function name="VertexAttribI4i" alias="VertexAttribI4iEXT" es2="3.0"> <param name="index" type="GLuint"/> <param name="x" type="GLint"/> <param name="y" type="GLint"/> @@ -321,7 +321,7 @@ <param name="z" type="GLuint"/> </function> - <function name="VertexAttribI4ui" alias="VertexAttribI4uiEXT"> + <function name="VertexAttribI4ui" alias="VertexAttribI4uiEXT" es2="3.0"> <param name="index" type="GLuint"/> <param name="x" type="GLuint"/> <param name="y" type="GLuint"/> @@ -344,7 +344,7 @@ <param name="v" type="const GLint *"/> </function> - <function name="VertexAttribI4iv" alias="VertexAttribI4ivEXT"> + <function name="VertexAttribI4iv" alias="VertexAttribI4ivEXT" es2="3.0"> <param name="index" type="GLuint"/> <param name="v" type="const GLint *"/> </function> @@ -364,7 +364,7 @@ <param name="v" type="const GLuint *"/> </function> - <function name="VertexAttribI4uiv" alias="VertexAttribI4uivEXT"> + <function name="VertexAttribI4uiv" alias="VertexAttribI4uivEXT" es2="3.0"> <param name="index" type="GLuint"/> <param name="v" type="const GLuint *"/> </function> @@ -389,31 +389,31 @@ <param name="v" type="const GLushort *"/> </function> - <function name="GetUniformuiv" alias="GetUniformuivEXT"> + <function name="GetUniformuiv" alias="GetUniformuivEXT" es2="3.0"> <param name="program" type="GLuint"/> <param name="location" type="GLint"/> <param name="params" type="GLuint *"/> </function> - <function name="Uniform1ui" alias="Uniform1uiEXT"> + <function name="Uniform1ui" alias="Uniform1uiEXT" es2="3.0"> <param name="location" type="GLint"/> <param name="x" type="GLuint"/> </function> - <function name="Uniform2ui" alias="Uniform2uiEXT"> + <function name="Uniform2ui" alias="Uniform2uiEXT" es2="3.0"> <param name="location" type="GLint"/> <param name="x" type="GLuint"/> <param name="y" type="GLuint"/> </function> - <function name="Uniform3ui" alias="Uniform3uiEXT"> + <function name="Uniform3ui" alias="Uniform3uiEXT" es2="3.0"> <param name="location" type="GLint"/> <param name="x" type="GLuint"/> <param name="y" type="GLuint"/> <param name="z" type="GLuint"/> </function> - <function name="Uniform4ui" alias="Uniform4uiEXT"> + <function name="Uniform4ui" alias="Uniform4uiEXT" es2="3.0"> <param name="location" type="GLint"/> <param name="x" type="GLuint"/> <param name="y" type="GLuint"/> @@ -421,25 +421,25 @@ <param name="w" type="GLuint"/> </function> - <function name="Uniform1uiv" alias="Uniform1uivEXT"> + <function name="Uniform1uiv" alias="Uniform1uivEXT" es2="3.0"> <param name="location" type="GLint"/> <param name="count" type="GLsizei"/> <param name="value" type="const GLuint *"/> </function> - <function name="Uniform2uiv" alias="Uniform2uivEXT"> + <function name="Uniform2uiv" alias="Uniform2uivEXT" es2="3.0"> <param name="location" type="GLint"/> <param name="count" type="GLsizei"/> <param name="value" type="const GLuint *"/> </function> - <function name="Uniform3uiv" alias="Uniform3uivEXT"> + <function name="Uniform3uiv" alias="Uniform3uivEXT" es2="3.0"> <param name="location" type="GLint"/> <param name="count" type="GLsizei"/> <param name="value" type="const GLuint *"/> </function> - <function name="Uniform4uiv" alias="Uniform4uivEXT"> + <function name="Uniform4uiv" alias="Uniform4uivEXT" es2="3.0"> <param name="location" type="GLint"/> <param name="count" type="GLsizei"/> <param name="value" type="const GLuint *"/> @@ -541,14 +541,14 @@ <enum name="PRIMITIVE_RESTART" value="0x8F9D"/> <enum name="PRIMITIVE_RESTART_INDEX" value="0x8F9E"/> - <function name="DrawArraysInstanced" alias="DrawArraysInstancedARB"> + <function name="DrawArraysInstanced" alias="DrawArraysInstancedARB" es2="3.0"> <param name="mode" type="GLenum"/> <param name="first" type="GLint"/> <param name="count" type="GLsizei"/> <param name="primcount" type="GLsizei"/> </function> - <function name="DrawElementsInstanced" alias="DrawElementsInstancedARB"> + <function name="DrawElementsInstanced" alias="DrawElementsInstancedARB" es2="3.0"> <param name="mode" type="GLenum"/> <param name="count" type="GLsizei"/> <param name="type" type="GLenum"/> @@ -594,13 +594,13 @@ <enum name="MAX_FRAGMENT_INPUT_COMPONENTS" value="0x9125"/> <enum name="CONTEXT_PROFILE_MASK" value="0x9126"/> - <function name="GetInteger64i_v" offset="assign"> + <function name="GetInteger64i_v" offset="assign" es2="3.0"> <param name="cap" type="GLenum"/> <param name="index" type="GLuint"/> <param name="data" type="GLint64 *"/> </function> - <function name="GetBufferParameteri64v" offset="assign"> + <function name="GetBufferParameteri64v" offset="assign" es2="3.0"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="GLint64 *"/> @@ -624,7 +624,7 @@ <enum name="TEXTURE_SWIZZLE_A" value="0x8E45"/> <enum name="TEXTURE_SWIZZLE_RGBA" value="0x8E46"/> - <function name="VertexAttribDivisor" offset="assign"> + <function name="VertexAttribDivisor" offset="assign" es2="3.0"> <param name="index" type="GLuint"/> <param name="divisor" type="GLuint"/> </function> diff --git a/mesalib/src/mapi/glapi/gen/OES_EGL_image.xml b/mesalib/src/mapi/glapi/gen/OES_EGL_image.xml index 1cb43d49a..a995cad6c 100644 --- a/mesalib/src/mapi/glapi/gen/OES_EGL_image.xml +++ b/mesalib/src/mapi/glapi/gen/OES_EGL_image.xml @@ -5,12 +5,14 @@ <category name="GL_OES_EGL_image"> - <function name="EGLImageTargetTexture2DOES" offset="assign"> + <function name="EGLImageTargetTexture2DOES" offset="assign" es1="1.0" + es2="2.0"> <param name="target" type="GLenum"/> <param name="writeOffset" type="GLvoid *"/> </function> - <function name="EGLImageTargetRenderbufferStorageOES" offset="assign"> + <function name="EGLImageTargetRenderbufferStorageOES" offset="assign" + es1="1.0" es2="2.0"> <param name="target" type="GLenum"/> <param name="writeOffset" type="GLvoid *"/> </function> diff --git a/mesalib/src/mapi/glapi/gen/OES_fixed_point.xml b/mesalib/src/mapi/glapi/gen/OES_fixed_point.xml index ee408f4f1..974240c49 100644 --- a/mesalib/src/mapi/glapi/gen/OES_fixed_point.xml +++ b/mesalib/src/mapi/glapi/gen/OES_fixed_point.xml @@ -13,45 +13,52 @@ <type name="clampx" size="4" /> <!-- OpenGL ES 1.0 --> - <function name="AlphaFuncxOES" offset="assign" static_dispatch="false"> + <function name="AlphaFuncxOES" offset="assign" static_dispatch="false" + es1="1.0"> <param name="func" type="GLenum"/> <param name="ref" type="GLclampx"/> </function> - <function name="ClearColorxOES" offset="assign" static_dispatch="false"> + <function name="ClearColorxOES" offset="assign" static_dispatch="false" + es1="1.0"> <param name="red" type="GLclampx"/> <param name="green" type="GLclampx"/> <param name="blue" type="GLclampx"/> <param name="alpha" type="GLclampx"/> </function> - <function name="ClearDepthxOES" offset="assign" static_dispatch="false"> + <function name="ClearDepthxOES" offset="assign" static_dispatch="false" + es1="1.0"> <param name="depth" type="GLclampx"/> </function> - <function name="Color4xOES" offset="assign" static_dispatch="false"> + <function name="Color4xOES" offset="assign" static_dispatch="false" + es1="1.0"> <param name="red" type="GLfixed"/> <param name="green" type="GLfixed"/> <param name="blue" type="GLfixed"/> <param name="alpha" type="GLfixed"/> </function> - <function name="DepthRangexOES" offset="assign" static_dispatch="false"> + <function name="DepthRangexOES" offset="assign" static_dispatch="false" + es1="1.0"> <param name="zNear" type="GLclampx"/> <param name="zFar" type="GLclampx"/> </function> - <function name="FogxOES" offset="assign" static_dispatch="false"> + <function name="FogxOES" offset="assign" static_dispatch="false" es1="1.0"> <param name="pname" type="GLenum"/> <param name="param" type="GLfixed"/> </function> - <function name="FogxvOES" offset="assign" static_dispatch="false"> + <function name="FogxvOES" offset="assign" static_dispatch="false" + es1="1.0"> <param name="pname" type="GLenum"/> <param name="params" type="const GLfixed *" variable_param="pname"/> </function> - <function name="FrustumxOES" offset="assign" static_dispatch="false"> + <function name="FrustumxOES" offset="assign" static_dispatch="false" + es1="1.0"> <param name="left" type="GLfixed"/> <param name="right" type="GLfixed"/> <param name="bottom" type="GLfixed"/> @@ -60,53 +67,63 @@ <param name="zFar" type="GLfixed"/> </function> - <function name="LightModelxOES" offset="assign" static_dispatch="false"> + <function name="LightModelxOES" offset="assign" static_dispatch="false" + es1="1.0"> <param name="pname" type="GLenum"/> <param name="param" type="GLfixed"/> </function> - <function name="LightModelxvOES" offset="assign" static_dispatch="false"> + <function name="LightModelxvOES" offset="assign" static_dispatch="false" + es1="1.0"> <param name="pname" type="GLenum"/> <param name="params" type="const GLfixed *" variable_param="pname"/> </function> - <function name="LightxOES" offset="assign" static_dispatch="false"> + <function name="LightxOES" offset="assign" static_dispatch="false" + es1="1.0"> <param name="light" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="param" type="GLfixed"/> </function> - <function name="LightxvOES" offset="assign" static_dispatch="false"> + <function name="LightxvOES" offset="assign" static_dispatch="false" + es1="1.0"> <param name="light" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="const GLfixed *" variable_param="pname"/> </function> - <function name="LineWidthxOES" offset="assign" static_dispatch="false"> + <function name="LineWidthxOES" offset="assign" static_dispatch="false" + es1="1.0"> <param name="width" type="GLfixed"/> </function> - <function name="LoadMatrixxOES" offset="assign" static_dispatch="false"> + <function name="LoadMatrixxOES" offset="assign" static_dispatch="false" + es1="1.0"> <param name="m" type="const GLfixed *" count="16"/> </function> - <function name="MaterialxOES" offset="assign" static_dispatch="false"> + <function name="MaterialxOES" offset="assign" static_dispatch="false" + es1="1.0"> <param name="face" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="param" type="GLfixed"/> </function> - <function name="MaterialxvOES" offset="assign" static_dispatch="false"> + <function name="MaterialxvOES" offset="assign" static_dispatch="false" + es1="1.0"> <param name="face" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="const GLfixed *" variable_param="pname"/> </function> - <function name="MultMatrixxOES" offset="assign" static_dispatch="false"> + <function name="MultMatrixxOES" offset="assign" static_dispatch="false" + es1="1.0"> <param name="m" type="const GLfixed *" count="16"/> </function> - <function name="MultiTexCoord4xOES" offset="assign" static_dispatch="false"> + <function name="MultiTexCoord4xOES" offset="assign" static_dispatch="false" + es1="1.0"> <param name="target" type="GLenum"/> <param name="s" type="GLfixed"/> <param name="t" type="GLfixed"/> @@ -114,13 +131,15 @@ <param name="q" type="GLfixed"/> </function> - <function name="Normal3xOES" offset="assign" static_dispatch="false"> + <function name="Normal3xOES" offset="assign" static_dispatch="false" + es1="1.0"> <param name="nx" type="GLfixed"/> <param name="ny" type="GLfixed"/> <param name="nz" type="GLfixed"/> </function> - <function name="OrthoxOES" offset="assign" static_dispatch="false"> + <function name="OrthoxOES" offset="assign" static_dispatch="false" + es1="1.0"> <param name="left" type="GLfixed"/> <param name="right" type="GLfixed"/> <param name="bottom" type="GLfixed"/> @@ -129,127 +148,149 @@ <param name="zFar" type="GLfixed"/> </function> - <function name="PointSizexOES" offset="assign" static_dispatch="false"> + <function name="PointSizexOES" offset="assign" static_dispatch="false" + es1="1.0"> <param name="size" type="GLfixed"/> </function> - <function name="PolygonOffsetxOES" offset="assign" static_dispatch="false"> + <function name="PolygonOffsetxOES" offset="assign" static_dispatch="false" + es1="1.0"> <param name="factor" type="GLfixed"/> <param name="units" type="GLfixed"/> </function> - <function name="RotatexOES" offset="assign" static_dispatch="false"> + <function name="RotatexOES" offset="assign" static_dispatch="false" + es1="1.0"> <param name="angle" type="GLfixed"/> <param name="x" type="GLfixed"/> <param name="y" type="GLfixed"/> <param name="z" type="GLfixed"/> </function> - <function name="SampleCoveragexOES" offset="assign" static_dispatch="false"> + <function name="SampleCoveragexOES" offset="assign" static_dispatch="false" + es1="1.0"> <param name="value" type="GLclampx"/> <param name="invert" type="GLboolean"/> </function> - <function name="ScalexOES" offset="assign" static_dispatch="false"> + <function name="ScalexOES" offset="assign" static_dispatch="false" + es1="1.0"> <param name="x" type="GLfixed"/> <param name="y" type="GLfixed"/> <param name="z" type="GLfixed"/> </function> - <function name="TexEnvxOES" offset="assign" static_dispatch="false"> + <function name="TexEnvxOES" offset="assign" static_dispatch="false" + es1="1.0"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="param" type="GLfixed"/> </function> - <function name="TexEnvxvOES" offset="assign" static_dispatch="false"> + <function name="TexEnvxvOES" offset="assign" static_dispatch="false" + es1="1.0"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="const GLfixed *" variable_param="pname"/> </function> - <function name="TexParameterxOES" offset="assign" static_dispatch="false"> + <function name="TexParameterxOES" offset="assign" static_dispatch="false" + es1="1.0"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="param" type="GLfixed"/> </function> - <function name="TranslatexOES" offset="assign" static_dispatch="false"> + <function name="TranslatexOES" offset="assign" static_dispatch="false" + es1="1.0"> <param name="x" type="GLfixed"/> <param name="y" type="GLfixed"/> <param name="z" type="GLfixed"/> </function> <!-- OpenGL ES 1.1 --> - <function name="ClipPlanexOES" offset="assign" static_dispatch="false"> + <function name="ClipPlanexOES" offset="assign" static_dispatch="false" + es1="1.0"> <param name="plane" type="GLenum"/> <param name="equation" type="const GLfixed *" count="4"/> </function> - <function name="GetClipPlanexOES" offset="assign" static_dispatch="false"> + <function name="GetClipPlanexOES" offset="assign" static_dispatch="false" + es1="1.0"> <param name="plane" type="GLenum"/> <param name="equation" type="GLfixed *" output="true" count="4"/> </function> - <function name="GetFixedvOES" offset="assign" static_dispatch="false"> + <function name="GetFixedvOES" offset="assign" static_dispatch="false" + es1="1.0"> <param name="pname" type="GLenum"/> <param name="params" type="GLfixed *" output="true" variable_param="pname"/> </function> - <function name="GetLightxvOES" offset="assign" static_dispatch="false"> + <function name="GetLightxvOES" offset="assign" static_dispatch="false" + es1="1.0"> <param name="light" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="GLfixed *" output="true" variable_param="pname"/> </function> - <function name="GetMaterialxvOES" offset="assign" static_dispatch="false"> + <function name="GetMaterialxvOES" offset="assign" static_dispatch="false" + es1="1.0"> <param name="face" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="GLfixed *" output="true" variable_param="pname"/> </function> - <function name="GetTexEnvxvOES" offset="assign" static_dispatch="false"> + <function name="GetTexEnvxvOES" offset="assign" static_dispatch="false" + es1="1.0"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="GLfixed *" output="true" variable_param="pname"/> </function> - <function name="GetTexParameterxvOES" offset="assign" static_dispatch="false"> + <function name="GetTexParameterxvOES" offset="assign" + static_dispatch="false" es1="1.0"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="GLfixed *" output="true" variable_param="pname"/> </function> - <function name="PointParameterxOES" offset="assign" static_dispatch="false"> + <function name="PointParameterxOES" offset="assign" static_dispatch="false" + es1="1.0"> <param name="pname" type="GLenum"/> <param name="param" type="GLfixed"/> </function> - <function name="PointParameterxvOES" offset="assign" static_dispatch="false"> + <function name="PointParameterxvOES" offset="assign" + static_dispatch="false" es1="1.0"> <param name="pname" type="GLenum"/> <param name="params" type="const GLfixed *"/> </function> - <function name="TexParameterxvOES" offset="assign" static_dispatch="false"> + <function name="TexParameterxvOES" offset="assign" static_dispatch="false" + es1="1.0"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="const GLfixed *" variable_param="pname"/> </function> <!-- texgen --> - <function name="GetTexGenxvOES" offset="assign" static_dispatch="false"> + <function name="GetTexGenxvOES" offset="assign" static_dispatch="false" + es1="1.0"> <param name="coord" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="GLfixed *" output="true" variable_param="pname"/> </function> - <function name="TexGenxOES" offset="assign" static_dispatch="false"> + <function name="TexGenxOES" offset="assign" static_dispatch="false" + es1="1.0"> <param name="coord" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="param" type="GLint"/> </function> - <function name="TexGenxvOES" offset="assign" static_dispatch="false"> + <function name="TexGenxvOES" offset="assign" static_dispatch="false" + es1="1.0"> <param name="coord" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="const GLfixed *" variable_param="pname"/> diff --git a/mesalib/src/mapi/glapi/gen/OES_single_precision.xml b/mesalib/src/mapi/glapi/gen/OES_single_precision.xml index df8efc8f8..7d4744159 100644 --- a/mesalib/src/mapi/glapi/gen/OES_single_precision.xml +++ b/mesalib/src/mapi/glapi/gen/OES_single_precision.xml @@ -6,26 +6,31 @@ <OpenGLAPI> <category name="GL_OES_single_precision" number="293"> - <function name="ClearDepthfOES" alias="ClearDepthf" static_dispatch="false"> + <function name="ClearDepthfOES" alias="ClearDepthf" static_dispatch="false" + es1="1.0"> <param name="depth" type="GLclampf"/> </function> - <function name="ClipPlanefOES" offset="assign" static_dispatch="false"> + <function name="ClipPlanefOES" offset="assign" static_dispatch="false" + es1="1.0"> <param name="plane" type="GLenum"/> <param name="equation" type="const GLfloat *" count="4"/> </function> - <function name="DepthRangefOES" alias="DepthRangef" static_dispatch="false"> + <function name="DepthRangefOES" alias="DepthRangef" static_dispatch="false" + es1="1.0"> <param name="zNear" type="GLclampf"/> <param name="zFar" type="GLclampf"/> </function> - <function name="GetClipPlanefOES" offset="assign" static_dispatch="false"> + <function name="GetClipPlanefOES" offset="assign" static_dispatch="false" + es1="1.0"> <param name="plane" type="GLenum"/> <param name="equation" type="GLfloat *" output="true" count="4"/> </function> - <function name="FrustumfOES" offset="assign" static_dispatch="false"> + <function name="FrustumfOES" offset="assign" static_dispatch="false" + es1="1.0"> <param name="left" type="GLfloat"/> <param name="right" type="GLfloat"/> <param name="bottom" type="GLfloat"/> @@ -34,7 +39,8 @@ <param name="zFar" type="GLfloat"/> </function> - <function name="OrthofOES" offset="assign" static_dispatch="false"> + <function name="OrthofOES" offset="assign" static_dispatch="false" + es1="1.0"> <param name="left" type="GLfloat"/> <param name="right" type="GLfloat"/> <param name="bottom" type="GLfloat"/> diff --git a/mesalib/src/mapi/glapi/gen/es_EXT.xml b/mesalib/src/mapi/glapi/gen/es_EXT.xml index 9e735834d..1fdb4d591 100644 --- a/mesalib/src/mapi/glapi/gen/es_EXT.xml +++ b/mesalib/src/mapi/glapi/gen/es_EXT.xml @@ -10,7 +10,8 @@ <enum name="BLEND_EQUATION_RGB_OES" value="0x8009"/> <enum name="BLEND_EQUATION_ALPHA_OES" value="0x883D"/> - <function name="BlendEquationSeparateOES" alias="BlendEquationSeparateEXT" static_dispatch="false"> + <function name="BlendEquationSeparateOES" alias="BlendEquationSeparateEXT" + static_dispatch="false" es1="1.0"> <param name="modeRGB" type="GLenum"/> <param name="modeA" type="GLenum"/> </function> @@ -23,7 +24,8 @@ <enum name="BLEND_DST_ALPHA_OES" value="0x80CA"/> <enum name="BLEND_SRC_ALPHA_OES" value="0x80CB"/> - <function name="BlendFuncSeparateOES" alias="BlendFuncSeparateEXT" static_dispatch="false"> + <function name="BlendFuncSeparateOES" alias="BlendFuncSeparateEXT" + static_dispatch="false" es1="1.0"> <param name="sfactorRGB" type="GLenum"/> <param name="dfactorRGB" type="GLenum"/> <param name="sfactorAlpha" type="GLenum"/> @@ -38,7 +40,8 @@ <enum name="FUNC_SUBTRACT_OES" value="0x800A"/> <enum name="FUNC_REVERSE_SUBTRACT_OES" value="0x800B"/> - <function name="BlendEquationOES" alias="BlendEquation" static_dispatch="false"> + <function name="BlendEquationOES" alias="BlendEquation" + static_dispatch="false" es1="1.0"> <param name="mode" type="GLenum"/> </function> </category> @@ -69,7 +72,8 @@ <category name="GL_OES_draw_texture" number="7"> <enum name="TEXTURE_CROP_RECT_OES" value="0x8B9D"/> - <function name="DrawTexiOES" offset="assign" static_dispatch="false"> + <function name="DrawTexiOES" offset="assign" static_dispatch="false" + es1="1.0"> <param name="x" type="GLint"/> <param name="y" type="GLint"/> <param name="z" type="GLint"/> @@ -77,11 +81,13 @@ <param name="height" type="GLint"/> </function> - <function name="DrawTexivOES" offset="assign" static_dispatch="false"> + <function name="DrawTexivOES" offset="assign" static_dispatch="false" + es1="1.0"> <param name="coords" type="const GLint *" count="5"/> </function> - <function name="DrawTexfOES" offset="assign" static_dispatch="false"> + <function name="DrawTexfOES" offset="assign" static_dispatch="false" + es1="1.0"> <param name="x" type="GLfloat"/> <param name="y" type="GLfloat"/> <param name="z" type="GLfloat"/> @@ -89,11 +95,13 @@ <param name="height" type="GLfloat"/> </function> - <function name="DrawTexfvOES" offset="assign" static_dispatch="false"> + <function name="DrawTexfvOES" offset="assign" static_dispatch="false" + es1="1.0"> <param name="coords" type="const GLfloat *" count="5"/> </function> - <function name="DrawTexsOES" offset="assign" static_dispatch="false"> + <function name="DrawTexsOES" offset="assign" static_dispatch="false" + es1="1.0"> <param name="x" type="GLshort"/> <param name="y" type="GLshort"/> <param name="z" type="GLshort"/> @@ -101,11 +109,13 @@ <param name="height" type="GLshort"/> </function> - <function name="DrawTexsvOES" offset="assign" static_dispatch="false"> + <function name="DrawTexsvOES" offset="assign" static_dispatch="false" + es1="1.0"> <param name="coords" type="const GLshort *" count="5"/> </function> - <function name="DrawTexxOES" offset="assign" static_dispatch="false"> + <function name="DrawTexxOES" offset="assign" static_dispatch="false" + es1="1.0"> <param name="x" type="GLfixed"/> <param name="y" type="GLfixed"/> <param name="z" type="GLfixed"/> @@ -113,7 +123,8 @@ <param name="height" type="GLfixed"/> </function> - <function name="DrawTexxvOES" offset="assign" static_dispatch="false"> + <function name="DrawTexxvOES" offset="assign" static_dispatch="false" + es1="1.0"> <param name="coords" type="const GLfixed *" count="5"/> </function> @@ -166,39 +177,48 @@ <enum name="RENDERBUFFER_STENCIL_SIZE_OES" value="0x8D55"/> <enum name="RGB565_OES" value="0x8D62"/> - <function name="BindFramebufferOES" alias="BindFramebufferEXT" static_dispatch="false"> + <function name="BindFramebufferOES" alias="BindFramebufferEXT" + static_dispatch="false" es1="1.0"> <param name="target" type="GLenum"/> <param name="framebuffer" type="GLuint"/> </function> - <function name="BindRenderbufferOES" alias="BindRenderbufferEXT" static_dispatch="false"> + <function name="BindRenderbufferOES" alias="BindRenderbufferEXT" + static_dispatch="false" es1="1.0"> <param name="target" type="GLenum"/> <param name="renderbuffer" type="GLuint"/> </function> - <function name="CheckFramebufferStatusOES" alias="CheckFramebufferStatusEXT" static_dispatch="false"> + <function name="CheckFramebufferStatusOES" + alias="CheckFramebufferStatusEXT" static_dispatch="false" + es1="1.0"> <param name="target" type="GLenum"/> <return type="GLenum"/> </function> - <function name="DeleteFramebuffersOES" alias="DeleteFramebuffersEXT" static_dispatch="false"> + <function name="DeleteFramebuffersOES" alias="DeleteFramebuffersEXT" + static_dispatch="false" es1="1.0"> <param name="n" type="GLsizei" counter="true"/> <param name="framebuffers" type="const GLuint *" count="n"/> </function> - <function name="DeleteRenderbuffersOES" alias="DeleteRenderbuffersEXT" static_dispatch="false"> + <function name="DeleteRenderbuffersOES" alias="DeleteRenderbuffersEXT" + static_dispatch="false" es1="1.0"> <param name="n" type="GLsizei" counter="true"/> <param name="renderbuffers" type="const GLuint *" count="n"/> </function> - <function name="FramebufferRenderbufferOES" alias="FramebufferRenderbufferEXT" static_dispatch="false"> + <function name="FramebufferRenderbufferOES" + alias="FramebufferRenderbufferEXT" static_dispatch="false" + es1="1.0"> <param name="target" type="GLenum"/> <param name="attachment" type="GLenum"/> <param name="renderbuffertarget" type="GLenum"/> <param name="renderbuffer" type="GLuint"/> </function> - <function name="FramebufferTexture2DOES" alias="FramebufferTexture2DEXT" static_dispatch="false"> + <function name="FramebufferTexture2DOES" alias="FramebufferTexture2DEXT" + static_dispatch="false" es1="1.0"> <param name="target" type="GLenum"/> <param name="attachment" type="GLenum"/> <param name="textarget" type="GLenum"/> @@ -206,44 +226,54 @@ <param name="level" type="GLint"/> </function> - <function name="GenerateMipmapOES" alias="GenerateMipmapEXT" static_dispatch="false"> + <function name="GenerateMipmapOES" alias="GenerateMipmapEXT" + static_dispatch="false" es1="1.0"> <param name="target" type="GLenum"/> </function> - <function name="GenFramebuffersOES" alias="GenFramebuffersEXT" static_dispatch="false"> + <function name="GenFramebuffersOES" alias="GenFramebuffersEXT" + static_dispatch="false" es1="1.0"> <param name="n" type="GLsizei" counter="true"/> <param name="framebuffers" type="GLuint *" count="n" output="true"/> </function> - <function name="GenRenderbuffersOES" alias="GenRenderbuffersEXT" static_dispatch="false"> + <function name="GenRenderbuffersOES" alias="GenRenderbuffersEXT" + static_dispatch="false" es1="1.0"> <param name="n" type="GLsizei" counter="true"/> <param name="renderbuffers" type="GLuint *" count="n" output="true"/> </function> - <function name="GetFramebufferAttachmentParameterivOES" alias="GetFramebufferAttachmentParameterivEXT" static_dispatch="false"> + <function name="GetFramebufferAttachmentParameterivOES" + alias="GetFramebufferAttachmentParameterivEXT" + static_dispatch="false" es1="1.0"> <param name="target" type="GLenum"/> <param name="attachment" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="GLint *" output="true"/> </function> - <function name="GetRenderbufferParameterivOES" alias="GetRenderbufferParameterivEXT" static_dispatch="false"> + <function name="GetRenderbufferParameterivOES" + alias="GetRenderbufferParameterivEXT" static_dispatch="false" + es1="1.0"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="GLint *" output="true"/> </function> - <function name="IsFramebufferOES" alias="IsFramebufferEXT" static_dispatch="false"> + <function name="IsFramebufferOES" alias="IsFramebufferEXT" + static_dispatch="false" es1="1.0"> <param name="framebuffer" type="GLuint"/> <return type="GLboolean"/> </function> - <function name="IsRenderbufferOES" alias="IsRenderbufferEXT" static_dispatch="false"> + <function name="IsRenderbufferOES" alias="IsRenderbufferEXT" + static_dispatch="false" es1="1.0"> <param name="renderbuffer" type="GLuint"/> <return type="GLboolean"/> </function> - <function name="RenderbufferStorageOES" alias="RenderbufferStorageEXT" static_dispatch="false"> + <function name="RenderbufferStorageOES" alias="RenderbufferStorageEXT" + static_dispatch="false" es1="1.0"> <param name="target" type="GLenum"/> <param name="internalformat" type="GLenum"/> <param name="width" type="GLsizei"/> @@ -308,7 +338,8 @@ <enum name="POINT_SIZE_ARRAY_OES" value="0x8B9C"/> <enum name="POINT_SIZE_ARRAY_BUFFER_BINDING_OES" value="0x8B9F"/> - <function name="PointSizePointerOES" offset="assign" static_dispatch="false"> + <function name="PointSizePointerOES" offset="assign" + static_dispatch="false" es1="1.0"> <param name="type" type="GLenum"/> <param name="stride" type="GLsizei"/> <param name="pointer" type="const GLvoid *"/> @@ -323,7 +354,8 @@ <!-- optional for es1.0 --> <category name="GL_OES_query_matrix" number="16"> - <function name="QueryMatrixxOES" offset="assign" static_dispatch="false"> + <function name="QueryMatrixxOES" offset="assign" static_dispatch="false" + es1="1.0"> <param name="mantissa" type="GLfixed *" count="16" /> <param name="exponent" type="GLint *" count="16" /> <return type="GLbitfield"/> @@ -352,37 +384,43 @@ <enum name="MAX_CUBE_MAP_TEXTURE_SIZE_OES" value="0x851C"/> <enum name="TEXTURE_GEN_STR_OES" value="0x8D60"/> - <function name="GetTexGenfvOES" alias="GetTexGenfv" static_dispatch="false"> + <function name="GetTexGenfvOES" alias="GetTexGenfv" static_dispatch="false" + es1="1.0"> <param name="coord" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="GLfloat *" output="true" variable_param="pname"/> </function> - <function name="GetTexGenivOES" alias="GetTexGeniv" static_dispatch="false"> + <function name="GetTexGenivOES" alias="GetTexGeniv" static_dispatch="false" + es1="1.0"> <param name="coord" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="GLint *" output="true" variable_param="pname"/> </function> - <function name="TexGenfOES" alias="TexGenf" static_dispatch="false"> + <function name="TexGenfOES" alias="TexGenf" static_dispatch="false" + es1="1.0"> <param name="coord" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="param" type="GLfloat"/> </function> - <function name="TexGenfvOES" alias="TexGenfv" static_dispatch="false"> + <function name="TexGenfvOES" alias="TexGenfv" static_dispatch="false" + es1="1.0"> <param name="coord" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="const GLfloat *" variable_param="pname"/> </function> - <function name="TexGeniOES" alias="TexGeni" static_dispatch="false"> + <function name="TexGeniOES" alias="TexGeni" static_dispatch="false" + es1="1.0"> <param name="coord" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="param" type="GLint"/> </function> - <function name="TexGenivOES" alias="TexGeniv" static_dispatch="false"> + <function name="TexGenivOES" alias="TexGeniv" static_dispatch="false" + es1="1.0"> <param name="coord" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="const GLint *" variable_param="pname"/> @@ -417,19 +455,22 @@ <enum name="BUFFER_MAPPED_OES" value="0x88BC"/> <enum name="BUFFER_MAP_POINTER_OES" value="0x88BD"/> - <function name="GetBufferPointervOES" alias="GetBufferPointervARB" static_dispatch="false"> + <function name="GetBufferPointervOES" alias="GetBufferPointervARB" + static_dispatch="false" es1="1.0" es2="2.0"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="GLvoid **"/> </function> - <function name="MapBufferOES" alias="MapBufferARB" static_dispatch="false"> + <function name="MapBufferOES" alias="MapBufferARB" static_dispatch="false" + es1="1.0" es2="2.0"> <param name="target" type="GLenum"/> <param name="access" type="GLenum"/> <return type="GLvoid *"/> </function> - <function name="UnmapBufferOES" alias="UnmapBufferARB" static_dispatch="false"> + <function name="UnmapBufferOES" alias="UnmapBufferARB" + static_dispatch="false" es1="1.0" es2="2.0"> <param name="target" type="GLenum"/> <return type="GLboolean"/> </function> @@ -460,7 +501,8 @@ <enum name="SAMPLER_3D_OES" value="0x8B5F"/> <enum name="FRAMEBUFFER_ATTACHMENT_TEXTURE_3D_ZOFFSET_OES" value="0x8CD4"/> - <function name="CompressedTexImage3DOES" alias="CompressedTexImage3DARB" static_dispatch="false"> + <function name="CompressedTexImage3DOES" alias="CompressedTexImage3DARB" + static_dispatch="false" es2="2.0"> <param name="target" type="GLenum"/> <param name="level" type="GLint"/> <param name="internalformat" type="GLenum"/> @@ -472,7 +514,9 @@ <param name="data" type="const GLvoid *" count="imageSize"/> </function> - <function name="CompressedTexSubImage3DOES" alias="CompressedTexSubImage3DARB" static_dispatch="false"> + <function name="CompressedTexSubImage3DOES" + alias="CompressedTexSubImage3DARB" static_dispatch="false" + es2="2.0"> <param name="target" type="GLenum"/> <param name="level" type="GLint"/> <param name="xoffset" type="GLint"/> @@ -486,7 +530,8 @@ <param name="data" type="const GLvoid *" count="imageSize"/> </function> - <function name="CopyTexSubImage3DOES" alias="CopyTexSubImage3D" static_dispatch="false"> + <function name="CopyTexSubImage3DOES" alias="CopyTexSubImage3D" + static_dispatch="false" es2="2.0"> <param name="target" type="GLenum"/> <param name="level" type="GLint"/> <param name="xoffset" type="GLint"/> @@ -498,7 +543,8 @@ <param name="height" type="GLsizei"/> </function> - <function name="FramebufferTexture3DOES" alias="FramebufferTexture3DEXT" static_dispatch="false"> + <function name="FramebufferTexture3DOES" alias="FramebufferTexture3DEXT" + static_dispatch="false" es2="2.0"> <param name="target" type="GLenum"/> <param name="attachment" type="GLenum"/> <param name="textarget" type="GLenum"/> @@ -507,7 +553,8 @@ <param name="zoffset" type="GLint"/> </function> - <function name="TexImage3DOES" alias="TexImage3D" static_dispatch="false"> + <function name="TexImage3DOES" alias="TexImage3D" static_dispatch="false" + es2="2.0"> <param name="target" type="GLenum"/> <param name="level" type="GLint"/> <param name="internalformat" type="GLenum"/> @@ -520,7 +567,8 @@ <param name="pixels" type="const GLvoid *" img_width="width" img_height="height" img_depth="depth" img_format="format" img_type="type" img_target="target" img_null_flag="true" img_pad_dimensions="true"/> </function> - <function name="TexSubImage3DOES" alias="TexSubImage3D" static_dispatch="false"> + <function name="TexSubImage3DOES" alias="TexSubImage3D" + static_dispatch="false" es2="2.0"> <param name="target" type="GLenum"/> <param name="level" type="GLint"/> <param name="xoffset" type="GLint"/> @@ -578,7 +626,8 @@ <enum name="NUM_PROGRAM_BINARY_FORMATS_OES" value="0x87FE"/> <enum name="PROGRAM_BINARY_FORMATS_OES" value="0x87FF"/> - <function name="GetProgramBinaryOES" alias="GetProgramBinary" static_dispatch="false"> + <function name="GetProgramBinaryOES" alias="GetProgramBinary" + static_dispatch="false" es2="2.0"> <param name="program" type="GLuint"/> <param name="bufSize" type="GLsizei"/> <param name="length" type="GLsizei *"/> @@ -586,7 +635,8 @@ <param name="binary" type="GLvoid *"/> </function> - <function name="ProgramBinaryOES" alias="ProgramBinary" static_dispatch="false"> + <function name="ProgramBinaryOES" alias="ProgramBinary" + static_dispatch="false" es2="2.0"> <param name="program" type="GLuint"/> <param name="binaryFormat" type="GLenum"/> <param name="binary" type="const GLvoid *"/> @@ -621,21 +671,22 @@ <!-- 71. GL_OES_vertex_array_object --> <category name="GL_OES_vertex_array_object" number="71"> - <function name="BindVertexArrayOES" alias="BindVertexArray"> + <function name="BindVertexArrayOES" alias="BindVertexArray" es2="2.0"> <param name="array" type="GLuint"/> </function> - <function name="DeleteVertexArraysOES" alias="DeleteVertexArraysAPPLE"> + <function name="DeleteVertexArraysOES" alias="DeleteVertexArraysAPPLE" + es2="2.0"> <param name="n" type="GLsizei"/> <param name="arrays" type="const GLuint *" count="n"/> </function> - <function name="GenVertexArraysOES" alias="GenVertexArrays"> + <function name="GenVertexArraysOES" alias="GenVertexArrays" es2="2.0"> <param name="n" type="GLsizei"/> <param name="arrays" type="GLuint *" output="true" count="n"/> </function> - <function name="IsVertexArrayOES" alias="IsVertexArrayAPPLE"> + <function name="IsVertexArrayOES" alias="IsVertexArrayAPPLE" es2="2.0"> <param name="array" type="GLuint"/> <return type="GLboolean"/> </function> @@ -710,7 +761,7 @@ <size name="Get" mode="get"/> </enum> - <function name="DrawBuffersNV" alias="DrawBuffersARB"> + <function name="DrawBuffersNV" alias="DrawBuffersARB" es2="2.0"> <param name="n" type="GLsizei" counter="true"/> <param name="bufs" type="const GLenum *" count="n"/> </function> @@ -718,7 +769,7 @@ <!-- 93. GL_NV_read_buffer --> <category name="NV_read_buffer"> - <function name="ReadBufferNV" alias="ReadBuffer"> + <function name="ReadBufferNV" alias="ReadBuffer" es2="2.0"> <param name="mode" type="GLenum"/> </function> </category> @@ -737,4 +788,30 @@ <enum name="COMPRESSED_RGBA_S3TC_DXT5_ANGLE" value="0x83F3"/> </category> +<!-- 121. GL_EXT_map_buffer_range --> +<category name="GL_EXT_map_buffer_range" number="121"> + <enum name="MAP_READ_BIT_EXT" value="0x0001"/> + <enum name="MAP_WRITE_BIT_EXT" value="0x0002"/> + <enum name="MAP_INVALIDATE_RANGE_BIT_EXT" value="0x0004"/> + <enum name="MAP_INVALIDATE_BUFFER_BIT_EXT" value="0x0008"/> + <enum name="MAP_FLUSH_EXPLICIT_BIT_EXT" value="0x0010"/> + <enum name="MAP_UNSYNCHRONIZED_BIT_EXT" value="0x0020"/> + + <function name="MapBufferRangeEXT" alias="MapBufferRange" es1="1.0" + es2="2.0"> + <param name="target" type="GLenum"/> + <param name="offset" type="GLintptr"/> + <param name="size" type="GLsizeiptr"/> + <param name="length" type="GLbitfield"/> + <return type="GLvoid *"/> + </function> + + <function name="FlushMappedBufferRangeEXT" alias="FlushMappedBufferRange" + es1="1.0" es2="2.0"> + <param name="target" type="GLenum"/> + <param name="offset" type="GLintptr"/> + <param name="length" type="GLsizeiptr"/> + </function> +</category> + </OpenGLAPI> diff --git a/mesalib/src/mapi/glapi/gen/glX_XML.py b/mesalib/src/mapi/glapi/gen/glX_XML.py index 975321a76..03a35b740 100644 --- a/mesalib/src/mapi/glapi/gen/glX_XML.py +++ b/mesalib/src/mapi/glapi/gen/glX_XML.py @@ -543,7 +543,7 @@ class glx_function(gl_XML.gl_function): return not self.ignore and (self.offset != -1) and (self.glx_rop or self.glx_sop or self.glx_vendorpriv or self.vectorequiv or self.client_handcode) -class glx_function_iterator: +class glx_function_iterator(object): """Class to iterate over a list of glXFunctions""" def __init__(self, context): diff --git a/mesalib/src/mapi/glapi/gen/glX_proto_size.py b/mesalib/src/mapi/glapi/gen/glX_proto_size.py index 7db816b2c..fdb355d4d 100644 --- a/mesalib/src/mapi/glapi/gen/glX_proto_size.py +++ b/mesalib/src/mapi/glapi/gen/glX_proto_size.py @@ -30,7 +30,7 @@ import license import sys, getopt, copy, string -class glx_enum_function: +class glx_enum_function(object): def __init__(self, func_name, enum_dict): self.name = func_name self.mode = 1 diff --git a/mesalib/src/mapi/glapi/gen/gl_API.dtd b/mesalib/src/mapi/glapi/gen/gl_API.dtd index 149a433ca..db33500c0 100644 --- a/mesalib/src/mapi/glapi/gen/gl_API.dtd +++ b/mesalib/src/mapi/glapi/gen/gl_API.dtd @@ -35,7 +35,9 @@ alias NMTOKEN #IMPLIED offset CDATA #IMPLIED static_dispatch (true | false) "true" - vectorequiv NMTOKEN #IMPLIED> + vectorequiv NMTOKEN #IMPLIED + es1 CDATA "none" + es2 CDATA "none"> <!ATTLIST size name NMTOKEN #REQUIRED count NMTOKEN #IMPLIED mode (get | set) "set"> diff --git a/mesalib/src/mapi/glapi/gen/gl_API.xml b/mesalib/src/mapi/glapi/gen/gl_API.xml index f83a7a718..a46d6131c 100644 --- a/mesalib/src/mapi/glapi/gen/gl_API.xml +++ b/mesalib/src/mapi/glapi/gen/gl_API.xml @@ -1275,7 +1275,7 @@ <glx rop="15"/> </function> - <function name="Color4f" offset="29" vectorequiv="Color4fv"> + <function name="Color4f" offset="29" vectorequiv="Color4fv" es1="1.0"> <param name="red" type="GLfloat"/> <param name="green" type="GLfloat"/> <param name="blue" type="GLfloat"/> @@ -1311,7 +1311,7 @@ <glx rop="18"/> </function> - <function name="Color4ub" offset="35" vectorequiv="Color4ubv"> + <function name="Color4ub" offset="35" vectorequiv="Color4ubv" es1="1.1"> <param name="red" type="GLubyte"/> <param name="green" type="GLubyte"/> <param name="blue" type="GLubyte"/> @@ -1418,7 +1418,7 @@ <glx rop="29"/> </function> - <function name="Normal3f" offset="56" vectorequiv="Normal3fv"> + <function name="Normal3f" offset="56" vectorequiv="Normal3fv" es1="1.0"> <param name="nx" type="GLfloat"/> <param name="ny" type="GLfloat"/> <param name="nz" type="GLfloat"/> @@ -1947,18 +1947,18 @@ <glx rop="78"/> </function> - <function name="CullFace" offset="152"> + <function name="CullFace" offset="152" es1="1.0" es2="2.0"> <param name="mode" type="GLenum"/> <glx rop="79"/> </function> - <function name="Fogf" offset="153"> + <function name="Fogf" offset="153" es1="1.0"> <param name="pname" type="GLenum"/> <param name="param" type="GLfloat"/> <glx rop="80"/> </function> - <function name="Fogfv" offset="154"> + <function name="Fogfv" offset="154" es1="1.0"> <param name="pname" type="GLenum"/> <param name="params" type="const GLfloat *" variable_param="pname"/> <glx rop="81"/> @@ -1976,25 +1976,25 @@ <glx rop="83"/> </function> - <function name="FrontFace" offset="157"> + <function name="FrontFace" offset="157" es1="1.0" es2="2.0"> <param name="mode" type="GLenum"/> <glx rop="84"/> </function> - <function name="Hint" offset="158"> + <function name="Hint" offset="158" es1="1.0" es2="2.0"> <param name="target" type="GLenum"/> <param name="mode" type="GLenum"/> <glx rop="85"/> </function> - <function name="Lightf" offset="159"> + <function name="Lightf" offset="159" es1="1.0"> <param name="light" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="param" type="GLfloat"/> <glx rop="86"/> </function> - <function name="Lightfv" offset="160"> + <function name="Lightfv" offset="160" es1="1.0"> <param name="light" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="const GLfloat *" variable_param="pname"/> @@ -2015,13 +2015,13 @@ <glx rop="89"/> </function> - <function name="LightModelf" offset="163"> + <function name="LightModelf" offset="163" es1="1.0"> <param name="pname" type="GLenum"/> <param name="param" type="GLfloat"/> <glx rop="90"/> </function> - <function name="LightModelfv" offset="164"> + <function name="LightModelfv" offset="164" es1="1.0"> <param name="pname" type="GLenum"/> <param name="params" type="const GLfloat *" variable_param="pname"/> <glx rop="91"/> @@ -2045,19 +2045,19 @@ <glx rop="94"/> </function> - <function name="LineWidth" offset="168"> + <function name="LineWidth" offset="168" es1="1.0" es2="2.0"> <param name="width" type="GLfloat"/> <glx rop="95"/> </function> - <function name="Materialf" offset="169"> + <function name="Materialf" offset="169" es1="1.0"> <param name="face" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="param" type="GLfloat"/> <glx rop="96"/> </function> - <function name="Materialfv" offset="170"> + <function name="Materialfv" offset="170" es1="1.0"> <param name="face" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="const GLfloat *" variable_param="pname"/> @@ -2078,7 +2078,7 @@ <glx rop="99"/> </function> - <function name="PointSize" offset="173"> + <function name="PointSize" offset="173" es1="1.0"> <param name="size" type="GLfloat"/> <glx rop="100"/> </function> @@ -2094,7 +2094,7 @@ <glx rop="102"/> </function> - <function name="Scissor" offset="176"> + <function name="Scissor" offset="176" es1="1.0" es2="2.0"> <param name="x" type="GLint"/> <param name="y" type="GLint"/> <param name="width" type="GLsizei"/> @@ -2102,33 +2102,33 @@ <glx rop="103"/> </function> - <function name="ShadeModel" offset="177"> + <function name="ShadeModel" offset="177" es1="1.0"> <param name="mode" type="GLenum"/> <glx rop="104"/> </function> - <function name="TexParameterf" offset="178"> + <function name="TexParameterf" offset="178" es1="1.0" es2="2.0"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="param" type="GLfloat"/> <glx rop="105"/> </function> - <function name="TexParameterfv" offset="179"> + <function name="TexParameterfv" offset="179" es1="1.1" es2="2.0"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="const GLfloat *" variable_param="pname"/> <glx rop="106"/> </function> - <function name="TexParameteri" offset="180"> + <function name="TexParameteri" offset="180" es1="1.1" es2="2.0"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="param" type="GLint"/> <glx rop="107"/> </function> - <function name="TexParameteriv" offset="181"> + <function name="TexParameteriv" offset="181" es1="1.1" es2="2.0"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="const GLint *" variable_param="pname"/> @@ -2147,7 +2147,7 @@ <glx rop="109" large="true"/> </function> - <function name="TexImage2D" offset="183"> + <function name="TexImage2D" offset="183" es1="1.0" es2="2.0"> <param name="target" type="GLenum"/> <param name="level" type="GLint"/> <param name="internalformat" type="GLint"/> @@ -2160,28 +2160,28 @@ <glx rop="110" large="true"/> </function> - <function name="TexEnvf" offset="184"> + <function name="TexEnvf" offset="184" es1="1.0"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="param" type="GLfloat"/> <glx rop="111"/> </function> - <function name="TexEnvfv" offset="185"> + <function name="TexEnvfv" offset="185" es1="1.0"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="const GLfloat *" variable_param="pname"/> <glx rop="112"/> </function> - <function name="TexEnvi" offset="186"> + <function name="TexEnvi" offset="186" es1="1.1"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="param" type="GLint"/> <glx rop="113"/> </function> - <function name="TexEnviv" offset="187"> + <function name="TexEnviv" offset="187" es1="1.1"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="const GLint *" variable_param="pname"/> @@ -2277,7 +2277,7 @@ <glx rop="126"/> </function> - <function name="Clear" offset="203"> + <function name="Clear" offset="203" es1="1.0" es2="2.0"> <param name="mask" type="GLbitfield"/> <glx rop="127"/> </function> @@ -2295,7 +2295,7 @@ <glx rop="129"/> </function> - <function name="ClearColor" offset="206"> + <function name="ClearColor" offset="206" es1="1.0" es2="2.0"> <param name="red" type="GLclampf"/> <param name="green" type="GLclampf"/> <param name="blue" type="GLclampf"/> @@ -2303,7 +2303,7 @@ <glx rop="130"/> </function> - <function name="ClearStencil" offset="207"> + <function name="ClearStencil" offset="207" es1="1.0" es2="2.0"> <param name="s" type="GLint"/> <glx rop="131"/> </function> @@ -2313,12 +2313,12 @@ <glx rop="132"/> </function> - <function name="StencilMask" offset="209"> + <function name="StencilMask" offset="209" es1="1.0" es2="2.0"> <param name="mask" type="GLuint"/> <glx rop="133"/> </function> - <function name="ColorMask" offset="210"> + <function name="ColorMask" offset="210" es1="1.0" es2="2.0"> <param name="red" type="GLboolean"/> <param name="green" type="GLboolean"/> <param name="blue" type="GLboolean"/> @@ -2326,7 +2326,7 @@ <glx rop="134"/> </function> - <function name="DepthMask" offset="211"> + <function name="DepthMask" offset="211" es1="1.0" es2="2.0"> <param name="flag" type="GLboolean"/> <glx rop="135"/> </function> @@ -2342,21 +2342,21 @@ <glx rop="137"/> </function> - <function name="Disable" offset="214"> + <function name="Disable" offset="214" es1="1.0" es2="2.0"> <param name="cap" type="GLenum"/> <glx rop="138" handcode="client"/> </function> - <function name="Enable" offset="215"> + <function name="Enable" offset="215" es1="1.0" es2="2.0"> <param name="cap" type="GLenum"/> <glx rop="139" handcode="client"/> </function> - <function name="Finish" offset="216"> + <function name="Finish" offset="216" es1="1.0" es2="2.0"> <glx sop="108" handcode="true"/> </function> - <function name="Flush" offset="217"> + <function name="Flush" offset="217" es1="1.0" es2="2.0"> <glx sop="142" handcode="true"/> </function> @@ -2516,38 +2516,38 @@ <glx rop="158"/> </function> - <function name="AlphaFunc" offset="240"> + <function name="AlphaFunc" offset="240" es1="1.0"> <param name="func" type="GLenum"/> <param name="ref" type="GLclampf"/> <glx rop="159"/> </function> - <function name="BlendFunc" offset="241"> + <function name="BlendFunc" offset="241" es1="1.0" es2="2.0"> <param name="sfactor" type="GLenum"/> <param name="dfactor" type="GLenum"/> <glx rop="160"/> </function> - <function name="LogicOp" offset="242"> + <function name="LogicOp" offset="242" es1="1.0"> <param name="opcode" type="GLenum"/> <glx rop="161"/> </function> - <function name="StencilFunc" offset="243"> + <function name="StencilFunc" offset="243" es1="1.0" es2="2.0"> <param name="func" type="GLenum"/> <param name="ref" type="GLint"/> <param name="mask" type="GLuint"/> <glx rop="162"/> </function> - <function name="StencilOp" offset="244"> + <function name="StencilOp" offset="244" es1="1.0" es2="2.0"> <param name="fail" type="GLenum"/> <param name="zfail" type="GLenum"/> <param name="zpass" type="GLenum"/> <glx rop="163"/> </function> - <function name="DepthFunc" offset="245"> + <function name="DepthFunc" offset="245" es1="1.0" es2="2.0"> <param name="func" type="GLenum"/> <glx rop="164"/> </function> @@ -2576,7 +2576,7 @@ <glx sop="109" handcode="client"/> </function> - <function name="PixelStorei" offset="250"> + <function name="PixelStorei" offset="250" es1="1.0" es2="2.0"> <param name="pname" type="GLenum"/> <param name="param" type="GLint"/> <glx sop="110" handcode="client"/> @@ -2603,7 +2603,7 @@ <glx rop="170" large="true"/> </function> - <function name="ReadBuffer" offset="254"> + <function name="ReadBuffer" offset="254" es2="3.0"> <param name="mode" type="GLenum"/> <glx rop="171"/> </function> @@ -2617,7 +2617,7 @@ <glx rop="172"/> </function> - <function name="ReadPixels" offset="256"> + <function name="ReadPixels" offset="256" es1="1.0" es2="2.0"> <param name="x" type="GLint"/> <param name="y" type="GLint"/> <param name="width" type="GLsizei"/> @@ -2637,7 +2637,7 @@ <glx rop="173" large="true"/> </function> - <function name="GetBooleanv" offset="258"> + <function name="GetBooleanv" offset="258" es1="1.1" es2="2.0"> <param name="pname" type="GLenum"/> <param name="params" type="GLboolean *" output="true" variable_param="pname"/> <glx sop="112" handcode="client"/> @@ -2655,24 +2655,24 @@ <glx sop="114" handcode="client"/> </function> - <function name="GetError" offset="261"> + <function name="GetError" offset="261" es1="1.0" es2="2.0"> <return type="GLenum"/> <glx sop="115" handcode="client"/> </function> - <function name="GetFloatv" offset="262"> + <function name="GetFloatv" offset="262" es1="1.1" es2="2.0"> <param name="pname" type="GLenum"/> <param name="params" type="GLfloat *" output="true" variable_param="pname"/> <glx sop="116" handcode="client"/> </function> - <function name="GetIntegerv" offset="263"> + <function name="GetIntegerv" offset="263" es1="1.0" es2="2.0"> <param name="pname" type="GLenum"/> <param name="params" type="GLint *" output="true" variable_param="pname"/> <glx sop="117" handcode="client"/> </function> - <function name="GetLightfv" offset="264"> + <function name="GetLightfv" offset="264" es1="1.1"> <param name="light" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="GLfloat *" output="true" variable_param="pname"/> @@ -2707,7 +2707,7 @@ <glx sop="122"/> </function> - <function name="GetMaterialfv" offset="269"> + <function name="GetMaterialfv" offset="269" es1="1.1"> <param name="face" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="GLfloat *" output="true" variable_param="pname"/> @@ -2744,20 +2744,20 @@ <glx sop="128"/> </function> - <function name="GetString" offset="275"> + <function name="GetString" offset="275" es1="1.0" es2="2.0"> <param name="name" type="GLenum"/> <return type="const GLubyte *"/> <glx sop="129" handcode="true"/> </function> - <function name="GetTexEnvfv" offset="276"> + <function name="GetTexEnvfv" offset="276" es1="1.1"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="GLfloat *" output="true" variable_param="pname"/> <glx sop="130"/> </function> - <function name="GetTexEnviv" offset="277"> + <function name="GetTexEnviv" offset="277" es1="1.1"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="GLint *" output="true" variable_param="pname"/> @@ -2794,14 +2794,14 @@ <glx sop="135" dimensions_in_reply="true"/> </function> - <function name="GetTexParameterfv" offset="282"> + <function name="GetTexParameterfv" offset="282" es1="1.1" es2="2.0"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="GLfloat *" output="true" variable_param="pname"/> <glx sop="136"/> </function> - <function name="GetTexParameteriv" offset="283"> + <function name="GetTexParameteriv" offset="283" es1="1.1" es2="2.0"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="GLint *" output="true" variable_param="pname"/> @@ -2824,7 +2824,7 @@ <glx sop="139"/> </function> - <function name="IsEnabled" offset="286"> + <function name="IsEnabled" offset="286" es1="1.1" es2="2.0"> <param name="cap" type="GLenum"/> <return type="GLboolean"/> <glx sop="140" handcode="client"/> @@ -2852,11 +2852,11 @@ <glx rop="175"/> </function> - <function name="LoadIdentity" offset="290"> + <function name="LoadIdentity" offset="290" es1="1.0"> <glx rop="176"/> </function> - <function name="LoadMatrixf" offset="291"> + <function name="LoadMatrixf" offset="291" es1="1.0"> <param name="m" type="const GLfloat *" count="16"/> <glx rop="177"/> </function> @@ -2866,12 +2866,12 @@ <glx rop="178"/> </function> - <function name="MatrixMode" offset="293"> + <function name="MatrixMode" offset="293" es1="1.0"> <param name="mode" type="GLenum"/> <glx rop="179"/> </function> - <function name="MultMatrixf" offset="294"> + <function name="MultMatrixf" offset="294" es1="1.0"> <param name="m" type="const GLfloat *" count="16"/> <glx rop="180"/> </function> @@ -2891,11 +2891,11 @@ <glx rop="182"/> </function> - <function name="PopMatrix" offset="297"> + <function name="PopMatrix" offset="297" es1="1.0"> <glx rop="183"/> </function> - <function name="PushMatrix" offset="298"> + <function name="PushMatrix" offset="298" es1="1.0"> <glx rop="184"/> </function> @@ -2907,7 +2907,7 @@ <glx rop="185"/> </function> - <function name="Rotatef" offset="300"> + <function name="Rotatef" offset="300" es1="1.0"> <param name="angle" type="GLfloat"/> <param name="x" type="GLfloat"/> <param name="y" type="GLfloat"/> @@ -2922,7 +2922,7 @@ <glx rop="187"/> </function> - <function name="Scalef" offset="302"> + <function name="Scalef" offset="302" es1="1.0"> <param name="x" type="GLfloat"/> <param name="y" type="GLfloat"/> <param name="z" type="GLfloat"/> @@ -2936,14 +2936,14 @@ <glx rop="189"/> </function> - <function name="Translatef" offset="304"> + <function name="Translatef" offset="304" es1="1.0"> <param name="x" type="GLfloat"/> <param name="y" type="GLfloat"/> <param name="z" type="GLfloat"/> <glx rop="190"/> </function> - <function name="Viewport" offset="305"> + <function name="Viewport" offset="305" es1="1.0" es2="2.0"> <param name="x" type="GLint"/> <param name="y" type="GLint"/> <param name="width" type="GLsizei"/> @@ -3131,7 +3131,7 @@ <glx handcode="true"/> </function> - <function name="ColorPointer" offset="308"> + <function name="ColorPointer" offset="308" es1="1.0"> <param name="size" type="GLint"/> <param name="type" type="GLenum"/> <param name="stride" type="GLsizei"/> @@ -3139,19 +3139,19 @@ <glx handcode="true"/> </function> - <function name="DisableClientState" offset="309"> + <function name="DisableClientState" offset="309" es1="1.0"> <param name="array" type="GLenum"/> <glx handcode="true"/> </function> - <function name="DrawArrays" offset="310"> + <function name="DrawArrays" offset="310" es1="1.0" es2="2.0"> <param name="mode" type="GLenum"/> <param name="first" type="GLint"/> <param name="count" type="GLsizei"/> <glx rop="193" handcode="true"/> </function> - <function name="DrawElements" offset="311"> + <function name="DrawElements" offset="311" es1="1.0" es2="2.0"> <param name="mode" type="GLenum"/> <param name="count" type="GLsizei"/> <param name="type" type="GLenum"/> @@ -3165,12 +3165,12 @@ <glx handcode="true"/> </function> - <function name="EnableClientState" offset="313"> + <function name="EnableClientState" offset="313" es1="1.0"> <param name="array" type="GLenum"/> <glx handcode="true"/> </function> - <function name="GetPointerv" offset="329"> + <function name="GetPointerv" offset="329" es1="1.1"> <param name="pname" type="GLenum"/> <param name="params" type="GLvoid **" output="true"/> <glx handcode="true"/> @@ -3190,14 +3190,14 @@ <glx handcode="true"/> </function> - <function name="NormalPointer" offset="318"> + <function name="NormalPointer" offset="318" es1="1.0"> <param name="type" type="GLenum"/> <param name="stride" type="GLsizei"/> <param name="pointer" type="const GLvoid *"/> <glx handcode="true"/> </function> - <function name="TexCoordPointer" offset="320"> + <function name="TexCoordPointer" offset="320" es1="1.0"> <param name="size" type="GLint"/> <param name="type" type="GLenum"/> <param name="stride" type="GLsizei"/> @@ -3205,7 +3205,7 @@ <glx handcode="true"/> </function> - <function name="VertexPointer" offset="321"> + <function name="VertexPointer" offset="321" es1="1.0"> <param name="size" type="GLint"/> <param name="type" type="GLenum"/> <param name="stride" type="GLsizei"/> @@ -3213,7 +3213,7 @@ <glx handcode="true"/> </function> - <function name="PolygonOffset" offset="319"> + <function name="PolygonOffset" offset="319" es1="1.0" es2="2.0"> <param name="factor" type="GLfloat"/> <param name="units" type="GLfloat"/> <glx rop="192"/> @@ -3230,7 +3230,7 @@ <glx rop="4119"/> </function> - <function name="CopyTexImage2D" offset="324"> + <function name="CopyTexImage2D" offset="324" es1="1.0" es2="2.0"> <param name="target" type="GLenum"/> <param name="level" type="GLint"/> <param name="internalformat" type="GLenum"/> @@ -3252,7 +3252,7 @@ <glx rop="4121"/> </function> - <function name="CopyTexSubImage2D" offset="326"> + <function name="CopyTexSubImage2D" offset="326" es1="1.0" es2="2.0"> <param name="target" type="GLenum"/> <param name="level" type="GLint"/> <param name="xoffset" type="GLint"/> @@ -3276,7 +3276,7 @@ <glx rop="4099" large="true"/> </function> - <function name="TexSubImage2D" offset="333"> + <function name="TexSubImage2D" offset="333" es1="1.0" es2="2.0"> <param name="target" type="GLenum"/> <param name="level" type="GLint"/> <param name="xoffset" type="GLint"/> @@ -3298,25 +3298,25 @@ <glx sop="143" handcode="client" always_array="true"/> </function> - <function name="BindTexture" offset="307"> + <function name="BindTexture" offset="307" es1="1.0" es2="2.0"> <param name="target" type="GLenum"/> <param name="texture" type="GLuint"/> <glx rop="4117"/> </function> - <function name="DeleteTextures" offset="327"> + <function name="DeleteTextures" offset="327" es1="1.0" es2="2.0"> <param name="n" type="GLsizei" counter="true"/> <param name="textures" type="const GLuint *" count="n"/> <glx sop="144"/> </function> - <function name="GenTextures" offset="328"> + <function name="GenTextures" offset="328" es1="1.0" es2="2.0"> <param name="n" type="GLsizei" counter="true"/> <param name="textures" type="GLuint *" output="true" count="n"/> <glx sop="145" always_array="true"/> </function> - <function name="IsTexture" offset="330"> + <function name="IsTexture" offset="330" es1="1.1" es2="2.0"> <param name="texture" type="GLuint"/> <return type="GLboolean"/> <glx sop="146"/> @@ -3695,7 +3695,7 @@ </enum> - <function name="BlendColor" offset="336"> + <function name="BlendColor" offset="336" es2="2.0"> <param name="red" type="GLclampf"/> <param name="green" type="GLclampf"/> <param name="blue" type="GLclampf"/> @@ -3703,12 +3703,12 @@ <glx rop="4096"/> </function> - <function name="BlendEquation" offset="337"> + <function name="BlendEquation" offset="337" es2="2.0"> <param name="mode" type="GLenum"/> <glx rop="4097"/> </function> - <function name="DrawRangeElements" offset="338"> + <function name="DrawRangeElements" offset="338" es2="3.0"> <param name="mode" type="GLenum"/> <param name="start" type="GLuint"/> <param name="end" type="GLuint"/> @@ -3975,7 +3975,7 @@ <glx rop="4113"/> </function> - <function name="TexImage3D" offset="371"> + <function name="TexImage3D" offset="371" es2="3.0"> <param name="target" type="GLenum"/> <param name="level" type="GLint"/> <param name="internalformat" type="GLint"/> @@ -3989,7 +3989,7 @@ <glx rop="4114" large="true"/> </function> - <function name="TexSubImage3D" offset="372"> + <function name="TexSubImage3D" offset="372" es2="3.0"> <param name="target" type="GLenum"/> <param name="level" type="GLint"/> <param name="xoffset" type="GLint"/> @@ -4005,7 +4005,7 @@ <glx rop="4115" large="true"/> </function> - <function name="CopyTexSubImage3D" offset="373"> + <function name="CopyTexSubImage3D" offset="373" es2="3.0"> <param name="target" type="GLenum"/> <param name="level" type="GLint"/> <param name="xoffset" type="GLint"/> @@ -4232,11 +4232,13 @@ <enum name="DOT3_RGB" value="0x86AE"/> <enum name="DOT3_RGBA" value="0x86AF"/> - <function name="ActiveTexture" alias="ActiveTextureARB"> + <function name="ActiveTexture" alias="ActiveTextureARB" es1="1.0" + es2="2.0"> <param name="texture" type="GLenum"/> </function> - <function name="ClientActiveTexture" alias="ClientActiveTextureARB"> + <function name="ClientActiveTexture" alias="ClientActiveTextureARB" + es1="1.0"> <param name="texture" type="GLenum"/> </function> @@ -4385,7 +4387,7 @@ <param name="v" type="const GLdouble *"/> </function> - <function name="MultiTexCoord4f" alias="MultiTexCoord4fARB"> + <function name="MultiTexCoord4f" alias="MultiTexCoord4fARB" es1="1.0"> <param name="target" type="GLenum"/> <param name="s" type="GLfloat"/> <param name="t" type="GLfloat"/> @@ -4440,12 +4442,13 @@ <param name="m" type="const GLdouble *"/> </function> - <function name="SampleCoverage" alias="SampleCoverageARB"> + <function name="SampleCoverage" alias="SampleCoverageARB" es1="1.0" + es2="2.0"> <param name="value" type="GLclampf"/> <param name="invert" type="GLboolean"/> </function> - <function name="CompressedTexImage3D" alias="CompressedTexImage3DARB"> + <function name="CompressedTexImage3D" alias="CompressedTexImage3DARB" es2="3.0"> <param name="target" type="GLenum"/> <param name="level" type="GLint"/> <param name="internalformat" type="GLenum"/> @@ -4457,7 +4460,8 @@ <param name="data" type="const GLvoid *"/> </function> - <function name="CompressedTexImage2D" alias="CompressedTexImage2DARB"> + <function name="CompressedTexImage2D" alias="CompressedTexImage2DARB" + es1="1.0" es2="2.0"> <param name="target" type="GLenum"/> <param name="level" type="GLint"/> <param name="internalformat" type="GLenum"/> @@ -4478,7 +4482,7 @@ <param name="data" type="const GLvoid *"/> </function> - <function name="CompressedTexSubImage3D" alias="CompressedTexSubImage3DARB"> + <function name="CompressedTexSubImage3D" alias="CompressedTexSubImage3DARB" es2="3.0"> <param name="target" type="GLenum"/> <param name="level" type="GLint"/> <param name="xoffset" type="GLint"/> @@ -4492,7 +4496,8 @@ <param name="data" type="const GLvoid *"/> </function> - <function name="CompressedTexSubImage2D" alias="CompressedTexSubImage2DARB"> + <function name="CompressedTexSubImage2D" alias="CompressedTexSubImage2DARB" + es1="1.0" es2="2.0"> <param name="target" type="GLenum"/> <param name="level" type="GLint"/> <param name="xoffset" type="GLint"/> @@ -4636,7 +4641,7 @@ </enum> <enum name="COMPARE_R_TO_TEXTURE" value="0x884E"/> - <function name="BlendFuncSeparate" alias="BlendFuncSeparateEXT"> + <function name="BlendFuncSeparate" alias="BlendFuncSeparateEXT" es2="2.0"> <param name="sfactorRGB" type="GLenum"/> <param name="dfactorRGB" type="GLenum"/> <param name="sfactorAlpha" type="GLenum"/> @@ -4680,12 +4685,12 @@ <param name="primcount" type="GLsizei"/> </function> - <function name="PointParameterf" alias="PointParameterfEXT"> + <function name="PointParameterf" alias="PointParameterfEXT" es1="1.1"> <param name="pname" type="GLenum"/> <param name="param" type="GLfloat"/> </function> - <function name="PointParameterfv" alias="PointParameterfvEXT"> + <function name="PointParameterfv" alias="PointParameterfvEXT" es1="1.1"> <param name="pname" type="GLenum"/> <param name="params" type="const GLfloat *"/> </function> @@ -4929,42 +4934,45 @@ <type name="intptr" size="4" glx_name="CARD32"/> <type name="sizeiptr" size="4" unsigned="true" glx_name="CARD32"/> - <function name="BindBuffer" alias="BindBufferARB"> + <function name="BindBuffer" alias="BindBufferARB" es1="1.1" es2="2.0"> <param name="target" type="GLenum"/> <param name="buffer" type="GLuint"/> </function> - <function name="BufferData" alias="BufferDataARB"> + <function name="BufferData" alias="BufferDataARB" es1="1.1" es2="2.0"> <param name="target" type="GLenum"/> <param name="size" type="GLsizeiptr"/> <param name="data" type="const GLvoid *"/> <param name="usage" type="GLenum"/> </function> - <function name="BufferSubData" alias="BufferSubDataARB"> + <function name="BufferSubData" alias="BufferSubDataARB" es1="1.1" + es2="2.0"> <param name="target" type="GLenum"/> <param name="offset" type="GLintptr"/> <param name="size" type="GLsizeiptr"/> <param name="data" type="const GLvoid *"/> </function> - <function name="DeleteBuffers" alias="DeleteBuffersARB"> + <function name="DeleteBuffers" alias="DeleteBuffersARB" es1="1.1" + es2="2.0"> <param name="n" type="GLsizei"/> <param name="buffer" type="const GLuint *"/> </function> - <function name="GenBuffers" alias="GenBuffersARB"> + <function name="GenBuffers" alias="GenBuffersARB" es1="1.1" es2="2.0"> <param name="n" type="GLsizei" counter="true"/> <param name="buffer" type="GLuint *" output="true" count="n"/> </function> - <function name="GetBufferParameteriv" alias="GetBufferParameterivARB"> + <function name="GetBufferParameteriv" alias="GetBufferParameterivARB" + es1="1.1" es2="2.0"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="GLint *" output="true" variable_param="pname"/> </function> - <function name="GetBufferPointerv" alias="GetBufferPointervARB"> + <function name="GetBufferPointerv" alias="GetBufferPointervARB" es2="3.0"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="GLvoid **" output="true"/> @@ -4977,7 +4985,7 @@ <param name="data" type="GLvoid *" output="true"/> </function> - <function name="IsBuffer" alias="IsBufferARB"> + <function name="IsBuffer" alias="IsBufferARB" es1="1.1" es2="2.0"> <param name="buffer" type="GLuint"/> <return type="GLboolean"/> </function> @@ -4988,36 +4996,36 @@ <return type="GLvoid *"/> </function> - <function name="UnmapBuffer" alias="UnmapBufferARB"> + <function name="UnmapBuffer" alias="UnmapBufferARB" es2="3.0"> <param name="target" type="GLenum"/> <return type="GLboolean"/> </function> - <function name="GenQueries" alias="GenQueriesARB"> + <function name="GenQueries" alias="GenQueriesARB" es2="3.0"> <param name="n" type="GLsizei" counter="true"/> <param name="ids" type="GLuint *" output="true" count="n"/> </function> - <function name="DeleteQueries" alias="DeleteQueriesARB"> + <function name="DeleteQueries" alias="DeleteQueriesARB" es2="3.0"> <param name="n" type="GLsizei"/> <param name="ids" type="const GLuint *"/> </function> - <function name="IsQuery" alias="IsQueryARB"> + <function name="IsQuery" alias="IsQueryARB" es2="3.0"> <param name="id" type="GLuint"/> <return type="GLboolean"/> </function> - <function name="BeginQuery" alias="BeginQueryARB"> + <function name="BeginQuery" alias="BeginQueryARB" es2="3.0"> <param name="target" type="GLenum"/> <param name="id" type="GLuint"/> </function> - <function name="EndQuery" alias="EndQueryARB"> + <function name="EndQuery" alias="EndQueryARB" es2="3.0"> <param name="target" type="GLenum"/> </function> - <function name="GetQueryiv" alias="GetQueryivARB"> + <function name="GetQueryiv" alias="GetQueryivARB" es2="3.0"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="GLint *" output="true" variable_param="pname"/> @@ -5029,7 +5037,7 @@ <param name="params" type="GLint *" output="true" variable_param="pname"/> </function> - <function name="GetQueryObjectuiv" alias="GetQueryObjectuivARB"> + <function name="GetQueryObjectuiv" alias="GetQueryObjectuivARB" es2="3.0"> <param name="id" type="GLuint"/> <param name="pname" type="GLenum"/> <param name="params" type="GLuint *" output="true" variable_param="pname"/> @@ -5131,17 +5139,18 @@ <enum name="STENCIL_BACK_VALUE_MASK" value="0x8CA4"/> <enum name="STENCIL_BACK_WRITEMASK" value="0x8CA5"/> - <function name="BlendEquationSeparate" alias="BlendEquationSeparateEXT"> + <function name="BlendEquationSeparate" alias="BlendEquationSeparateEXT" + es2="2.0"> <param name="modeRGB" type="GLenum"/> <param name="modeA" type="GLenum"/> </function> - <function name="DrawBuffers" alias="DrawBuffersARB"> + <function name="DrawBuffers" alias="DrawBuffersARB" es2="3.0"> <param name="n" type="GLsizei" counter="true"/> <param name="bufs" type="const GLenum *" count="n"/> </function> - <function name="StencilFuncSeparate" offset="assign"> + <function name="StencilFuncSeparate" offset="assign" es2="2.0"> <param name="face" type="GLenum"/> <param name="func" type="GLenum"/> <param name="ref" type="GLint"/> @@ -5149,7 +5158,7 @@ <glx ignore="true"/> </function> - <function name="StencilOpSeparate" offset="assign"> + <function name="StencilOpSeparate" offset="assign" es2="2.0"> <param name="face" type="GLenum"/> <param name="sfail" type="GLenum"/> <param name="zfail" type="GLenum"/> @@ -5157,68 +5166,71 @@ <glx ignore="true"/> </function> - <function name="StencilMaskSeparate" offset="assign"> + <function name="StencilMaskSeparate" offset="assign" es2="2.0"> <param name="face" type="GLenum"/> <param name="mask" type="GLuint"/> <glx ignore="true"/> </function> - <function name="AttachShader" offset="assign"> + <function name="AttachShader" offset="assign" es2="2.0"> <param name="program" type="GLuint"/> <param name="shader" type="GLuint"/> <glx ignore="true"/> </function> - <function name="BindAttribLocation" alias="BindAttribLocationARB"> + <function name="BindAttribLocation" alias="BindAttribLocationARB" + es2="2.0"> <param name="program" type="GLuint"/> <param name="index" type="GLuint"/> <param name="name" type="const GLchar *"/> <glx ignore="true"/> </function> - <function name="CompileShader" alias="CompileShaderARB"> + <function name="CompileShader" alias="CompileShaderARB" es2="2.0"> <param name="shader" type="GLuint"/> <glx ignore="true"/> </function> - <function name="CreateProgram" offset="assign"> + <function name="CreateProgram" offset="assign" es2="2.0"> <return type="GLuint"/> <glx ignore="true"/> </function> - <function name="CreateShader" offset="assign"> + <function name="CreateShader" offset="assign" es2="2.0"> <param name="type" type="GLenum"/> <return type="GLuint"/> <glx ignore="true"/> </function> - <function name="DeleteProgram" offset="assign"> + <function name="DeleteProgram" offset="assign" es2="2.0"> <param name="program" type="GLuint"/> <glx ignore="true"/> </function> - <function name="DeleteShader" offset="assign"> + <function name="DeleteShader" offset="assign" es2="2.0"> <param name="program" type="GLuint"/> <glx ignore="true"/> </function> - <function name="DetachShader" offset="assign"> + <function name="DetachShader" offset="assign" es2="2.0"> <param name="program" type="GLuint"/> <param name="shader" type="GLuint"/> <glx ignore="true"/> </function> - <function name="DisableVertexAttribArray" alias="DisableVertexAttribArrayARB"> + <function name="DisableVertexAttribArray" + alias="DisableVertexAttribArrayARB" es2="2.0"> <param name="index" type="GLuint"/> <glx ignore="true"/> </function> - <function name="EnableVertexAttribArray" alias="EnableVertexAttribArrayARB"> + <function name="EnableVertexAttribArray" alias="EnableVertexAttribArrayARB" + es2="2.0"> <param name="index" type="GLuint"/> <glx ignore="true"/> </function> - <function name="GetActiveAttrib" alias="GetActiveAttribARB"> + <function name="GetActiveAttrib" alias="GetActiveAttribARB" es2="2.0"> <param name="program" type="GLuint"/> <param name="index" type="GLuint"/> <param name="bufSize" type="GLsizei "/> @@ -5229,7 +5241,7 @@ <glx ignore="true"/> </function> - <function name="GetActiveUniform" alias="GetActiveUniformARB"> + <function name="GetActiveUniform" alias="GetActiveUniformARB" es2="2.0"> <param name="program" type="GLuint"/> <param name="index" type="GLuint"/> <param name="bufSize" type="GLsizei"/> @@ -5240,7 +5252,7 @@ <glx ignore="true"/> </function> - <function name="GetAttachedShaders" offset="assign"> + <function name="GetAttachedShaders" offset="assign" es2="2.0"> <param name="program" type="GLuint"/> <param name="maxCount" type="GLsizei"/> <param name="count" type="GLsizei *" output="true"/> @@ -5248,21 +5260,21 @@ <glx ignore="true"/> </function> - <function name="GetAttribLocation" alias="GetAttribLocationARB"> + <function name="GetAttribLocation" alias="GetAttribLocationARB" es2="2.0"> <param name="program" type="GLuint"/> <param name="name" type="const GLchar *"/> <return type="GLint"/> <glx ignore="true"/> </function> - <function name="GetProgramiv" offset="assign"> + <function name="GetProgramiv" offset="assign" es2="2.0"> <param name="program" type="GLuint"/> <param name="pname" type="GLenum"/> <param name="params" type="GLint *"/> <glx ignore="true"/> </function> - <function name="GetProgramInfoLog" offset="assign"> + <function name="GetProgramInfoLog" offset="assign" es2="2.0"> <param name="program" type="GLuint"/> <param name="bufSize" type="GLsizei"/> <param name="length" type="GLsizei *"/> @@ -5270,14 +5282,14 @@ <glx ignore="true"/> </function> - <function name="GetShaderiv" offset="assign"> + <function name="GetShaderiv" offset="assign" es2="2.0"> <param name="shader" type="GLuint"/> <param name="pname" type="GLenum"/> <param name="params" type="GLint *"/> <glx ignore="true"/> </function> - <function name="GetShaderInfoLog" offset="assign"> + <function name="GetShaderInfoLog" offset="assign" es2="2.0"> <param name="shader" type="GLuint"/> <param name="bufSize" type="GLsizei"/> <param name="length" type="GLsizei *"/> @@ -5285,7 +5297,7 @@ <glx ignore="true"/> </function> - <function name="GetShaderSource" alias="GetShaderSourceARB"> + <function name="GetShaderSource" alias="GetShaderSourceARB" es2="2.0"> <param name="shader" type="GLuint"/> <param name="bufSize" type="GLsizei"/> <param name="length" type="GLsizei *" output="true"/> @@ -5293,21 +5305,22 @@ <glx ignore="true"/> </function> - <function name="GetUniformLocation" alias="GetUniformLocationARB"> + <function name="GetUniformLocation" alias="GetUniformLocationARB" + es2="2.0"> <param name="program" type="GLuint"/> <param name="name" type="const GLchar *"/> <return type="GLint"/> <glx ignore="true"/> </function> - <function name="GetUniformfv" alias="GetUniformfvARB"> + <function name="GetUniformfv" alias="GetUniformfvARB" es2="2.0"> <param name="program" type="GLuint"/> <param name="location" type="GLint"/> <param name="params" type="GLfloat *" output="true"/> <glx ignore="true"/> </function> - <function name="GetUniformiv" alias="GetUniformivARB"> + <function name="GetUniformiv" alias="GetUniformivARB" es2="2.0"> <param name="program" type="GLuint"/> <param name="location" type="GLint"/> <param name="params" type="GLint *"/> @@ -5321,45 +5334,46 @@ <glx ignore="true"/> </function> - <function name="GetVertexAttribfv" alias="GetVertexAttribfvARB"> + <function name="GetVertexAttribfv" alias="GetVertexAttribfvARB" es2="2.0"> <param name="index" type="GLuint"/> <param name="pname" type="GLenum"/> <param name="params" type="GLfloat *" output="true" variable_param="pname"/> <glx ignore="true"/> </function> - <function name="GetVertexAttribiv" alias="GetVertexAttribivARB"> + <function name="GetVertexAttribiv" alias="GetVertexAttribivARB" es2="2.0"> <param name="index" type="GLuint"/> <param name="pname" type="GLenum"/> <param name="params" type="GLint *" output="true" variable_param="pname"/> <glx ignore="true"/> </function> - <function name="GetVertexAttribPointerv" alias="GetVertexAttribPointervNV"> + <function name="GetVertexAttribPointerv" alias="GetVertexAttribPointervNV" + es2="2.0"> <param name="index" type="GLuint"/> <param name="pname" type="GLenum"/> <param name="pointer" type="GLvoid **" output="true"/> <glx ignore="true"/> </function> - <function name="IsProgram" offset="assign"> + <function name="IsProgram" offset="assign" es2="2.0"> <param name="program" type="GLuint"/> <return type="GLboolean"/> <glx ignore="true"/> </function> - <function name="IsShader" offset="assign"> + <function name="IsShader" offset="assign" es2="2.0"> <param name="shader" type="GLuint"/> <return type="GLboolean"/> <glx ignore="true"/> </function> - <function name="LinkProgram" alias="LinkProgramARB"> + <function name="LinkProgram" alias="LinkProgramARB" es2="2.0"> <param name="program" type="GLuint"/> <glx ignore="true"/> </function> - <function name="ShaderSource" alias="ShaderSourceARB"> + <function name="ShaderSource" alias="ShaderSourceARB" es2="2.0"> <param name="shader" type="GLuint"/> <param name="count" type="GLsizei"/> <param name="string" type="const GLchar * const *"/> @@ -5367,30 +5381,30 @@ <glx ignore="true"/> </function> - <function name="UseProgram" alias="UseProgramObjectARB"> + <function name="UseProgram" alias="UseProgramObjectARB" es2="2.0"> <param name="program" type="GLuint"/> <glx ignore="true"/> </function> - <function name="Uniform1f" alias="Uniform1fARB"> + <function name="Uniform1f" alias="Uniform1fARB" es2="2.0"> <param name="location" type="GLint"/> <param name="v0" type="GLfloat"/> <glx ignore="true"/> </function> - <function name="Uniform2f" alias="Uniform2fARB"> + <function name="Uniform2f" alias="Uniform2fARB" es2="2.0"> <param name="location" type="GLint"/> <param name="v0" type="GLfloat"/> <param name="v1" type="GLfloat"/> <glx ignore="true"/> </function> - <function name="Uniform3f" alias="Uniform3fARB"> + <function name="Uniform3f" alias="Uniform3fARB" es2="2.0"> <param name="location" type="GLint"/> <param name="v0" type="GLfloat"/> <param name="v1" type="GLfloat"/> <param name="v2" type="GLfloat"/> <glx ignore="true"/> </function> - <function name="Uniform4f" alias="Uniform4fARB"> + <function name="Uniform4f" alias="Uniform4fARB" es2="2.0"> <param name="location" type="GLint"/> <param name="v0" type="GLfloat"/> <param name="v1" type="GLfloat"/> @@ -5399,25 +5413,25 @@ <glx ignore="true"/> </function> - <function name="Uniform1i" alias="Uniform1iARB"> + <function name="Uniform1i" alias="Uniform1iARB" es2="2.0"> <param name="location" type="GLint"/> <param name="v0" type="GLint"/> <glx ignore="true"/> </function> - <function name="Uniform2i" alias="Uniform2iARB"> + <function name="Uniform2i" alias="Uniform2iARB" es2="2.0"> <param name="location" type="GLint"/> <param name="v0" type="GLint"/> <param name="v1" type="GLint"/> <glx ignore="true"/> </function> - <function name="Uniform3i" alias="Uniform3iARB"> + <function name="Uniform3i" alias="Uniform3iARB" es2="2.0"> <param name="location" type="GLint"/> <param name="v0" type="GLint"/> <param name="v1" type="GLint"/> <param name="v2" type="GLint"/> <glx ignore="true"/> </function> - <function name="Uniform4i" alias="Uniform4iARB"> + <function name="Uniform4i" alias="Uniform4iARB" es2="2.0"> <param name="location" type="GLint"/> <param name="v0" type="GLint"/> <param name="v1" type="GLint"/> @@ -5426,71 +5440,71 @@ <glx ignore="true"/> </function> - <function name="Uniform1fv" alias="Uniform1fvARB"> + <function name="Uniform1fv" alias="Uniform1fvARB" es2="2.0"> <param name="location" type="GLint"/> <param name="count" type="GLsizei"/> <param name="value" type="const GLfloat *"/> <glx ignore="true"/> </function> - <function name="Uniform2fv" alias="Uniform2fvARB"> + <function name="Uniform2fv" alias="Uniform2fvARB" es2="2.0"> <param name="location" type="GLint"/> <param name="count" type="GLsizei"/> <param name="value" type="const GLfloat *"/> <glx ignore="true"/> </function> - <function name="Uniform3fv" alias="Uniform3fvARB"> + <function name="Uniform3fv" alias="Uniform3fvARB" es2="2.0"> <param name="location" type="GLint"/> <param name="count" type="GLsizei"/> <param name="value" type="const GLfloat *"/> <glx ignore="true"/> </function> - <function name="Uniform4fv" alias="Uniform4fvARB"> + <function name="Uniform4fv" alias="Uniform4fvARB" es2="2.0"> <param name="location" type="GLint"/> <param name="count" type="GLsizei"/> <param name="value" type="const GLfloat *"/> <glx ignore="true"/> </function> - <function name="Uniform1iv" alias="Uniform1ivARB"> + <function name="Uniform1iv" alias="Uniform1ivARB" es2="2.0"> <param name="location" type="GLint"/> <param name="count" type="GLsizei"/> <param name="value" type="const GLint *"/> <glx ignore="true"/> </function> - <function name="Uniform2iv" alias="Uniform2ivARB"> + <function name="Uniform2iv" alias="Uniform2ivARB" es2="2.0"> <param name="location" type="GLint"/> <param name="count" type="GLsizei"/> <param name="value" type="const GLint *"/> <glx ignore="true"/> </function> - <function name="Uniform3iv" alias="Uniform3ivARB"> + <function name="Uniform3iv" alias="Uniform3ivARB" es2="2.0"> <param name="location" type="GLint"/> <param name="count" type="GLsizei"/> <param name="value" type="const GLint *"/> <glx ignore="true"/> </function> - <function name="Uniform4iv" alias="Uniform4ivARB"> + <function name="Uniform4iv" alias="Uniform4ivARB" es2="2.0"> <param name="location" type="GLint"/> <param name="count" type="GLsizei"/> <param name="value" type="const GLint *"/> <glx ignore="true"/> </function> - <function name="UniformMatrix2fv" alias="UniformMatrix2fvARB"> + <function name="UniformMatrix2fv" alias="UniformMatrix2fvARB" es2="2.0"> <param name="location" type="GLint"/> <param name="count" type="GLsizei"/> <param name="transpose" type="GLboolean"/> <param name="value" type="const GLfloat *"/> <glx ignore="true"/> </function> - <function name="UniformMatrix3fv" alias="UniformMatrix3fvARB"> + <function name="UniformMatrix3fv" alias="UniformMatrix3fvARB" es2="2.0"> <param name="location" type="GLint"/> <param name="count" type="GLsizei"/> <param name="transpose" type="GLboolean"/> <param name="value" type="const GLfloat *"/> <glx ignore="true"/> </function> - <function name="UniformMatrix4fv" alias="UniformMatrix4fvARB"> + <function name="UniformMatrix4fv" alias="UniformMatrix4fvARB" es2="2.0"> <param name="location" type="GLint"/> <param name="count" type="GLsizei"/> <param name="transpose" type="GLboolean"/> @@ -5498,7 +5512,7 @@ <glx ignore="true"/> </function> - <function name="ValidateProgram" alias="ValidateProgramARB"> + <function name="ValidateProgram" alias="ValidateProgramARB" es2="2.0"> <param name="program" type="GLuint"/> <glx ignore="true"/> </function> @@ -5511,11 +5525,11 @@ <param name="index" type="GLuint"/> <param name="v" type="const GLdouble *"/> </function> - <function name="VertexAttrib1f" alias="VertexAttrib1fARB"> + <function name="VertexAttrib1f" alias="VertexAttrib1fARB" es2="2.0"> <param name="index" type="GLuint"/> <param name="x" type="GLfloat"/> </function> - <function name="VertexAttrib1fv" alias="VertexAttrib1fvARB"> + <function name="VertexAttrib1fv" alias="VertexAttrib1fvARB" es2="2.0"> <param name="index" type="GLuint"/> <param name="v" type="const GLfloat *"/> </function> @@ -5537,12 +5551,12 @@ <param name="index" type="GLuint"/> <param name="v" type="const GLdouble *"/> </function> - <function name="VertexAttrib2f" alias="VertexAttrib2fARB"> + <function name="VertexAttrib2f" alias="VertexAttrib2fARB" es2="2.0"> <param name="index" type="GLuint"/> <param name="x" type="GLfloat"/> <param name="y" type="GLfloat"/> </function> - <function name="VertexAttrib2fv" alias="VertexAttrib2fvARB"> + <function name="VertexAttrib2fv" alias="VertexAttrib2fvARB" es2="2.0"> <param name="index" type="GLuint"/> <param name="v" type="const GLfloat *"/> </function> @@ -5566,13 +5580,13 @@ <param name="index" type="GLuint"/> <param name="v" type="const GLdouble *"/> </function> - <function name="VertexAttrib3f" alias="VertexAttrib3fARB"> + <function name="VertexAttrib3f" alias="VertexAttrib3fARB" es2="2.0"> <param name="index" type="GLuint"/> <param name="x" type="GLfloat"/> <param name="y" type="GLfloat"/> <param name="z" type="GLfloat"/> </function> - <function name="VertexAttrib3fv" alias="VertexAttrib3fvARB"> + <function name="VertexAttrib3fv" alias="VertexAttrib3fvARB" es2="2.0"> <param name="index" type="GLuint"/> <param name="v" type="const GLfloat *"/> </function> @@ -5633,14 +5647,14 @@ <param name="index" type="GLuint"/> <param name="v" type="const GLdouble *"/> </function> - <function name="VertexAttrib4f" alias="VertexAttrib4fARB"> + <function name="VertexAttrib4f" alias="VertexAttrib4fARB" es2="2.0"> <param name="index" type="GLuint"/> <param name="x" type="GLfloat"/> <param name="y" type="GLfloat"/> <param name="z" type="GLfloat"/> <param name="w" type="GLfloat"/> </function> - <function name="VertexAttrib4fv" alias="VertexAttrib4fvARB"> + <function name="VertexAttrib4fv" alias="VertexAttrib4fvARB" es2="2.0"> <param name="index" type="GLuint"/> <param name="v" type="const GLfloat *"/> </function> @@ -5672,7 +5686,8 @@ <param name="v" type="const GLushort *" count="4"/> </function> - <function name="VertexAttribPointer" alias="VertexAttribPointerARB"> + <function name="VertexAttribPointer" alias="VertexAttribPointerARB" + es2="2.0"> <param name="index" type="GLuint"/> <param name="size" type="GLint"/> <param name="type" type="GLenum"/> @@ -5712,42 +5727,42 @@ <enum name="COMPRESSED_SLUMINANCE" value="0x8C4A"/> <enum name="COMPRESSED_SLUMINANCE_ALPHA" value="0x8C4B"/> - <function name="UniformMatrix2x3fv" offset="assign"> + <function name="UniformMatrix2x3fv" offset="assign" es2="3.0"> <param name="location" type="GLint"/> <param name="count" type="GLsizei"/> <param name="transpose" type="GLboolean"/> <param name="value" type="const GLfloat *"/> <glx ignore="true"/> </function> - <function name="UniformMatrix3x2fv" offset="assign"> + <function name="UniformMatrix3x2fv" offset="assign" es2="3.0"> <param name="location" type="GLint"/> <param name="count" type="GLsizei"/> <param name="transpose" type="GLboolean"/> <param name="value" type="const GLfloat *"/> <glx ignore="true"/> </function> - <function name="UniformMatrix2x4fv" offset="assign"> + <function name="UniformMatrix2x4fv" offset="assign" es2="3.0"> <param name="location" type="GLint"/> <param name="count" type="GLsizei"/> <param name="transpose" type="GLboolean"/> <param name="value" type="const GLfloat *"/> <glx ignore="true"/> </function> - <function name="UniformMatrix4x2fv" offset="assign"> + <function name="UniformMatrix4x2fv" offset="assign" es2="3.0"> <param name="location" type="GLint"/> <param name="count" type="GLsizei"/> <param name="transpose" type="GLboolean"/> <param name="value" type="const GLfloat *"/> <glx ignore="true"/> </function> - <function name="UniformMatrix3x4fv" offset="assign"> + <function name="UniformMatrix3x4fv" offset="assign" es2="3.0"> <param name="location" type="GLint"/> <param name="count" type="GLsizei"/> <param name="transpose" type="GLboolean"/> <param name="value" type="const GLfloat *"/> <glx ignore="true"/> </function> - <function name="UniformMatrix4x3fv" offset="assign"> + <function name="UniformMatrix4x3fv" offset="assign" es2="3.0"> <param name="location" type="GLint"/> <param name="count" type="GLsizei"/> <param name="transpose" type="GLboolean"/> @@ -9900,7 +9915,7 @@ </category> <category name="GL_EXT_multi_draw_arrays" number="148"> - <function name="MultiDrawArraysEXT" offset="assign"> + <function name="MultiDrawArraysEXT" offset="assign" es1="1.0" es2="2.0"> <param name="mode" type="GLenum"/> <param name="first" type="const GLint *"/> <param name="count" type="const GLsizei *"/> @@ -9908,7 +9923,7 @@ <glx handcode="true"/> </function> - <function name="MultiDrawElementsEXT" offset="assign"> + <function name="MultiDrawElementsEXT" offset="assign" es1="1.0" es2="2.0"> <param name="mode" type="GLenum"/> <param name="count" type="const GLsizei *"/> <param name="type" type="GLenum"/> diff --git a/mesalib/src/mapi/glapi/gen/gl_XML.py b/mesalib/src/mapi/glapi/gen/gl_XML.py index ce14a416d..ef7ed519b 100644 --- a/mesalib/src/mapi/glapi/gen/gl_XML.py +++ b/mesalib/src/mapi/glapi/gen/gl_XML.py @@ -25,6 +25,7 @@ # Authors: # Ian Romanick <idr@us.ibm.com> +from decimal import Decimal import libxml2 import re, sys, string import typeexpr @@ -72,7 +73,7 @@ def is_attr_true( element, name ): raise RuntimeError('Invalid value "%s" for boolean "%s".' % (value, name)) -class gl_print_base: +class gl_print_base(object): """Base class of all API pretty-printers. In the model-view-controller pattern, this is the view. Any derived @@ -322,7 +323,7 @@ def create_parameter_string(parameters, include_names): return string.join(list, ", ") -class gl_item: +class gl_item(object): def __init__(self, element, context): self.context = context self.name = element.nsProp( "name", None ) @@ -401,7 +402,7 @@ class gl_enum( gl_item ): -class gl_parameter: +class gl_parameter(object): def __init__(self, element, context): self.name = element.nsProp( "name", None ) @@ -606,6 +607,16 @@ class gl_function( gl_item ): self.initialized = 0 self.images = [] + # self.entry_point_api_map[name][api] is a decimal value + # indicating the earliest version of the given API in which + # each entry point exists. Every entry point is included in + # the first level of the map; the second level of the map only + # lists APIs which contain the entry point in at least one + # version. For example, + # self.entry_point_gles_map['ClipPlanex'] == { 'es1': + # Decimal('1.1') }. + self.entry_point_api_map = {} + self.assign_offset = 0 self.static_entry_points = [] @@ -634,6 +645,14 @@ class gl_function( gl_item ): self.static_entry_points.append(name) self.entry_points.append( name ) + + self.entry_point_api_map[name] = {} + for api in ('es1', 'es2'): + version_str = element.nsProp(api, None) + assert version_str is not None + if version_str != 'none': + self.entry_point_api_map[name][api] = Decimal(version_str) + if alias: true_name = alias else: @@ -779,8 +798,24 @@ class gl_function( gl_item ): else: return "_dispatch_stub_%u" % (self.offset) + def entry_points_for_api_version(self, api, version = None): + """Return a list of the entry point names for this function + which are supported in the given API (and optionally, version). + + Use the decimal.Decimal type to precisely express non-integer + versions. + """ + result = [] + for entry_point, api_to_ver in self.entry_point_api_map.iteritems(): + if api not in api_to_ver: + continue + if version is not None and version < api_to_ver[api]: + continue + result.append(entry_point) + return result + -class gl_item_factory: +class gl_item_factory(object): """Factory to create objects derived from gl_item.""" def create_item(self, item_name, element, context): @@ -798,7 +833,7 @@ class gl_item_factory: return None -class gl_api: +class gl_api(object): def __init__(self, factory): self.functions_by_name = {} self.enums_by_name = {} @@ -825,6 +860,19 @@ class gl_api: self.functions_by_name = functions_by_name + def filter_functions_by_api(self, api, version = None): + """Filter out entry points not in the given API (or + optionally, not in the given version of the given API). + """ + functions_by_name = {} + for func in self.functions_by_name.itervalues(): + entry_points = func.entry_points_for_api_version(api, version) + if entry_points: + func.filter_entry_points(entry_points) + functions_by_name[func.name] = func + + self.functions_by_name = functions_by_name + def process_element(self, doc): element = doc.children while element.type != "element" or element.name != "OpenGLAPI": diff --git a/mesalib/src/mapi/glapi/gen/gl_and_es_API.xml b/mesalib/src/mapi/glapi/gen/gl_and_es_API.xml index 1313da0f5..8e000a8bc 100644 --- a/mesalib/src/mapi/glapi/gen/gl_and_es_API.xml +++ b/mesalib/src/mapi/glapi/gen/gl_and_es_API.xml @@ -3,11 +3,6 @@ <!-- OpenGL + OpenGL ES --> -<!-- IMPORTANT - Remember to update gles_api.py when new OpenGL ES specific entry points - are added. Otherwise, they will be filtered out. ---> - <OpenGLAPI> <xi:include href="gl_API.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> @@ -24,45 +19,51 @@ <type name="fixed" size="4" /> <type name="clampx" size="4" /> - <function name="AlphaFuncx" alias="AlphaFuncxOES" static_dispatch="false"> + <function name="AlphaFuncx" alias="AlphaFuncxOES" static_dispatch="false" + es1="1.0"> <param name="func" type="GLenum"/> <param name="ref" type="GLclampx"/> </function> - <function name="ClearColorx" alias="ClearColorxOES" static_dispatch="false"> + <function name="ClearColorx" alias="ClearColorxOES" static_dispatch="false" + es1="1.0"> <param name="red" type="GLclampx"/> <param name="green" type="GLclampx"/> <param name="blue" type="GLclampx"/> <param name="alpha" type="GLclampx"/> </function> - <function name="ClearDepthx" alias="ClearDepthxOES" static_dispatch="false"> + <function name="ClearDepthx" alias="ClearDepthxOES" static_dispatch="false" + es1="1.0"> <param name="depth" type="GLclampx"/> </function> - <function name="Color4x" alias="Color4xOES" static_dispatch="false"> + <function name="Color4x" alias="Color4xOES" static_dispatch="false" + es1="1.0"> <param name="red" type="GLfixed"/> <param name="green" type="GLfixed"/> <param name="blue" type="GLfixed"/> <param name="alpha" type="GLfixed"/> </function> - <function name="DepthRangex" alias="DepthRangexOES" static_dispatch="false"> + <function name="DepthRangex" alias="DepthRangexOES" static_dispatch="false" + es1="1.0"> <param name="zNear" type="GLclampx"/> <param name="zFar" type="GLclampx"/> </function> - <function name="Fogx" alias="FogxOES" static_dispatch="false"> + <function name="Fogx" alias="FogxOES" static_dispatch="false" es1="1.0"> <param name="pname" type="GLenum"/> <param name="param" type="GLfixed"/> </function> - <function name="Fogxv" alias="FogxvOES" static_dispatch="false"> + <function name="Fogxv" alias="FogxvOES" static_dispatch="false" es1="1.0"> <param name="pname" type="GLenum"/> <param name="params" type="const GLfixed *" variable_param="pname"/> </function> - <function name="Frustumx" alias="FrustumxOES" static_dispatch="false"> + <function name="Frustumx" alias="FrustumxOES" static_dispatch="false" + es1="1.0"> <param name="left" type="GLfixed"/> <param name="right" type="GLfixed"/> <param name="bottom" type="GLfixed"/> @@ -71,53 +72,63 @@ <param name="zFar" type="GLfixed"/> </function> - <function name="LightModelx" alias="LightModelxOES" static_dispatch="false"> + <function name="LightModelx" alias="LightModelxOES" static_dispatch="false" + es1="1.0"> <param name="pname" type="GLenum"/> <param name="param" type="GLfixed"/> </function> - <function name="LightModelxv" alias="LightModelxvOES" static_dispatch="false"> + <function name="LightModelxv" alias="LightModelxvOES" + static_dispatch="false" es1="1.0"> <param name="pname" type="GLenum"/> <param name="params" type="const GLfixed *" variable_param="pname"/> </function> - <function name="Lightx" alias="LightxOES" static_dispatch="false"> + <function name="Lightx" alias="LightxOES" static_dispatch="false" + es1="1.0"> <param name="light" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="param" type="GLfixed"/> </function> - <function name="Lightxv" alias="LightxvOES" static_dispatch="false"> + <function name="Lightxv" alias="LightxvOES" static_dispatch="false" + es1="1.0"> <param name="light" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="const GLfixed *" variable_param="pname"/> </function> - <function name="LineWidthx" alias="LineWidthxOES" static_dispatch="false"> + <function name="LineWidthx" alias="LineWidthxOES" static_dispatch="false" + es1="1.0"> <param name="width" type="GLfixed"/> </function> - <function name="LoadMatrixx" alias="LoadMatrixxOES" static_dispatch="false"> + <function name="LoadMatrixx" alias="LoadMatrixxOES" static_dispatch="false" + es1="1.0"> <param name="m" type="const GLfixed *" count="16"/> </function> - <function name="Materialx" alias="MaterialxOES" static_dispatch="false"> + <function name="Materialx" alias="MaterialxOES" static_dispatch="false" + es1="1.0"> <param name="face" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="param" type="GLfixed"/> </function> - <function name="Materialxv" alias="MaterialxvOES" static_dispatch="false"> + <function name="Materialxv" alias="MaterialxvOES" static_dispatch="false" + es1="1.0"> <param name="face" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="const GLfixed *" variable_param="pname"/> </function> - <function name="MultMatrixx" alias="MultMatrixxOES" static_dispatch="false"> + <function name="MultMatrixx" alias="MultMatrixxOES" static_dispatch="false" + es1="1.0"> <param name="m" type="const GLfixed *" count="16"/> </function> - <function name="MultiTexCoord4x" alias="MultiTexCoord4xOES" static_dispatch="false"> + <function name="MultiTexCoord4x" alias="MultiTexCoord4xOES" + static_dispatch="false" es1="1.0"> <param name="target" type="GLenum"/> <param name="s" type="GLfixed"/> <param name="t" type="GLfixed"/> @@ -125,13 +136,15 @@ <param name="q" type="GLfixed"/> </function> - <function name="Normal3x" alias="Normal3xOES" static_dispatch="false"> + <function name="Normal3x" alias="Normal3xOES" static_dispatch="false" + es1="1.0"> <param name="nx" type="GLfixed"/> <param name="ny" type="GLfixed"/> <param name="nz" type="GLfixed"/> </function> - <function name="Orthox" alias="OrthoxOES" static_dispatch="false"> + <function name="Orthox" alias="OrthoxOES" static_dispatch="false" + es1="1.0"> <param name="left" type="GLfixed"/> <param name="right" type="GLfixed"/> <param name="bottom" type="GLfixed"/> @@ -140,59 +153,69 @@ <param name="zFar" type="GLfixed"/> </function> - <function name="PointSizex" alias="PointSizexOES" static_dispatch="false"> + <function name="PointSizex" alias="PointSizexOES" static_dispatch="false" + es1="1.0"> <param name="size" type="GLfixed"/> </function> - <function name="PolygonOffsetx" alias="PolygonOffsetxOES" static_dispatch="false"> + <function name="PolygonOffsetx" alias="PolygonOffsetxOES" + static_dispatch="false" es1="1.0"> <param name="factor" type="GLfixed"/> <param name="units" type="GLfixed"/> </function> - <function name="Rotatex" alias="RotatexOES" static_dispatch="false"> + <function name="Rotatex" alias="RotatexOES" static_dispatch="false" + es1="1.0"> <param name="angle" type="GLfixed"/> <param name="x" type="GLfixed"/> <param name="y" type="GLfixed"/> <param name="z" type="GLfixed"/> </function> - <function name="SampleCoveragex" alias="SampleCoveragexOES" static_dispatch="false"> + <function name="SampleCoveragex" alias="SampleCoveragexOES" + static_dispatch="false" es1="1.0"> <param name="value" type="GLclampx"/> <param name="invert" type="GLboolean"/> </function> - <function name="Scalex" alias="ScalexOES" static_dispatch="false"> + <function name="Scalex" alias="ScalexOES" static_dispatch="false" + es1="1.0"> <param name="x" type="GLfixed"/> <param name="y" type="GLfixed"/> <param name="z" type="GLfixed"/> </function> - <function name="TexEnvx" alias="TexEnvxOES" static_dispatch="false"> + <function name="TexEnvx" alias="TexEnvxOES" static_dispatch="false" + es1="1.0"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="param" type="GLfixed"/> </function> - <function name="TexEnvxv" alias="TexEnvxvOES" static_dispatch="false"> + <function name="TexEnvxv" alias="TexEnvxvOES" static_dispatch="false" + es1="1.0"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="const GLfixed *" variable_param="pname"/> </function> - <function name="TexParameterx" alias="TexParameterxOES" static_dispatch="false"> + <function name="TexParameterx" alias="TexParameterxOES" + static_dispatch="false" es1="1.0"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="param" type="GLfixed"/> </function> - <function name="Translatex" alias="TranslatexOES" static_dispatch="false"> + <function name="Translatex" alias="TranslatexOES" static_dispatch="false" + es1="1.0"> <param name="x" type="GLfixed"/> <param name="y" type="GLfixed"/> <param name="z" type="GLfixed"/> </function> <!-- from GL_OES_single_precision --> - <function name="Frustumf" alias="FrustumfOES" static_dispatch="false"> + <function name="Frustumf" alias="FrustumfOES" static_dispatch="false" + es1="1.0"> <param name="left" type="GLfloat"/> <param name="right" type="GLfloat"/> <param name="bottom" type="GLfloat"/> @@ -201,7 +224,8 @@ <param name="zFar" type="GLfloat"/> </function> - <function name="Orthof" alias="OrthofOES" static_dispatch="false"> + <function name="Orthof" alias="OrthofOES" static_dispatch="false" + es1="1.0"> <param name="left" type="GLfloat"/> <param name="right" type="GLfloat"/> <param name="bottom" type="GLfloat"/> @@ -213,68 +237,80 @@ <category name="es1.1"> <!-- from GL_OES_fixed_point --> - <function name="ClipPlanex" alias="ClipPlanexOES" static_dispatch="false"> + <function name="ClipPlanex" alias="ClipPlanexOES" static_dispatch="false" + es1="1.1"> <param name="plane" type="GLenum"/> <param name="equation" type="const GLfixed *" count="4"/> </function> - <function name="GetClipPlanex" alias="GetClipPlanexOES" static_dispatch="false"> + <function name="GetClipPlanex" alias="GetClipPlanexOES" + static_dispatch="false" es1="1.1"> <param name="plane" type="GLenum"/> <param name="equation" type="GLfixed *" output="true" count="4"/> </function> - <function name="GetFixedv" alias="GetFixedvOES" static_dispatch="false"> + <function name="GetFixedv" alias="GetFixedvOES" static_dispatch="false" + es1="1.1"> <param name="pname" type="GLenum"/> <param name="params" type="GLfixed *" output="true" variable_param="pname"/> </function> - <function name="GetLightxv" alias="GetLightxvOES" static_dispatch="false"> + <function name="GetLightxv" alias="GetLightxvOES" static_dispatch="false" + es1="1.1"> <param name="light" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="GLfixed *" output="true" variable_param="pname"/> </function> - <function name="GetMaterialxv" alias="GetMaterialxvOES" static_dispatch="false"> + <function name="GetMaterialxv" alias="GetMaterialxvOES" + static_dispatch="false" es1="1.1"> <param name="face" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="GLfixed *" output="true" variable_param="pname"/> </function> - <function name="GetTexEnvxv" alias="GetTexEnvxvOES" static_dispatch="false"> + <function name="GetTexEnvxv" alias="GetTexEnvxvOES" static_dispatch="false" + es1="1.1"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="GLfixed *" output="true" variable_param="pname"/> </function> - <function name="GetTexParameterxv" alias="GetTexParameterxvOES" static_dispatch="false"> + <function name="GetTexParameterxv" alias="GetTexParameterxvOES" + static_dispatch="false" es1="1.1"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="GLfixed *" output="true" variable_param="pname"/> </function> - <function name="PointParameterx" alias="PointParameterxOES" static_dispatch="false"> + <function name="PointParameterx" alias="PointParameterxOES" + static_dispatch="false" es1="1.1"> <param name="pname" type="GLenum"/> <param name="param" type="GLfixed"/> </function> - <function name="PointParameterxv" alias="PointParameterxvOES" static_dispatch="false"> + <function name="PointParameterxv" alias="PointParameterxvOES" + static_dispatch="false" es1="1.1"> <param name="pname" type="GLenum"/> <param name="params" type="const GLfixed *"/> </function> - <function name="TexParameterxv" alias="TexParameterxvOES" static_dispatch="false"> + <function name="TexParameterxv" alias="TexParameterxvOES" + static_dispatch="false" es1="1.1"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="const GLfixed *" variable_param="pname"/> </function> <!-- from GL_OES_single_precision --> - <function name="ClipPlanef" alias="ClipPlanefOES" static_dispatch="false"> + <function name="ClipPlanef" alias="ClipPlanefOES" static_dispatch="false" + es1="1.1"> <param name="plane" type="GLenum"/> <param name="equation" type="const GLfloat *" count="4"/> </function> - <function name="GetClipPlanef" alias="GetClipPlanefOES" static_dispatch="false"> + <function name="GetClipPlanef" alias="GetClipPlanefOES" + static_dispatch="false" es1="1.1"> <param name="plane" type="GLenum"/> <param name="equation" type="GLfloat *" output="true" count="4"/> </function> diff --git a/mesalib/src/mapi/glapi/gen/gl_table.py b/mesalib/src/mapi/glapi/gen/gl_table.py index 856aedb4f..382eaafd9 100644 --- a/mesalib/src/mapi/glapi/gen/gl_table.py +++ b/mesalib/src/mapi/glapi/gen/gl_table.py @@ -254,13 +254,6 @@ if __name__ == '__main__': api = gl_XML.parse_GL_API( file_name ) if es is not None: - import gles_api - - api_map = { - 'es1': gles_api.es1_api, - 'es2': gles_api.es2_api, - } - - api.filter_functions(api_map[es]) + api.filter_functions_by_api(es) printer.Print( api ) diff --git a/mesalib/src/mapi/glapi/gen/gles_api.py b/mesalib/src/mapi/glapi/gen/gles_api.py deleted file mode 100644 index 8dfef655a..000000000 --- a/mesalib/src/mapi/glapi/gen/gles_api.py +++ /dev/null @@ -1,461 +0,0 @@ -#!/usr/bin/env python - -# Mesa 3-D graphics library -# Version: 7.12 -# -# Copyright (C) 2011 LunarG Inc. -# -# Permission is hereby granted, free of charge, to any person obtaining a -# copy of this software and associated documentation files (the "Software"), -# to deal in the Software without restriction, including without limitation -# the rights to use, copy, modify, merge, publish, distribute, sublicense, -# and/or sell copies of the Software, and to permit persons to whom the -# Software is furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included -# in all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -# DEALINGS IN THE SOFTWARE. -# -# Authors: -# Chia-I Wu <olv@lunarg.com> - -# These info should be part of GLAPI XML. Until that is possible, scripts have -# to use tables here to filter gl_api. - -es1_core = ( - # OpenGL ES 1.1 - 'ActiveTexture', - 'AlphaFunc', - 'AlphaFuncx', - 'BindBuffer', - 'BindTexture', - 'BlendFunc', - 'BufferData', - 'BufferSubData', - 'Clear', - 'ClearColor', - 'ClearColorx', - 'ClearDepthf', - 'ClearDepthx', - 'ClearStencil', - 'ClientActiveTexture', - 'ClipPlanef', - 'ClipPlanex', - 'Color4f', - 'Color4ub', - 'Color4x', - 'ColorMask', - 'ColorPointer', - 'CompressedTexImage2D', - 'CompressedTexSubImage2D', - 'CopyTexImage2D', - 'CopyTexSubImage2D', - 'CullFace', - 'DeleteBuffers', - 'DeleteTextures', - 'DepthFunc', - 'DepthMask', - 'DepthRangef', - 'DepthRangex', - 'Disable', - 'DisableClientState', - 'DrawArrays', - 'DrawElements', - 'Enable', - 'EnableClientState', - 'Finish', - 'Flush', - 'Fogf', - 'Fogfv', - 'Fogx', - 'Fogxv', - 'FrontFace', - 'Frustumf', - 'Frustumx', - 'GenBuffers', - 'GenTextures', - 'GetBooleanv', - 'GetBufferParameteriv', - 'GetClipPlanef', - 'GetClipPlanex', - 'GetError', - 'GetFixedv', - 'GetFloatv', - 'GetIntegerv', - 'GetLightfv', - 'GetLightxv', - 'GetMaterialfv', - 'GetMaterialxv', - 'GetPointerv', - 'GetString', - 'GetTexEnvfv', - 'GetTexEnviv', - 'GetTexEnvxv', - 'GetTexParameterfv', - 'GetTexParameteriv', - 'GetTexParameterxv', - 'Hint', - 'IsBuffer', - 'IsEnabled', - 'IsTexture', - 'Lightf', - 'Lightfv', - 'LightModelf', - 'LightModelfv', - 'LightModelx', - 'LightModelxv', - 'Lightx', - 'Lightxv', - 'LineWidth', - 'LineWidthx', - 'LoadIdentity', - 'LoadMatrixf', - 'LoadMatrixx', - 'LogicOp', - 'Materialf', - 'Materialfv', - 'Materialx', - 'Materialxv', - 'MatrixMode', - 'MultiTexCoord4f', - 'MultiTexCoord4x', - 'MultMatrixf', - 'MultMatrixx', - 'Normal3f', - 'Normal3x', - 'NormalPointer', - 'Orthof', - 'Orthox', - 'PixelStorei', - 'PointParameterf', - 'PointParameterfv', - 'PointParameterx', - 'PointParameterxv', - 'PointSize', - 'PointSizex', - 'PolygonOffset', - 'PolygonOffsetx', - 'PopMatrix', - 'PushMatrix', - 'ReadPixels', - 'Rotatef', - 'Rotatex', - 'SampleCoverage', - 'SampleCoveragex', - 'Scalef', - 'Scalex', - 'Scissor', - 'ShadeModel', - 'StencilFunc', - 'StencilMask', - 'StencilOp', - 'TexCoordPointer', - 'TexEnvf', - 'TexEnvfv', - 'TexEnvi', - 'TexEnviv', - 'TexEnvx', - 'TexEnvxv', - 'TexImage2D', - 'TexParameterf', - 'TexParameterfv', - 'TexParameteri', - 'TexParameteriv', - 'TexParameterx', - 'TexParameterxv', - 'TexSubImage2D', - 'Translatef', - 'Translatex', - 'VertexPointer', - 'Viewport', -) - -es1_api = es1_core + ( - # GL_OES_EGL_image - 'EGLImageTargetTexture2DOES', - 'EGLImageTargetRenderbufferStorageOES', - # GL_OES_mapbuffer - 'GetBufferPointervOES', - 'MapBufferOES', - 'UnmapBufferOES', - # GL_EXT_multi_draw_arrays - 'MultiDrawArraysEXT', - 'MultiDrawElementsEXT', - # GL_OES_blend_equation_separate - 'BlendEquationSeparateOES', - # GL_OES_blend_func_separate - 'BlendFuncSeparateOES', - # GL_OES_blend_subtract - 'BlendEquationOES', - # GL_OES_draw_texture - 'DrawTexiOES', - 'DrawTexivOES', - 'DrawTexfOES', - 'DrawTexfvOES', - 'DrawTexsOES', - 'DrawTexsvOES', - 'DrawTexxOES', - 'DrawTexxvOES', - # GL_OES_fixed_point - 'AlphaFuncxOES', - 'ClearColorxOES', - 'ClearDepthxOES', - 'Color4xOES', - 'DepthRangexOES', - 'FogxOES', - 'FogxvOES', - 'FrustumxOES', - 'LightModelxOES', - 'LightModelxvOES', - 'LightxOES', - 'LightxvOES', - 'LineWidthxOES', - 'LoadMatrixxOES', - 'MaterialxOES', - 'MaterialxvOES', - 'MultiTexCoord4xOES', - 'MultMatrixxOES', - 'Normal3xOES', - 'OrthoxOES', - 'PointSizexOES', - 'PolygonOffsetxOES', - 'RotatexOES', - 'SampleCoveragexOES', - 'ScalexOES', - 'TexEnvxOES', - 'TexEnvxvOES', - 'TexParameterxOES', - 'TranslatexOES', - 'ClipPlanexOES', - 'GetClipPlanexOES', - 'GetFixedvOES', - 'GetLightxvOES', - 'GetMaterialxvOES', - 'GetTexEnvxvOES', - 'GetTexParameterxvOES', - 'PointParameterxOES', - 'PointParameterxvOES', - 'TexParameterxvOES', - # GL_OES_framebuffer_object - 'BindFramebufferOES', - 'BindRenderbufferOES', - 'CheckFramebufferStatusOES', - 'DeleteFramebuffersOES', - 'DeleteRenderbuffersOES', - 'FramebufferRenderbufferOES', - 'FramebufferTexture2DOES', - 'GenerateMipmapOES', - 'GenFramebuffersOES', - 'GenRenderbuffersOES', - 'GetFramebufferAttachmentParameterivOES', - 'GetRenderbufferParameterivOES', - 'IsFramebufferOES', - 'IsRenderbufferOES', - 'RenderbufferStorageOES', - # GL_OES_point_size_array - 'PointSizePointerOES', - # GL_OES_query_matrix - 'QueryMatrixxOES', - # GL_OES_single_precision - 'ClearDepthfOES', - 'DepthRangefOES', - 'FrustumfOES', - 'OrthofOES', - 'ClipPlanefOES', - 'GetClipPlanefOES', - # GL_OES_texture_cube_map - 'GetTexGenfvOES', - 'GetTexGenivOES', - 'GetTexGenxvOES', - 'TexGenfOES', - 'TexGenfvOES', - 'TexGeniOES', - 'TexGenivOES', - 'TexGenxOES', - 'TexGenxvOES', -) - -es2_core = ( - # OpenGL ES 2.0 - "ActiveTexture", - "AttachShader", - "BindAttribLocation", - "BindBuffer", - "BindFramebuffer", - "BindRenderbuffer", - "BindTexture", - "BlendColor", - "BlendEquation", - "BlendEquationSeparate", - "BlendFunc", - "BlendFuncSeparate", - "BufferData", - "BufferSubData", - "CheckFramebufferStatus", - "Clear", - "ClearColor", - "ClearDepthf", - "ClearStencil", - "ColorMask", - "CompileShader", - "CompressedTexImage2D", - "CompressedTexSubImage2D", - "CopyTexImage2D", - "CopyTexSubImage2D", - "CreateProgram", - "CreateShader", - "CullFace", - "DeleteBuffers", - "DeleteFramebuffers", - "DeleteProgram", - "DeleteRenderbuffers", - "DeleteShader", - "DeleteTextures", - "DepthFunc", - "DepthMask", - "DepthRangef", - "DetachShader", - "Disable", - "DisableVertexAttribArray", - "DrawArrays", - "DrawElements", - "Enable", - "EnableVertexAttribArray", - "Finish", - "Flush", - "FramebufferRenderbuffer", - "FramebufferTexture2D", - "FrontFace", - "GenBuffers", - "GenerateMipmap", - "GenFramebuffers", - "GenRenderbuffers", - "GenTextures", - "GetActiveAttrib", - "GetActiveUniform", - "GetAttachedShaders", - "GetAttribLocation", - "GetBooleanv", - "GetBufferParameteriv", - "GetError", - "GetFloatv", - "GetFramebufferAttachmentParameteriv", - "GetIntegerv", - "GetProgramInfoLog", - "GetProgramiv", - "GetRenderbufferParameteriv", - "GetShaderInfoLog", - "GetShaderiv", - "GetShaderPrecisionFormat", - "GetShaderSource", - "GetString", - "GetTexParameterfv", - "GetTexParameteriv", - "GetUniformfv", - "GetUniformiv", - "GetUniformLocation", - "GetVertexAttribfv", - "GetVertexAttribiv", - "GetVertexAttribPointerv", - "Hint", - "IsBuffer", - "IsEnabled", - "IsFramebuffer", - "IsProgram", - "IsRenderbuffer", - "IsShader", - "IsTexture", - "LineWidth", - "LinkProgram", - "PixelStorei", - "PolygonOffset", - "ReadPixels", - "ReleaseShaderCompiler", - "RenderbufferStorage", - "SampleCoverage", - "Scissor", - "ShaderBinary", - "ShaderSource", - "StencilFunc", - "StencilFuncSeparate", - "StencilMask", - "StencilMaskSeparate", - "StencilOp", - "StencilOpSeparate", - "TexImage2D", - "TexParameterf", - "TexParameterfv", - "TexParameteri", - "TexParameteriv", - "TexSubImage2D", - "Uniform1f", - "Uniform1fv", - "Uniform1i", - "Uniform1iv", - "Uniform2f", - "Uniform2fv", - "Uniform2i", - "Uniform2iv", - "Uniform3f", - "Uniform3fv", - "Uniform3i", - "Uniform3iv", - "Uniform4f", - "Uniform4fv", - "Uniform4i", - "Uniform4iv", - "UniformMatrix2fv", - "UniformMatrix3fv", - "UniformMatrix4fv", - "UseProgram", - "ValidateProgram", - "VertexAttrib1f", - "VertexAttrib1fv", - "VertexAttrib2f", - "VertexAttrib2fv", - "VertexAttrib3f", - "VertexAttrib3fv", - "VertexAttrib4f", - "VertexAttrib4fv", - "VertexAttribPointer", - "Viewport", -) - -es2_api = es2_core + ( - # GL_OES_EGL_image - 'EGLImageTargetTexture2DOES', - 'EGLImageTargetRenderbufferStorageOES', - # GL_OES_mapbuffer - 'GetBufferPointervOES', - 'MapBufferOES', - 'UnmapBufferOES', - # GL_EXT_multi_draw_arrays - 'MultiDrawArraysEXT', - 'MultiDrawElementsEXT', - # GL_OES_texture_3D - 'CompressedTexImage3DOES', - 'CompressedTexSubImage3DOES', - 'CopyTexSubImage3DOES', - 'FramebufferTexture3DOES', - 'TexImage3DOES', - 'TexSubImage3DOES', - # GL_OES_get_program_binary - 'GetProgramBinaryOES', - 'ProgramBinaryOES', - # GL_OES_vertex_array_object - 'BindVertexArrayOES', - 'DeleteVertexArraysOES', - 'GenVertexArraysOES', - 'IsVertexArrayOES', - # GL_NV_draw_buffers - 'DrawBuffersNV', - # GL_NV_read_buffer - 'ReadBufferNV', -) diff --git a/mesalib/src/mapi/glapi/gen/remap_helper.py b/mesalib/src/mapi/glapi/gen/remap_helper.py index eae1cf3e5..e1a13d0b3 100644 --- a/mesalib/src/mapi/glapi/gen/remap_helper.py +++ b/mesalib/src/mapi/glapi/gen/remap_helper.py @@ -186,14 +186,7 @@ if __name__ == '__main__': api = gl_XML.parse_GL_API( file_name ) if es is not None: - import gles_api - - api_map = { - 'es1': gles_api.es1_api, - 'es2': gles_api.es2_api, - } - - api.filter_functions(api_map[es]) + api.filter_functions_by_api(es) printer = PrintGlRemap() printer.Print( api ) diff --git a/mesalib/src/mapi/glapi/gen/typeexpr.py b/mesalib/src/mapi/glapi/gen/typeexpr.py index 6cc71cbf9..ed23d23ff 100644 --- a/mesalib/src/mapi/glapi/gen/typeexpr.py +++ b/mesalib/src/mapi/glapi/gen/typeexpr.py @@ -27,7 +27,7 @@ import string, copy -class type_node: +class type_node(object): def __init__(self): self.pointer = 0 # bool self.const = 0 # bool @@ -65,7 +65,7 @@ class type_node: return s -class type_table: +class type_table(object): def __init__(self): self.types_by_name = {} return @@ -109,7 +109,7 @@ def create_initial_types(): return -class type_expression: +class type_expression(object): built_in_types = None def __init__(self, type_string, extra_types = None): diff --git a/mesalib/src/mapi/mapi/mapi_abi.py b/mesalib/src/mapi/mapi/mapi_abi.py index c18dd82d6..30ffe7bc2 100644 --- a/mesalib/src/mapi/mapi/mapi_abi.py +++ b/mesalib/src/mapi/mapi/mapi_abi.py @@ -34,6 +34,9 @@ sys.path.append(GLAPI) import re from optparse import OptionParser +import gl_XML +import glX_XML + # number of dynamic entries ABI_NUM_DYNAMIC_ENTRIES = 256 @@ -44,13 +47,14 @@ class ABIEntry(object): _match_c_param = re.compile( '^(?P<type>[\w\s*]+?)(?P<name>\w+)(\[(?P<array>\d+)\])?$') - def __init__(self, cols, attrs): + def __init__(self, cols, attrs, xml_data = None): self._parse(cols) self.slot = attrs['slot'] self.hidden = attrs['hidden'] self.alias = attrs['alias'] self.handcode = attrs['handcode'] + self.xml_data = xml_data def c_prototype(self): return '%s %s(%s)' % (self.c_return(), self.name, self.c_params()) @@ -133,8 +137,6 @@ class ABIEntry(object): def abi_parse_xml(xml): """Parse a GLAPI XML file for ABI entries.""" - import gl_XML, glX_XML - api = gl_XML.parse_GL_API(xml, glX_XML.glx_item_factory()) entry_dict = {} @@ -175,7 +177,7 @@ def abi_parse_xml(xml): params = func.get_parameter_string(name) cols.extend([p.strip() for p in params.split(',')]) - ent = ABIEntry(cols, attrs) + ent = ABIEntry(cols, attrs, func) entry_dict[ent.name] = ent entries = entry_dict.values() @@ -686,9 +688,10 @@ class ABIPrinter(object): class GLAPIPrinter(ABIPrinter): """OpenGL API Printer""" - def __init__(self, entries, api=None): - api_entries = self._get_api_entries(entries, api) - super(GLAPIPrinter, self).__init__(api_entries) + def __init__(self, entries): + for ent in entries: + self._override_for_api(ent) + super(GLAPIPrinter, self).__init__(entries) self.api_defines = ['GL_GLEXT_PROTOTYPES'] self.api_headers = ['"GL/gl.h"', '"GL/glext.h"'] @@ -709,35 +712,11 @@ class GLAPIPrinter(ABIPrinter): self.c_header = self._get_c_header() - def _get_api_entries(self, entries, api): - """Override the entry attributes according to API.""" - import copy - - # no override - if api is None: - return entries - - api_entries = {} - for ent in entries: - ent = copy.copy(ent) - - # override 'hidden' and 'handcode' - ent.hidden = ent.name not in api - ent.handcode = False - if ent.alias: - ent.alias = api_entries[ent.alias.name] - - api_entries[ent.name] = ent - - # sanity check - missed = [name for name in api if name not in api_entries] - if missed: - raise Exception('%s is missing' % str(missed)) - - entries = api_entries.values() - entries.sort() - - return entries + def _override_for_api(self, ent): + """Override attributes of an entry if necessary for this + printer.""" + # By default, no override is necessary. + pass def _get_c_header(self): header = """#ifndef _GLAPI_TMP_H_ @@ -760,12 +739,17 @@ class ES1APIPrinter(GLAPIPrinter): """OpenGL ES 1.x API Printer""" def __init__(self, entries): - from gles_api import es1_api - - super(ES1APIPrinter, self).__init__(entries, es1_api) + super(ES1APIPrinter, self).__init__(entries) self.prefix_lib = 'gl' self.prefix_warn = 'gl' + def _override_for_api(self, ent): + if ent.xml_data is None: + raise Exception('ES2 API printer requires XML input') + ent.hidden = ent.name not in \ + ent.xml_data.entry_points_for_api_version('es1') + ent.handcode = False + def _get_c_header(self): header = """#ifndef _GLAPI_TMP_H_ #define _GLAPI_TMP_H_ @@ -779,12 +763,17 @@ class ES2APIPrinter(GLAPIPrinter): """OpenGL ES 2.x API Printer""" def __init__(self, entries): - from gles_api import es2_api - - super(ES2APIPrinter, self).__init__(entries, es2_api) + super(ES2APIPrinter, self).__init__(entries) self.prefix_lib = 'gl' self.prefix_warn = 'gl' + def _override_for_api(self, ent): + if ent.xml_data is None: + raise Exception('ES2 API printer requires XML input') + ent.hidden = ent.name not in \ + ent.xml_data.entry_points_for_api_version('es2') + ent.handcode = False + def _get_c_header(self): header = """#ifndef _GLAPI_TMP_H_ #define _GLAPI_TMP_H_ @@ -798,7 +787,7 @@ class SharedGLAPIPrinter(GLAPIPrinter): """Shared GLAPI API Printer""" def __init__(self, entries): - super(SharedGLAPIPrinter, self).__init__(entries, []) + super(SharedGLAPIPrinter, self).__init__(entries) self.lib_need_table_size = True self.lib_need_noop_array = True @@ -809,6 +798,10 @@ class SharedGLAPIPrinter(GLAPIPrinter): self.prefix_lib = 'shared' self.prefix_warn = 'gl' + def _override_for_api(self, ent): + ent.hidden = True + ent.handcode = False + def _get_c_header(self): header = """#ifndef _GLAPI_TMP_H_ #define _GLAPI_TMP_H_ |