On 16/02/2014 02:00, Jeremy Huddleston Sequoia wrote: > Mesa master hasn't built for OSX for over a year now, unfortunately, > but I agree excluding in Makefile.am is preferable to cpp-guards. > Hopefully "someone" will have the time and patience to get it working > again in the near future.
On 18/02/2014 01:35, Jeremy Huddleston Sequoia wrote: > Apple-DRI is something completely different. It uses > OpenGL.framework and is not backed by gallium or swrast. It was done > over a decade ago as a branch of XFree86 that was never accepted and > merged back in. Code diverged and about 7 years ago, we started > trying to get XQuartz' merged into freedesktop.org. That process was > pretty much fully completed by about 4 years ago except for mesa. > Mesa only supports AppleDRI in a separate build configuration which > makes it impossible to have a libGL that supports indirect GLX when > the server is remote and Apple-DRI when it is local. Since in it's current state this code is a bit of a roadblock for some work I want to do to add something similar for Cygwin, I've had a go at fixing this up. The nomenclature in [2/3] isn't very satisfactory, but I couldn't come up with anything better. Jon TURNEY (3): Fix build for darwin Make DRI dependencies and build depend on the target Fix build of appleglx configure.ac | 96 +++++++++++++++++---- src/egl/main/Makefile.am | 2 +- src/gallium/Automake.inc | 8 ++ src/gallium/state_trackers/Makefile.am | 2 +- src/gallium/state_trackers/dri/Makefile.am | 6 +- src/gallium/targets/Makefile.am | 18 ++-- src/gallium/targets/gbm/Makefile.am | 2 +- src/gallium/targets/opencl/Makefile.am | 2 +- src/gallium/targets/xa/Makefile.am | 2 +- src/gallium/tests/trivial/Makefile.am | 2 +- src/gallium/winsys/Makefile.am | 2 +- src/gbm/Makefile.am | 2 +- src/glx/Makefile.am | 31 +++++-- src/glx/apple/Makefile | 131 ---------------------------- src/glx/apple/Makefile.am | 31 +++++++ src/glx/apple/apple_glapi.c | 1 + src/glx/apple/apple_glx.c | 2 - src/glx/apple/apple_glx.h | 1 - src/glx/apple/apple_xgl_api_read.c | 1 + src/glx/apple/apple_xgl_api_stereo.c | 7 +- src/glx/apple/apple_xgl_api_viewport.c | 1 + src/glx/apple/glxreply.c | 134 ----------------------------- src/glx/applegl_glx.c | 6 +- src/glx/glx_pbuffer.c | 2 +- src/glx/glxcmds.c | 4 +- src/glx/glxcurrent.c | 6 -- src/glx/glxext.c | 4 +- src/glx/indirect_glx.c | 4 + src/glx/render2.c | 4 + src/glx/vertarr.c | 3 + src/mapi/glapi/Makefile.am | 4 +- src/mapi/glapi/Makefile.sources | 4 +- src/mapi/glapi/gen/glX_proto_send.py | 3 + src/mesa/Makefile.am | 2 +- src/mesa/drivers/dri/Makefile.am | 2 +- 35 files changed, 201 insertions(+), 331 deletions(-) delete mode 100644 src/glx/apple/Makefile create mode 100644 src/glx/apple/Makefile.am delete mode 100644 src/glx/apple/glxreply.c -- 1.8.5.5 _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
