Mesa (master): Properly check GLX_INDIRECT_RENDERING in glapi/tests/ check_table
Jon TURNEY
jturney at kemper.freedesktop.org
Wed Mar 13 14:56:55 UTC 2013
Module: Mesa
Branch: master
Commit: 28e169363033aff7752382d790886eaadd4787f9
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=28e169363033aff7752382d790886eaadd4787f9
Author: Jon TURNEY <jon.turney at dronecode.org.uk>
Date: Wed Feb 27 15:32:37 2013 +0000
Properly check GLX_INDIRECT_RENDERING in glapi/tests/check_table
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
---
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..26149c9 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,
More information about the mesa-commit
mailing list