[Mesa-dev] [PATCH 2/4] glapi: Fix build break in 'make check' on non-shared-glapi builds

[Timothy Arceri]

On Wed, 2014-04-02 at 00:56 +0200, Dieter Nützel wrote:
> Hello Ian, hello Timothy,
> 
> does this fix the regression introduced with commit fb78fa58?
> 
> [Mesa-dev] Mesa git (r600g): OpenGL Error(GL_INVALID_OPERATION): 
> initTexture2D (bisected)
> http://lists.freedesktop.org/archives/mesa-dev/2014-March/056165.html
> 
> Thanks,
>    Dieter

Hi Dieter,

I just ran ./build/Release/gl-320-primitive-sprite on Mesa 10.2.0-devel
(git-76ba50a) on Intel graphics and it ran fine with no error. Have you
tried running it again with the latest code from git?
Tim

> 
> 
> Am 01.04.2014 22:15, schrieb Ian Romanick:
> > From: Ian Romanick <ian.d.romanick at intel.com>
> > 
> > Commit fb78fa58 made the GL_ARB_debug_output functions aliases of the
> > GL_KHR_debug output functions.  As a result, the function names in
> > struct _glapi_table also changed.  The table in check_table.cpp used 
> > the
> > ARB names.
> > 
> > Signed-off-by: Ian Romanick <ian.d.romanick at intel.com>
> > Cc: Vinson Lee <vlee at freedesktop.org>
> > Cc: Timothy Arceri <t_arceri at yahoo.com.au>
> > ---
> >  src/mapi/glapi/tests/check_table.cpp | 8 ++++----
> >  1 file changed, 4 insertions(+), 4 deletions(-)
> > 
> > diff --git a/src/mapi/glapi/tests/check_table.cpp
> > b/src/mapi/glapi/tests/check_table.cpp
> > index 375645b..89d9073 100644
> > --- a/src/mapi/glapi/tests/check_table.cpp
> > +++ b/src/mapi/glapi/tests/check_table.cpp
> > @@ -1227,10 +1227,10 @@ const struct name_offset known_dispatch[] = {
> >     { "glGetShaderPrecisionFormat", _O(GetShaderPrecisionFormat) },
> >     { "glReleaseShaderCompiler", _O(ReleaseShaderCompiler) },
> >     { "glShaderBinary", _O(ShaderBinary) },
> > -   { "glDebugMessageCallbackARB", _O(DebugMessageCallbackARB) },
> > -   { "glDebugMessageControlARB", _O(DebugMessageControlARB) },
> > -   { "glDebugMessageInsertARB", _O(DebugMessageInsertARB) },
> > -   { "glGetDebugMessageLogARB", _O(GetDebugMessageLogARB) },
> > +   { "glDebugMessageCallback", _O(DebugMessageCallback) },
> > +   { "glDebugMessageControl", _O(DebugMessageControl) },
> > +   { "glDebugMessageInsert", _O(DebugMessageInsert) },
> > +   { "glGetDebugMessageLog", _O(GetDebugMessageLog) },
> >     { "glGetGraphicsResetStatusARB", _O(GetGraphicsResetStatusARB) },
> >     { "glGetnColorTableARB", _O(GetnColorTableARB) },
> >     { "glGetnCompressedTexImageARB", _O(GetnCompressedTexImageARB) },