[Xquartz-changes] mesa: Branch '7.8' - 2 commits
Jeremy Huddleston
jeremyhu at freedesktop.org
Mon Apr 12 18:54:55 PDT 2010
src/glx/apple/apple_glx_context.h | 12 ++++++++++--
src/glx/apple/apple_glx_drawable.h | 6 +++++-
src/glx/apple/apple_glx_pbuffer.c | 9 ++++++---
src/glx/apple/apple_visual.c | 9 +++++++++
src/glx/apple/gen_funcs.tcl | 4 ++--
5 files changed, 32 insertions(+), 8 deletions(-)
New commits:
commit 8b0fb7649148d274f15dbb6877515cc224dedd1f
Author: Jeremy Huddleston <jeremyhu at apple.com>
Date: Mon Apr 12 18:37:47 2010 -0700
Avoid possible build failures due to broken OpenGL.framework
Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>
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..e5a9df9 100644
--- a/src/glx/apple/apple_glx_pbuffer.c
+++ b/src/glx/apple/apple_glx_pbuffer.c
@@ -27,14 +27,17 @@
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"
static bool pbuffer_make_current(struct apple_glx_context *ac,
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"
commit b93a306a2f454101eeb8554a5682d707d7236e9d
Author: Jeremy Huddleston <jeremyhu at apple.com>
Date: Mon Apr 12 18:26:40 2010 -0700
Correct types for ClampColor
Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>
diff --git a/src/glx/apple/gen_funcs.tcl b/src/glx/apple/gen_funcs.tcl
index e78eb32..8db0634 100644
--- a/src/glx/apple/gen_funcs.tcl
+++ b/src/glx/apple/gen_funcs.tcl
@@ -226,8 +226,8 @@ array set typemap {
VertexAttribPointerPropertyARB GLenum
CharPointer "GLchar *"
VertexAttribPointerTypeARB GLenum
- ClampColorTargetARB unknown3.0
- ClampColorModeARB unknown3.0
+ ClampColorTargetARB GLenum
+ ClampColorModeARB GLenum
VertexAttribEnum GLenum
VertexAttribEnumNV GLenum
DrawBufferName unknown3.0
More information about the Xquartz-changes
mailing list