Module: Mesa Branch: 7.8 Commit: 74a6d1aeaa0325f5f41498462b931f285ffa1939 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=74a6d1aeaa0325f5f41498462b931f285ffa1939
Author: Jeremy Huddleston <[email protected]> Date: Mon Apr 12 18:37:47 2010 -0700 Buildfixes to work around issues in OpenGL.framework Signed-off-by: Jeremy Huddleston <[email protected]> --- src/glx/apple/apple_glx_context.h | 12 ++++++++++-- src/glx/apple/apple_glx_drawable.h | 6 +++++- src/glx/apple/apple_glx_pbuffer.c | 14 +++++++++++--- src/glx/apple/apple_visual.c | 9 +++++++++ src/glx/apple/apple_xgl_api_viewport.c | 2 ++ src/glx/apple/apple_xgl_api_viewport.h | 2 +- 6 files changed, 38 insertions(+), 7 deletions(-) diff --git a/src/glx/apple/apple_glx_context.h b/src/glx/apple/apple_glx_context.h index 7e2394f..c2a3e3f 100644 --- a/src/glx/apple/apple_glx_context.h +++ b/src/glx/apple/apple_glx_context.h @@ -29,11 +29,19 @@ #ifndef APPLE_GLX_CONTEXT_H #define APPLE_GLX_CONTEXT_H +/* <rdar://problem/6953344> */ +#define glTexImage1D glTexImage1D_OSX +#define glTexImage2D glTexImage2D_OSX +#define glTexImage3D glTexImage3D_OSX +#include <OpenGL/CGLTypes.h> +#include <OpenGL/CGLContext.h> +#undef glTexImage1D +#undef glTexImage2D +#undef glTexImage3D + #include <stdbool.h> #include <X11/Xlib.h> #include <GL/glx.h> -#include <OpenGL/CGLTypes.h> -#include <OpenGL/CGLContext.h> #define XP_NO_X_HEADERS #include <Xplugin.h> #undef XP_NO_X_HEADERS diff --git a/src/glx/apple/apple_glx_drawable.h b/src/glx/apple/apple_glx_drawable.h index a158589..e49eae3 100644 --- a/src/glx/apple/apple_glx_drawable.h +++ b/src/glx/apple/apple_glx_drawable.h @@ -29,6 +29,11 @@ #ifndef APPLE_GLX_DRAWABLE_H #define APPLE_GLX_DRAWABLE_H +/* Must be first for: + * <rdar://problem/6953344> + */ +#include "apple_glx_context.h" + #include <pthread.h> #include <stdbool.h> #include <limits.h> @@ -36,7 +41,6 @@ #define XP_NO_X_HEADERS #include <Xplugin.h> #undef XP_NO_X_HEADERS -#include "apple_glx_context.h" enum { diff --git a/src/glx/apple/apple_glx_pbuffer.c b/src/glx/apple/apple_glx_pbuffer.c index fb56b75..b754ab5 100644 --- a/src/glx/apple/apple_glx_pbuffer.c +++ b/src/glx/apple/apple_glx_pbuffer.c @@ -27,16 +27,24 @@ prior written authorization. */ +/* Must be first for: + * <rdar://problem/6953344> + */ +#include "apple_glx_context.h" +#include "apple_glx_drawable.h" + #include <stdlib.h> #include <pthread.h> #include <assert.h> -#include <GL/glew.h> #include "apple_glx.h" #include "glcontextmodes.h" -#include "apple_glx_context.h" -#include "apple_glx_drawable.h" #include "apple_cgl.h" +/* mesa defines in glew.h, should be in glext.h */ +#ifndef GL_TEXTURE_RECTANGLE_EXT +#define GL_TEXTURE_RECTANGLE_EXT 0x84F5 +#endif + static bool pbuffer_make_current(struct apple_glx_context *ac, struct apple_glx_drawable *d); diff --git a/src/glx/apple/apple_visual.c b/src/glx/apple/apple_visual.c index e809147..da5aa05 100644 --- a/src/glx/apple/apple_visual.c +++ b/src/glx/apple/apple_visual.c @@ -32,9 +32,18 @@ #include <stdlib.h> #include <assert.h> #include <GL/gl.h> + +/* <rdar://problem/6953344> */ +#define glTexImage1D glTexImage1D_OSX +#define glTexImage2D glTexImage2D_OSX +#define glTexImage3D glTexImage3D_OSX #include <OpenGL/OpenGL.h> #include <OpenGL/CGLContext.h> #include <OpenGL/CGLRenderers.h> +#undef glTexImage1D +#undef glTexImage2D +#undef glTexImage3D + #include "apple_cgl.h" #include "apple_visual.h" #include "apple_glx.h" diff --git a/src/glx/apple/apple_xgl_api_viewport.c b/src/glx/apple/apple_xgl_api_viewport.c index f556eef..e3209f9 100644 --- a/src/glx/apple/apple_xgl_api_viewport.c +++ b/src/glx/apple/apple_xgl_api_viewport.c @@ -26,6 +26,8 @@ promote the sale, use or other dealings in this Software without prior written authorization. */ +#include "glxclient.h" + #include "apple_glx_context.h" #include "apple_xgl_api.h" #include "apple_xgl_api_viewport.h" diff --git a/src/glx/apple/apple_xgl_api_viewport.h b/src/glx/apple/apple_xgl_api_viewport.h index 6c89ca7..d9f285e 100644 --- a/src/glx/apple/apple_xgl_api_viewport.h +++ b/src/glx/apple/apple_xgl_api_viewport.h @@ -29,7 +29,7 @@ #ifndef APPLE_XGL_API_VIEWPORT_H #define APPLE_XGL_API_VIEWPORT_H -#include "glxclient.h" +#include <GL/gl.h> void glViewport(GLint x, GLint y, GLsizei width, GLsizei height); _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
