summaryrefslogtreecommitdiffstats
path: root/src/glx/render2.c
diff options
context:
space:
mode:
authorJon TURNEY <[email protected]>2014-05-12 10:47:07 +0100
committerJon TURNEY <[email protected]>2014-05-23 15:24:07 +0100
commit5a459a036e33683410bab4df431ed553bd0eeb66 (patch)
treef45ad877571c64d1163ba4c8afb5038eb75d32d1 /src/glx/render2.c
parent45f9aae004f7bd723c3f313ee3dd8a25aa420ffa (diff)
Fix build of appleglx
Define GLX_USE_APPLEGL, as config/darwin used to, to turn on specific code to use the applegl direct renderer Convert src/glx/apple/Makefile to automake Since the applegl libGL is now built by linking libappleglx into libGL, rather than by linking selected files into a special libGL: - Remove duplicate code in apple/glxreply.c and apple/apple_glx.c. This makes apple/glxreply.c empty, so remove it - Some indirect rendering code is already guarded by !GLX_USE_APPLEGL, but we need to add those guards to indirect_glx.c, indirect_init.c (via it's generator), render2.c and vertarr.c so they don't generate anything Fix and update various includes glapi_gentable.c (which is only used on darwin), should be included in shared glapi as well, to provide _glapi_create_table_from_handle() Note that neither swrast nor indirect is supported in the APPLEGL path at the moment, which makes things more complex than they need to be. More untangling is needed to allow that v2: Correct apple/Makefile.am for srcdir != builddir Signed-off-by: Jon TURNEY <[email protected]> Reviewed-by: Jeremy Huddleston Sequoia <[email protected]> Reviewed-by: Emil Velikov <[email protected]>
Diffstat (limited to 'src/glx/render2.c')
-rw-r--r--src/glx/render2.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/glx/render2.c b/src/glx/render2.c
index a33c2cf19bf..3dfee7c4651 100644
--- a/src/glx/render2.c
+++ b/src/glx/render2.c
@@ -28,6 +28,8 @@
* Silicon Graphics, Inc.
*/
+#ifndef GLX_USE_APPLEGL
+
#include "packrender.h"
#include "indirect.h"
#include "indirect_size.h"
@@ -379,3 +381,5 @@ __indirect_glDisable(GLenum cap)
__GLX_PUT_LONG(4, cap);
__GLX_END(8);
}
+
+#endif