The patch subject should be changed, because it adds only a tiny subset of the extension.
Marek On Sat, Sep 8, 2018 at 12:32 AM Timothy Arceri <tarc...@itsqueeze.com> wrote: > > From: Chris Forbes <chr...@ijw.co.nz> > > Signed-off-by: Chris Forbes <chr...@ijw.co.nz> > --- > .../glapi/gen/EXT_direct_state_access.xml | 101 ++++++++++++++++++ > src/mapi/glapi/gen/gl_API.xml | 3 + > src/mesa/main/tests/dispatch_sanity.cpp | 30 +++--- > 3 files changed, 119 insertions(+), 15 deletions(-) > create mode 100644 src/mapi/glapi/gen/EXT_direct_state_access.xml > > diff --git a/src/mapi/glapi/gen/EXT_direct_state_access.xml > b/src/mapi/glapi/gen/EXT_direct_state_access.xml > new file mode 100644 > index 00000000000..c19afe80a22 > --- /dev/null > +++ b/src/mapi/glapi/gen/EXT_direct_state_access.xml > @@ -0,0 +1,101 @@ > +<?xml version="1.0"?> > +<!DOCTYPE OpenGLAPI SYSTEM "gl_API.dtd"> > + > +<!-- Note: no GLX protocol info yet. --> > + > +<OpenGLAPI> > + > +<category name="GL_EXT_direct_state_access" number="353"> > + > + <!-- > + This extension is unusual in that it is ALL interactions > + with specific GL versions and other extensions. > + --> > + > + <!-- GL1.0 extras --> > + > + <function name="MatrixLoadfEXT" offset="assign"> > + <param name="matrixMode" type="GLenum" /> > + <param name="m" type="const GLfloat *" /> > + </function> > + <function name="MatrixLoaddEXT" offset="assign"> > + <param name="matrixMode" type="GLenum" /> > + <param name="m" type="const GLdouble *" /> > + </function> > + <function name="MatrixMultfEXT" offset="assign"> > + <param name="matrixMode" type="GLenum" /> > + <param name="m" type="const GLfloat *" /> > + </function> > + <function name="MatrixMultdEXT" offset="assign"> > + <param name="matrixMode" type="GLenum" /> > + <param name="m" type="const GLdouble *" /> > + </function> > + <function name="MatrixLoadIdentityEXT" offset="assign"> > + <param name="matrixMode" type="GLenum" /> > + </function> > + <function name="MatrixRotatefEXT" offset="assign"> > + <param name="matrixMode" type="GLenum" /> > + <param name="angle" type="GLfloat" /> > + <param name="x" type="GLfloat" /> > + <param name="y" type="GLfloat" /> > + <param name="z" type="GLfloat" /> > + </function> > + <function name="MatrixRotatedEXT" offset="assign"> > + <param name="matrixMode" type="GLenum" /> > + <param name="angle" type="GLdouble" /> > + <param name="x" type="GLdouble" /> > + <param name="y" type="GLdouble" /> > + <param name="z" type="GLdouble" /> > + </function> > + <function name="MatrixScalefEXT" offset="assign"> > + <param name="matrixMode" type="GLenum" /> > + <param name="x" type="GLfloat" /> > + <param name="y" type="GLfloat" /> > + <param name="z" type="GLfloat" /> > + </function> > + <function name="MatrixScaledEXT" offset="assign"> > + <param name="matrixMode" type="GLenum" /> > + <param name="x" type="GLdouble" /> > + <param name="y" type="GLdouble" /> > + <param name="z" type="GLdouble" /> > + </function> > + <function name="MatrixTranslatefEXT" offset="assign"> > + <param name="matrixMode" type="GLenum" /> > + <param name="x" type="GLfloat" /> > + <param name="y" type="GLfloat" /> > + <param name="z" type="GLfloat" /> > + </function> > + <function name="MatrixTranslatedEXT" offset="assign"> > + <param name="matrixMode" type="GLenum" /> > + <param name="x" type="GLdouble" /> > + <param name="y" type="GLdouble" /> > + <param name="z" type="GLdouble" /> > + </function> > + <function name="MatrixOrthoEXT" offset="assign"> > + <param name="matrixMode" type="GLenum" /> > + <param name="l" type="GLdouble" /> > + <param name="r" type="GLdouble" /> > + <param name="b" type="GLdouble" /> > + <param name="t" type="GLdouble" /> > + <param name="n" type="GLdouble" /> > + <param name="f" type="GLdouble" /> > + </function> > + <function name="MatrixFrustumEXT" offset="assign"> > + <param name="matrixMode" type="GLenum" /> > + <param name="l" type="GLdouble" /> > + <param name="r" type="GLdouble" /> > + <param name="b" type="GLdouble" /> > + <param name="t" type="GLdouble" /> > + <param name="n" type="GLdouble" /> > + <param name="f" type="GLdouble" /> > + </function> > + <function name="MatrixPushEXT" offset="assign"> > + <param name="matrixMode" type="GLenum" /> > + </function> > + <function name="MatrixPopEXT" offset="assign"> > + <param name="matrixMode" type="GLenum" /> > + </function> > + > +</category> > + > +</OpenGLAPI> > diff --git a/src/mapi/glapi/gen/gl_API.xml b/src/mapi/glapi/gen/gl_API.xml > index aae9a5835db..8403c80eb37 100644 > --- a/src/mapi/glapi/gen/gl_API.xml > +++ b/src/mapi/glapi/gen/gl_API.xml > @@ -12944,6 +12944,9 @@ > <xi:include href="AMD_depth_clamp_separate.xml" > xmlns:xi="http://www.w3.org/2001/XInclude"/> > > +<xi:include href="EXT_direct_state_access.xml" > + xmlns:xi="http://www.w3.org/2001/XInclude"/> > + > <category name="GL_EXT_texture_sRGB_decode" number="402"> > <enum name="TEXTURE_SRGB_DECODE_EXT" value="0x8A48"/> > <enum name="DECODE_EXT" value="0x8A49"/> > diff --git a/src/mesa/main/tests/dispatch_sanity.cpp > b/src/mesa/main/tests/dispatch_sanity.cpp > index 8b03f5377b3..e0ed7c17329 100644 > --- a/src/mesa/main/tests/dispatch_sanity.cpp > +++ b/src/mesa/main/tests/dispatch_sanity.cpp > @@ -1016,21 +1016,21 @@ const struct function > common_desktop_functions_possible[] = { > { "glGetQueryBufferObjectui64v", 45, -1 }, > > /* GL_EXT_direct_state_access - GL 1.0 */ > - //{ "glMatrixLoadfEXT", 10, -1 }, > - //{ "glMatrixLoaddEXT", 10, -1 }, > - //{ "glMatrixMultfEXT", 10, -1 }, > - //{ "glMatrixMultdEXT", 10, -1 }, > - //{ "glMatrixLoadIdentityEXT", 10, -1 }, > - //{ "glMatrixRotatefEXT", 10, -1 }, > - //{ "glMatrixRotatedEXT", 10, -1 }, > - //{ "glMatrixScalefEXT", 10, -1 }, > - //{ "glMatrixScaledEXT", 10, -1 }, > - //{ "glMatrixTranslatefEXT", 10, -1 }, > - //{ "glMatrixTranslatedEXT", 10, -1 }, > - //{ "glMatrixOrthoEXT", 10, -1 }, > - //{ "glMatrixFrustumEXT", 10, -1 }, > - //{ "glMatrixPushEXT", 10, -1 }, > - //{ "glMatrixPopEXT", 10, -1 }, > + { "glMatrixLoadfEXT", 10, -1 }, > + { "glMatrixLoaddEXT", 10, -1 }, > + { "glMatrixMultfEXT", 10, -1 }, > + { "glMatrixMultdEXT", 10, -1 }, > + { "glMatrixLoadIdentityEXT", 10, -1 }, > + { "glMatrixRotatefEXT", 10, -1 }, > + { "glMatrixRotatedEXT", 10, -1 }, > + { "glMatrixScalefEXT", 10, -1 }, > + { "glMatrixScaledEXT", 10, -1 }, > + { "glMatrixTranslatefEXT", 10, -1 }, > + { "glMatrixTranslatedEXT", 10, -1 }, > + { "glMatrixOrthoEXT", 10, -1 }, > + { "glMatrixFrustumEXT", 10, -1 }, > + { "glMatrixPushEXT", 10, -1 }, > + { "glMatrixPopEXT", 10, -1 }, > /* GL_EXT_direct_state_access - GL 1.1 */ > //{ "glClientAttribDefaultEXT", 10, -1 }, > //{ "glPushClientAttribDefaultEXT", 10, -1 }, > -- > 2.17.1 > > _______________________________________________ > mesa-dev mailing list > mesa-dev@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/mesa-dev _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
