summaryrefslogtreecommitdiff
path: root/src/glx/apple/apple_glx_pbuffer.c
diff options
context:
space:
mode:
authorJeremy Huddleston <jeremyhu@apple.com>2010-04-12 18:37:47 -0700
committerJeremy Huddleston <jeremyhu@apple.com>2010-04-27 12:37:16 -0700
commita1cb3babbef2af222b839a058694acc82a7074f1 (patch)
treeaabd71a9c7b24c61816f759fd835dc2e1f4170ba /src/glx/apple/apple_glx_pbuffer.c
parentf64773010d0dd204177d08716565db69f6263e0f (diff)
Buildfixes to work around issues in OpenGL.framework
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
Diffstat (limited to 'src/glx/apple/apple_glx_pbuffer.c')
-rw-r--r--src/glx/apple/apple_glx_pbuffer.c23
1 files changed, 20 insertions, 3 deletions
diff --git a/src/glx/apple/apple_glx_pbuffer.c b/src/glx/apple/apple_glx_pbuffer.c
index fb56b7512e..1466fea487 100644
--- a/src/glx/apple/apple_glx_pbuffer.c
+++ b/src/glx/apple/apple_glx_pbuffer.c
@@ -27,16 +27,33 @@
prior written authorization.
*/
+/* Must be before OpenGL.framework is included. Remove once fixed:
+ * <rdar://problem/7872773>
+ */
+#include <GL/gl.h>
+#include <GL/glext.h>
+#define __gltypes_h_ 1
+
+/* 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, Apple in glext.h.
+ * Due to namespace nightmares, just do it here.
+ */
+#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);