Mesa (7.8): f
Jeremy Huddleston
jeremyhu at kemper.freedesktop.org
Tue Apr 27 19:23:48 UTC 2010
Module: Mesa
Branch: 7.8
Commit: 39bd4602c0c31d4984293fd6e419405aca32d940
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=39bd4602c0c31d4984293fd6e419405aca32d940
Author: Jeremy Huddleston <jeremyhu at apple.com>
Date: Tue Apr 27 12:22:50 2010 -0700
f
Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>
---
src/glx/apple/apple_glx_pbuffer.c | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/src/glx/apple/apple_glx_pbuffer.c b/src/glx/apple/apple_glx_pbuffer.c
index b754ab5..1466fea 100644
--- a/src/glx/apple/apple_glx_pbuffer.c
+++ b/src/glx/apple/apple_glx_pbuffer.c
@@ -27,6 +27,13 @@
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>
*/
@@ -40,7 +47,9 @@
#include "glcontextmodes.h"
#include "apple_cgl.h"
-/* mesa defines in glew.h, should be in glext.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
More information about the mesa-commit
mailing list