diff options
author | Ian Romanick <ian.d.romanick@intel.com> | 2015-04-28 18:00:43 -0700 |
---|---|---|
committer | Ian Romanick <ian.d.romanick@intel.com> | 2015-05-28 16:56:31 -0700 |
commit | 366ceacf72258a4a81d9c6b412dd565a4c611b17 (patch) | |
tree | ea8ccf33aa6c988fcb959370c9f7808d7aa9376f /src/mapi/glapi | |
parent | 8bbe7fa7a853d8ebf69e5d2d0fdc4343a20b638f (diff) | |
download | external_mesa3d-366ceacf72258a4a81d9c6b412dd565a4c611b17.zip external_mesa3d-366ceacf72258a4a81d9c6b412dd565a4c611b17.tar.gz external_mesa3d-366ceacf72258a4a81d9c6b412dd565a4c611b17.tar.bz2 |
gles/es3.1: Enable dispatch of almost all new GLES 3.1 functions
A couple functions are missing because there are no implementations of
them yet. These are:
glFramebufferParameteri (from GL_ARB_framebuffer_no_attachments)
glGetFramebufferParameteriv (from GL_ARB_framebuffer_no_attachments)
glMemoryBarrierByRegion
v2: Rebase on updated dispatch_sanity.cpp test.
v3: Add support for glDraw{Arrays,Elements}Indirect in vbo_exec_array.c.
The updated dispatch_sanity.cpp test discovered this omission.
v4: Rebase on glapi changes.
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Tapani Pälli <tapani.palli@intel.com>
Diffstat (limited to 'src/mapi/glapi')
-rw-r--r-- | src/mapi/glapi/gen/ARB_compute_shader.xml | 4 | ||||
-rw-r--r-- | src/mapi/glapi/gen/ARB_draw_indirect.xml | 4 | ||||
-rw-r--r-- | src/mapi/glapi/gen/ARB_program_interface_query.xml | 10 | ||||
-rw-r--r-- | src/mapi/glapi/gen/ARB_separate_shader_objects.xml | 86 | ||||
-rw-r--r-- | src/mapi/glapi/gen/ARB_shader_image_load_store.xml | 4 | ||||
-rw-r--r-- | src/mapi/glapi/gen/ARB_texture_multisample.xml | 4 | ||||
-rw-r--r-- | src/mapi/glapi/gen/ARB_texture_storage_multisample.xml | 2 | ||||
-rw-r--r-- | src/mapi/glapi/gen/ARB_vertex_attrib_binding.xml | 10 | ||||
-rw-r--r-- | src/mapi/glapi/gen/GL3x.xml | 2 | ||||
-rw-r--r-- | src/mapi/glapi/gen/gl_API.xml | 4 |
10 files changed, 65 insertions, 65 deletions
diff --git a/src/mapi/glapi/gen/ARB_compute_shader.xml b/src/mapi/glapi/gen/ARB_compute_shader.xml index 78d352f..c2ec842 100644 --- a/src/mapi/glapi/gen/ARB_compute_shader.xml +++ b/src/mapi/glapi/gen/ARB_compute_shader.xml @@ -26,13 +26,13 @@ <enum name="DISPATCH_INDIRECT_BUFFER_BINDING" value="0x90EF"/> <enum name="COMPUTE_SHADER_BIT" value="0x00000020"/> - <function name="DispatchCompute"> + <function name="DispatchCompute" es2="3.1"> <param name="num_groups_x" type="GLuint"/> <param name="num_groups_y" type="GLuint"/> <param name="num_groups_z" type="GLuint"/> </function> - <function name="DispatchComputeIndirect"> + <function name="DispatchComputeIndirect" es2="3.1"> <param name="indirect" type="GLintptr"/> </function> </category> diff --git a/src/mapi/glapi/gen/ARB_draw_indirect.xml b/src/mapi/glapi/gen/ARB_draw_indirect.xml index 2001eb0..3b29d6b 100644 --- a/src/mapi/glapi/gen/ARB_draw_indirect.xml +++ b/src/mapi/glapi/gen/ARB_draw_indirect.xml @@ -8,12 +8,12 @@ <enum name="DRAW_INDIRECT_BUFFER" value="0x8F3F"/> <enum name="DRAW_INDIRECT_BUFFER_BINDING" value="0x8F43"/> - <function name="DrawArraysIndirect" exec="dynamic"> + <function name="DrawArraysIndirect" exec="dynamic" es2="3.1"> <param name="mode" type="GLenum"/> <param name="indirect" type="const GLvoid *"/> </function> - <function name="DrawElementsIndirect" exec="dynamic"> + <function name="DrawElementsIndirect" exec="dynamic" es2="3.1"> <param name="mode" type="GLenum"/> <param name="type" type="GLenum"/> <param name="indirect" type="const GLvoid *"/> diff --git a/src/mapi/glapi/gen/ARB_program_interface_query.xml b/src/mapi/glapi/gen/ARB_program_interface_query.xml index 5b6d5cc..c3162f5 100644 --- a/src/mapi/glapi/gen/ARB_program_interface_query.xml +++ b/src/mapi/glapi/gen/ARB_program_interface_query.xml @@ -56,21 +56,21 @@ <enum name="NUM_COMPATIBLE_SUBROUTINES" value="0x8E4A"/> <enum name="COMPATIBLE_SUBROUTINES" value="0x8E4B"/> - <function name="GetProgramInterfaceiv"> + <function name="GetProgramInterfaceiv" es2="3.1"> <param name="program" type="GLuint"/> <param name="programInterface" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="GLint *" output="true"/> </function> - <function name="GetProgramResourceIndex"> + <function name="GetProgramResourceIndex" es2="3.1"> <param name="program" type="GLuint"/> <param name="programInterface" type="GLenum"/> <param name="name" type="const GLchar *"/> <return type="GLuint"/> </function> - <function name="GetProgramResourceName"> + <function name="GetProgramResourceName" es2="3.1"> <param name="program" type="GLuint"/> <param name="programInterface" type="GLenum"/> <param name="index" type="GLuint"/> @@ -79,7 +79,7 @@ <param name="name" type="GLchar *" output="true"/> </function> - <function name="GetProgramResourceiv"> + <function name="GetProgramResourceiv" es2="3.1"> <param name="program" type="GLuint"/> <param name="programInterface" type="GLenum"/> <param name="index" type="GLuint"/> @@ -90,7 +90,7 @@ <param name="params" type="GLint *" output="true"/> </function> - <function name="GetProgramResourceLocation"> + <function name="GetProgramResourceLocation" es2="3.1"> <param name="program" type="GLuint"/> <param name="programInterface" type="GLenum"/> <param name="name" type="const GLchar *"/> diff --git a/src/mapi/glapi/gen/ARB_separate_shader_objects.xml b/src/mapi/glapi/gen/ARB_separate_shader_objects.xml index c20ee4b..c9f481d 100644 --- a/src/mapi/glapi/gen/ARB_separate_shader_objects.xml +++ b/src/mapi/glapi/gen/ARB_separate_shader_objects.xml @@ -15,33 +15,33 @@ <enum name="ALL_SHADER_BITS" value="0xFFFFFFFF"/> <enum name="PROGRAM_SEPARABLE" value="0x8258"/> - <function name="UseProgramStages"> + <function name="UseProgramStages" es2="3.1"> <param name="pipeline" type="GLuint" /> <param name="stages" type="GLbitfield" /> <param name="program" type="GLuint" /> </function> - <function name="ActiveShaderProgram"> + <function name="ActiveShaderProgram" es2="3.1"> <param name="pipeline" type="GLuint" /> <param name="program" type="GLuint" /> </function> - <function name="CreateShaderProgramv"> + <function name="CreateShaderProgramv" es2="3.1"> <param name="type" type="GLenum" /> <param name="count" type="GLsizei" /> <param name="strings" type="const GLchar * const *" /> <return type="GLuint"/> </function> - <function name="BindProgramPipeline"> + <function name="BindProgramPipeline" es2="3.1"> <param name="pipeline" type="GLuint" /> </function> - <function name="DeleteProgramPipelines"> + <function name="DeleteProgramPipelines" es2="3.1"> <param name="n" type="GLsizei" /> <param name="pipelines" type="const GLuint *" /> </function> - <function name="GenProgramPipelines"> + <function name="GenProgramPipelines" es2="3.1"> <param name="n" type="GLsizei" /> <param name="pipelines" type="GLuint *" /> </function> - <function name="IsProgramPipeline"> + <function name="IsProgramPipeline" es2="3.1"> <param name="pipeline" type="GLuint" /> <return type="GLboolean"/> </function> @@ -54,30 +54,30 @@ <param name="value" type="GLint"/> </function> --> - <function name="GetProgramPipelineiv"> + <function name="GetProgramPipelineiv" es2="3.1"> <param name="pipeline" type="GLuint" /> <param name="pname" type="GLenum" /> <param name="params" type="GLint *" /> </function> - <function name="ProgramUniform1i"> + <function name="ProgramUniform1i" es2="3.1"> <param name="program" type="GLuint" /> <param name="location" type="GLint" /> <param name="x" type="GLint" /> </function> - <function name="ProgramUniform2i"> + <function name="ProgramUniform2i" es2="3.1"> <param name="program" type="GLuint" /> <param name="location" type="GLint" /> <param name="x" type="GLint" /> <param name="y" type="GLint" /> </function> - <function name="ProgramUniform3i"> + <function name="ProgramUniform3i" es2="3.1"> <param name="program" type="GLuint" /> <param name="location" type="GLint" /> <param name="x" type="GLint" /> <param name="y" type="GLint" /> <param name="z" type="GLint" /> </function> - <function name="ProgramUniform4i"> + <function name="ProgramUniform4i" es2="3.1"> <param name="program" type="GLuint" /> <param name="location" type="GLint" /> <param name="x" type="GLint" /> @@ -85,25 +85,25 @@ <param name="z" type="GLint" /> <param name="w" type="GLint" /> </function> - <function name="ProgramUniform1ui"> + <function name="ProgramUniform1ui" es2="3.1"> <param name="program" type="GLuint" /> <param name="location" type="GLint" /> <param name="x" type="GLuint" /> </function> - <function name="ProgramUniform2ui"> + <function name="ProgramUniform2ui" es2="3.1"> <param name="program" type="GLuint" /> <param name="location" type="GLint" /> <param name="x" type="GLuint" /> <param name="y" type="GLuint" /> </function> - <function name="ProgramUniform3ui"> + <function name="ProgramUniform3ui" es2="3.1"> <param name="program" type="GLuint" /> <param name="location" type="GLint" /> <param name="x" type="GLuint" /> <param name="y" type="GLuint" /> <param name="z" type="GLuint" /> </function> - <function name="ProgramUniform4ui"> + <function name="ProgramUniform4ui" es2="3.1"> <param name="program" type="GLuint" /> <param name="location" type="GLint" /> <param name="x" type="GLuint" /> @@ -111,25 +111,25 @@ <param name="z" type="GLuint" /> <param name="w" type="GLuint" /> </function> - <function name="ProgramUniform1f"> + <function name="ProgramUniform1f" es2="3.1"> <param name="program" type="GLuint" /> <param name="location" type="GLint" /> <param name="x" type="GLfloat" /> </function> - <function name="ProgramUniform2f"> + <function name="ProgramUniform2f" es2="3.1"> <param name="program" type="GLuint" /> <param name="location" type="GLint" /> <param name="x" type="GLfloat" /> <param name="y" type="GLfloat" /> </function> - <function name="ProgramUniform3f"> + <function name="ProgramUniform3f" es2="3.1"> <param name="program" type="GLuint" /> <param name="location" type="GLint" /> <param name="x" type="GLfloat" /> <param name="y" type="GLfloat" /> <param name="z" type="GLfloat" /> </function> - <function name="ProgramUniform4f"> + <function name="ProgramUniform4f" es2="3.1"> <param name="program" type="GLuint" /> <param name="location" type="GLint" /> <param name="x" type="GLfloat" /> @@ -137,145 +137,145 @@ <param name="z" type="GLfloat" /> <param name="w" type="GLfloat" /> </function> - <function name="ProgramUniform1iv"> + <function name="ProgramUniform1iv" es2="3.1"> <param name="program" type="GLuint" /> <param name="location" type="GLint" /> <param name="count" type="GLsizei" /> <param name="value" type="const GLint *" /> </function> - <function name="ProgramUniform2iv"> + <function name="ProgramUniform2iv" es2="3.1"> <param name="program" type="GLuint" /> <param name="location" type="GLint" /> <param name="count" type="GLsizei" /> <param name="value" type="const GLint *" /> </function> - <function name="ProgramUniform3iv"> + <function name="ProgramUniform3iv" es2="3.1"> <param name="program" type="GLuint" /> <param name="location" type="GLint" /> <param name="count" type="GLsizei" /> <param name="value" type="const GLint *" /> </function> - <function name="ProgramUniform4iv"> + <function name="ProgramUniform4iv" es2="3.1"> <param name="program" type="GLuint" /> <param name="location" type="GLint" /> <param name="count" type="GLsizei" /> <param name="value" type="const GLint *" /> </function> - <function name="ProgramUniform1uiv"> + <function name="ProgramUniform1uiv" es2="3.1"> <param name="program" type="GLuint" /> <param name="location" type="GLint" /> <param name="count" type="GLsizei" /> <param name="value" type="const GLuint *" /> </function> - <function name="ProgramUniform2uiv"> + <function name="ProgramUniform2uiv" es2="3.1"> <param name="program" type="GLuint" /> <param name="location" type="GLint" /> <param name="count" type="GLsizei" /> <param name="value" type="const GLuint *" /> </function> - <function name="ProgramUniform3uiv"> + <function name="ProgramUniform3uiv" es2="3.1"> <param name="program" type="GLuint" /> <param name="location" type="GLint" /> <param name="count" type="GLsizei" /> <param name="value" type="const GLuint *" /> </function> - <function name="ProgramUniform4uiv"> + <function name="ProgramUniform4uiv" es2="3.1"> <param name="program" type="GLuint" /> <param name="location" type="GLint" /> <param name="count" type="GLsizei" /> <param name="value" type="const GLuint *" /> </function> - <function name="ProgramUniform1fv"> + <function name="ProgramUniform1fv" es2="3.1"> <param name="program" type="GLuint" /> <param name="location" type="GLint" /> <param name="count" type="GLsizei" /> <param name="value" type="const GLfloat *" /> </function> - <function name="ProgramUniform2fv"> + <function name="ProgramUniform2fv" es2="3.1"> <param name="program" type="GLuint" /> <param name="location" type="GLint" /> <param name="count" type="GLsizei" /> <param name="value" type="const GLfloat *" /> </function> - <function name="ProgramUniform3fv"> + <function name="ProgramUniform3fv" es2="3.1"> <param name="program" type="GLuint" /> <param name="location" type="GLint" /> <param name="count" type="GLsizei" /> <param name="value" type="const GLfloat *" /> </function> - <function name="ProgramUniform4fv"> + <function name="ProgramUniform4fv" es2="3.1"> <param name="program" type="GLuint" /> <param name="location" type="GLint" /> <param name="count" type="GLsizei" /> <param name="value" type="const GLfloat *" /> </function> - <function name="ProgramUniformMatrix2fv"> + <function name="ProgramUniformMatrix2fv" es2="3.1"> <param name="program" type="GLuint" /> <param name="location" type="GLint" /> <param name="count" type="GLsizei" /> <param name="transpose" type="GLboolean" /> <param name="value" type="const GLfloat *" /> </function> - <function name="ProgramUniformMatrix3fv"> + <function name="ProgramUniformMatrix3fv" es2="3.1"> <param name="program" type="GLuint" /> <param name="location" type="GLint" /> <param name="count" type="GLsizei" /> <param name="transpose" type="GLboolean" /> <param name="value" type="const GLfloat *" /> </function> - <function name="ProgramUniformMatrix4fv"> + <function name="ProgramUniformMatrix4fv" es2="3.1"> <param name="program" type="GLuint" /> <param name="location" type="GLint" /> <param name="count" type="GLsizei" /> <param name="transpose" type="GLboolean" /> <param name="value" type="const GLfloat *" /> </function> - <function name="ProgramUniformMatrix2x3fv"> + <function name="ProgramUniformMatrix2x3fv" es2="3.1"> <param name="program" type="GLuint" /> <param name="location" type="GLint" /> <param name="count" type="GLsizei" /> <param name="transpose" type="GLboolean" /> <param name="value" type="const GLfloat *" /> </function> - <function name="ProgramUniformMatrix3x2fv"> + <function name="ProgramUniformMatrix3x2fv" es2="3.1"> <param name="program" type="GLuint" /> <param name="location" type="GLint" /> <param name="count" type="GLsizei" /> <param name="transpose" type="GLboolean" /> <param name="value" type="const GLfloat *" /> </function> - <function name="ProgramUniformMatrix2x4fv"> + <function name="ProgramUniformMatrix2x4fv" es2="3.1"> <param name="program" type="GLuint" /> <param name="location" type="GLint" /> <param name="count" type="GLsizei" /> <param name="transpose" type="GLboolean" /> <param name="value" type="const GLfloat *" /> </function> - <function name="ProgramUniformMatrix4x2fv"> + <function name="ProgramUniformMatrix4x2fv" es2="3.1"> <param name="program" type="GLuint" /> <param name="location" type="GLint" /> <param name="count" type="GLsizei" /> <param name="transpose" type="GLboolean" /> <param name="value" type="const GLfloat *" /> </function> - <function name="ProgramUniformMatrix3x4fv"> + <function name="ProgramUniformMatrix3x4fv" es2="3.1"> <param name="program" type="GLuint" /> <param name="location" type="GLint" /> <param name="count" type="GLsizei" /> <param name="transpose" type="GLboolean" /> <param name="value" type="const GLfloat *" /> </function> - <function name="ProgramUniformMatrix4x3fv"> + <function name="ProgramUniformMatrix4x3fv" es2="3.1"> <param name="program" type="GLuint" /> <param name="location" type="GLint" /> <param name="count" type="GLsizei" /> <param name="transpose" type="GLboolean" /> <param name="value" type="const GLfloat *" /> </function> - <function name="ValidateProgramPipeline"> + <function name="ValidateProgramPipeline" es2="3.1"> <param name="pipeline" type="GLuint" /> </function> - <function name="GetProgramPipelineInfoLog"> + <function name="GetProgramPipelineInfoLog" es2="3.1"> <param name="pipeline" type="GLuint" /> <param name="bufSize" type="GLsizei" /> <param name="length" type="GLsizei *" /> diff --git a/src/mapi/glapi/gen/ARB_shader_image_load_store.xml b/src/mapi/glapi/gen/ARB_shader_image_load_store.xml index c6a97bf..178e930 100644 --- a/src/mapi/glapi/gen/ARB_shader_image_load_store.xml +++ b/src/mapi/glapi/gen/ARB_shader_image_load_store.xml @@ -70,7 +70,7 @@ <enum name="MAX_FRAGMENT_IMAGE_UNIFORMS" value="0x90CE"/> <enum name="MAX_COMBINED_IMAGE_UNIFORMS" value="0x90CF"/> -<function name="BindImageTexture"> +<function name="BindImageTexture" es2="3.1"> <param name="unit" type="GLuint"/> <param name="texture" type="GLuint"/> <param name="level" type="GLint"/> @@ -80,7 +80,7 @@ <param name="format" type="GLenum"/> </function> -<function name="MemoryBarrier"> +<function name="MemoryBarrier" es2="3.1"> <param name="barriers" type="GLbitfield"/> </function> diff --git a/src/mapi/glapi/gen/ARB_texture_multisample.xml b/src/mapi/glapi/gen/ARB_texture_multisample.xml index d7cf2a3..595e1c7 100644 --- a/src/mapi/glapi/gen/ARB_texture_multisample.xml +++ b/src/mapi/glapi/gen/ARB_texture_multisample.xml @@ -53,13 +53,13 @@ <param name="fixedsamplelocations" type="GLboolean"/> </function> - <function name="GetMultisamplefv"> + <function name="GetMultisamplefv" es2="3.1"> <param name="pname" type="GLenum"/> <param name="index" type="GLuint"/> <param name="val" type="GLfloat *"/> </function> - <function name="SampleMaski"> + <function name="SampleMaski" es2="3.1"> <param name="index" type="GLuint"/> <param name="mask" type="GLbitfield"/> </function> diff --git a/src/mapi/glapi/gen/ARB_texture_storage_multisample.xml b/src/mapi/glapi/gen/ARB_texture_storage_multisample.xml index 0d39fa2..6ed8f1a 100644 --- a/src/mapi/glapi/gen/ARB_texture_storage_multisample.xml +++ b/src/mapi/glapi/gen/ARB_texture_storage_multisample.xml @@ -7,7 +7,7 @@ <category name="GL_ARB_texture_storage_multisample" number="141"> - <function name="TexStorage2DMultisample"> + <function name="TexStorage2DMultisample" es2="3.1"> <param name="target" type="GLenum"/> <param name="samples" type="GLsizei"/> <param name="internalformat" type="GLenum"/> diff --git a/src/mapi/glapi/gen/ARB_vertex_attrib_binding.xml b/src/mapi/glapi/gen/ARB_vertex_attrib_binding.xml index 0f00063..ba9ca57 100644 --- a/src/mapi/glapi/gen/ARB_vertex_attrib_binding.xml +++ b/src/mapi/glapi/gen/ARB_vertex_attrib_binding.xml @@ -7,14 +7,14 @@ <category name="GL_ARB_vertex_attrib_binding" number="125"> - <function name="BindVertexBuffer"> + <function name="BindVertexBuffer" es2="3.1"> <param name="bindingindex" type="GLuint"/> <param name="buffer" type="GLuint"/> <param name="offset" type="GLintptr"/> <param name="stride" type="GLsizei"/> </function> - <function name="VertexAttribFormat"> + <function name="VertexAttribFormat" es2="3.1"> <param name="attribindex" type="GLuint"/> <param name="size" type="GLint"/> <param name="type" type="GLenum"/> @@ -22,7 +22,7 @@ <param name="relativeoffset" type="GLuint"/> </function> - <function name="VertexAttribIFormat"> + <function name="VertexAttribIFormat" es2="3.1"> <param name="attribindex" type="GLuint"/> <param name="size" type="GLint"/> <param name="type" type="GLenum"/> @@ -36,12 +36,12 @@ <param name="relativeoffset" type="GLuint"/> </function> - <function name="VertexAttribBinding"> + <function name="VertexAttribBinding" es2="3.1"> <param name="attribindex" type="GLuint"/> <param name="bindingindex" type="GLuint"/> </function> - <function name="VertexBindingDivisor"> + <function name="VertexBindingDivisor" es2="3.1"> <param name="attribindex" type="GLuint"/> <param name="divisor" type="GLuint"/> </function> diff --git a/src/mapi/glapi/gen/GL3x.xml b/src/mapi/glapi/gen/GL3x.xml index 348d522..7919d65 100644 --- a/src/mapi/glapi/gen/GL3x.xml +++ b/src/mapi/glapi/gen/GL3x.xml @@ -166,7 +166,7 @@ <param name="a" type="GLboolean"/> </function> - <function name="GetBooleani_v"> + <function name="GetBooleani_v" es2="3.1"> <param name="value" type="GLenum"/> <param name="index" type="GLuint"/> <param name="data" type="GLboolean *"/> diff --git a/src/mapi/glapi/gen/gl_API.xml b/src/mapi/glapi/gen/gl_API.xml index 3090b9f..bd8db62 100644 --- a/src/mapi/glapi/gen/gl_API.xml +++ b/src/mapi/glapi/gen/gl_API.xml @@ -2824,7 +2824,7 @@ <glx sop="137"/> </function> - <function name="GetTexLevelParameterfv"> + <function name="GetTexLevelParameterfv" es2="3.1"> <param name="target" type="GLenum"/> <param name="level" type="GLint"/> <param name="pname" type="GLenum"/> @@ -2832,7 +2832,7 @@ <glx sop="138"/> </function> - <function name="GetTexLevelParameteriv"> + <function name="GetTexLevelParameteriv" es2="3.1"> <param name="target" type="GLenum"/> <param name="level" type="GLint"/> <param name="pname" type="GLenum"/> |