Mesa (master): glapi: Fix build break in 'make check' on non-shared-glapi builds

Ian Romanick idr at kemper.freedesktop.org
Wed Apr 2 18:41:23 UTC 2014


Module: Mesa
Branch: master
Commit: 8e3a7c620440fab014e41b18badf73ca9dfdba45
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=8e3a7c620440fab014e41b18badf73ca9dfdba45

Author: Ian Romanick <ian.d.romanick at intel.com>
Date:   Tue Apr  1 12:56:31 2014 -0700

glapi: Fix build break in 'make check' on non-shared-glapi builds

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>
Reviewed-by: Timothy Arceri <t_arceri at yahoo.com.au>
Tested-by: Brian Paul <brianp at vmware.com>
Tested-by: Lu Hua <huax.lu at intel.com>
Cc: Vinson Lee <vlee at freedesktop.org>

---

 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) },




More information about the mesa-commit mailing list