Fix build of appleglx
authorJon TURNEY <jon.turney@dronecode.org.uk>
Mon, 12 May 2014 09:47:07 +0000 (10:47 +0100)
committerJon TURNEY <jon.turney@dronecode.org.uk>
Fri, 23 May 2014 14:24:07 +0000 (15:24 +0100)
commit5a459a036e33683410bab4df431ed553bd0eeb66
treef45ad877571c64d1163ba4c8afb5038eb75d32d1
parent45f9aae004f7bd723c3f313ee3dd8a25aa420ffa
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 <jon.turney@dronecode.org.uk>
Reviewed-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com>
22 files changed:
configure.ac
src/glx/Makefile.am
src/glx/apple/Makefile [deleted file]
src/glx/apple/Makefile.am [new file with mode: 0644]
src/glx/apple/apple_glapi.c
src/glx/apple/apple_glx.c
src/glx/apple/apple_glx.h
src/glx/apple/apple_xgl_api_read.c
src/glx/apple/apple_xgl_api_stereo.c
src/glx/apple/apple_xgl_api_viewport.c
src/glx/apple/glxreply.c [deleted file]
src/glx/applegl_glx.c
src/glx/glx_pbuffer.c
src/glx/glxcmds.c
src/glx/glxcurrent.c
src/glx/glxext.c
src/glx/indirect_glx.c
src/glx/render2.c
src/glx/vertarr.c
src/mapi/glapi/Makefile.am
src/mapi/glapi/Makefile.sources
src/mapi/glapi/gen/glX_proto_send.py