[Mesa-dev] [PATCH 3/3] Properly check GLX_INDIRECT_RENDERING in glapi/tests/check_table

Jon TURNEY jon.turney at dronecode.org.uk
Wed Feb 27 08:36:23 PST 2013


Actually use $DEFINES, so we can see if GLX_INDIRECT_RENDERING is defined

If GLX_INDIRECT_RENDERING is defined,  _GLAPI_SKIP_PROTO_ENTRY_POINTS will
be defined, and libglapi won't contain the 'protocol entry points', so we
should provide stubs in check_table.cpp

Signed-off-by: Jon TURNEY <jon.turney at dronecode.org.uk>
---
 src/mapi/glapi/tests/Makefile.am     |    1 +
 src/mapi/glapi/tests/check_table.cpp |    2 +-
 2 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/src/mapi/glapi/tests/Makefile.am b/src/mapi/glapi/tests/Makefile.am
index 3553b99..f375e9b 100644
--- a/src/mapi/glapi/tests/Makefile.am
+++ b/src/mapi/glapi/tests/Makefile.am
@@ -1,6 +1,7 @@
 if !HAVE_SHARED_GLAPI
 AM_CFLAGS = $(PTHREAD_CFLAGS)
 AM_CPPFLAGS = \
+        $(DEFINES) \
 	-I$(top_srcdir)/src/gtest/include \
 	-I$(top_srcdir)/src/mapi \
 	-I$(top_srcdir)/include
diff --git a/src/mapi/glapi/tests/check_table.cpp b/src/mapi/glapi/tests/check_table.cpp
index dffec83..375645b 100644
--- a/src/mapi/glapi/tests/check_table.cpp
+++ b/src/mapi/glapi/tests/check_table.cpp
@@ -1511,7 +1511,7 @@ const struct name_offset known_dispatch[] = {
    { NULL, 0 }
 };
 
-#ifndef GLX_INDIRECT_RENDERING
+#ifdef GLX_INDIRECT_RENDERING
 extern "C" {
 GLAPI GLboolean GLAPIENTRY
 glAreTexturesResidentEXT(GLsizei n, const GLuint *textures,
-- 
1.7.9



More information about the mesa-dev mailing list