On 07/13/2015 10:39 PM, Ilia Mirkin wrote:
On Jul 13, 2015 9:21 PM, "Brian Paul" <bri...@vmware.com <mailto:bri...@vmware.com>> wrote: > > This adds the new glGetTextureSubImage() and > glGetCompressedTextureSubImage() functions. Also update the > dispatch sanity test program. > --- > src/mapi/glapi/gen/ARB_get_texture_sub_image.xml | 42 ++++++++++++++++++++++++ > src/mapi/glapi/gen/Makefile.am | 1 + > src/mapi/glapi/gen/gl_API.xml | 3 ++ > src/mesa/main/tests/dispatch_sanity.cpp | 5 +++ > 4 files changed, 51 insertions(+) > create mode 100644 src/mapi/glapi/gen/ARB_get_texture_sub_image.xml > > diff --git a/src/mapi/glapi/gen/ARB_get_texture_sub_image.xml b/src/mapi/glapi/gen/ARB_get_texture_sub_image.xml > new file mode 100644 > index 0000000..6acc92d > --- /dev/null > +++ b/src/mapi/glapi/gen/ARB_get_texture_sub_image.xml > @@ -0,0 +1,42 @@ > +<?xml version="1.0"?> > +<!DOCTYPE OpenGLAPI SYSTEM "gl_API.dtd"> > + > +<!-- This is included by gl_and_es_API.xml. Could be moved to gl_API.xml. --> > + > +<OpenGLAPI> > + > +<category name="GL_ARB_get_texture_sub_image" number="96"> > + > + <function name="GetTextureSubImage" offset="assign"> > + <param name="program" type="GLuint"/> > + <param name="level" type="GLint"/> > + <param name="xoffset" type="GLint"/> > + <param name="yoffset" type="GLint"/> > + <param name="zoffset" type="GLint"/> > + <param name="width" type="GLsizei"/> > + <param name="height" type="GLsizei"/> > + <param name="depth" type="GLsizei"/> > + <param name="format" type="GLenum"/> > + <param name="type" type="GLenum"/> > + <param name="bufSize" type="GLsizei"/> > + <param name="pixels" type="GLvoid *"/> > + </function> > + > + <function name="GetCompressedTextureSubImage" offset="assign"> > + <param name="texture" type="GLuint"/> > + <param name="level" type="GLint"/> > + <param name="xoffset" type="GLint"/> > + <param name="yoffset" type="GLint"/> > + <param name="zoffset" type="GLint"/> > + <param name="width" type="GLsizei"/> > + <param name="height" type="GLsizei"/> > + <param name="depth" type="GLsizei"/> > + <param name="bufSize" type="GLsizei"/> > + <param name="pixels" type="GLvoid *"/> > + </function> > + > +{ I'm surprised this parsed ok... > + > +</category> > + > +</OpenGLAPI> > diff --git a/src/mapi/glapi/gen/Makefile.am b/src/mapi/glapi/gen/Makefile.am > index 5b163b0..170898c 100644 > --- a/src/mapi/glapi/gen/Makefile.am > +++ b/src/mapi/glapi/gen/Makefile.am > @@ -135,6 +135,7 @@ API_XML = \ > ARB_framebuffer_object.xml \ > ARB_geometry_shader4.xml \ > ARB_get_program_binary.xml \ > + ARB_get_texture_sub_image.xml \ > ARB_gpu_shader_fp64.xml \ > ARB_gpu_shader5.xml \ > ARB_instanced_arrays.xml \ > diff --git a/src/mapi/glapi/gen/gl_API.xml b/src/mapi/glapi/gen/gl_API.xml > index 2f33075..9cc2c3a 100644 > --- a/src/mapi/glapi/gen/gl_API.xml > +++ b/src/mapi/glapi/gen/gl_API.xml > @@ -12890,4 +12890,7 @@ > > <xi:include href="GL4x.xml" xmlns:xi="http://www.w3.org/2001/XInclude <https://urldefense.proofpoint.com/v2/url?u=http-3A__www.w3.org_2001_XInclude&d=BQMFaQ&c=Sqcl0Ez6M0X8aeM67LKIiDJAXVeAw-YihVMNtXt-uEs&r=T0t4QG7chq2ZwJo6wilkFznRSFy-8uDKartPGbomVj8&m=ToHgE6DMEOpm4S89hp7wSY1lIWIll44HgyIbnKhSSLI&s=cXUe_bgDyEIQsr4bHK-69TJ-kn0o30t6ne15fa_Mozs&e=>"/> > > +<xi:include href="ARB_get_texture_sub_image.xml" xmlns:xi="http://www.w3.org/2001/XInclude <https://urldefense.proofpoint.com/v2/url?u=http-3A__www.w3.org_2001_XInclude&d=BQMFaQ&c=Sqcl0Ez6M0X8aeM67LKIiDJAXVeAw-YihVMNtXt-uEs&r=T0t4QG7chq2ZwJo6wilkFznRSFy-8uDKartPGbomVj8&m=ToHgE6DMEOpm4S89hp7wSY1lIWIll44HgyIbnKhSSLI&s=cXUe_bgDyEIQsr4bHK-69TJ-kn0o30t6ne15fa_Mozs&e=>"/> I believe these are usually included in ext number order.
Fixed. Do you want to see the v2? -Brian _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
