summaryrefslogtreecommitdiff
path: root/hw/xquartz
diff options
context:
space:
mode:
authorJeremy Huddleston <jeremyhu@apple.com>2011-06-03 02:50:40 -0400
committerJeremy Huddleston <jeremyhu@apple.com>2011-06-03 16:01:18 -0400
commitfeab04397de2684568dedaaaa8f299cac9f44f8b (patch)
tree86cc93df4730d0f838c948d74a26998f0f534f91 /hw/xquartz
parent3fa5d27e46ea8af55dcaaad7a99973c38bd11967 (diff)
XQuartz: AIGLX: Remove unnecessary includes in indirect.c
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
Diffstat (limited to 'hw/xquartz')
-rw-r--r--hw/xquartz/GL/indirect.c32
1 files changed, 9 insertions, 23 deletions
diff --git a/hw/xquartz/GL/indirect.c b/hw/xquartz/GL/indirect.c
index 40f1e9390..ca25e73bd 100644
--- a/hw/xquartz/GL/indirect.c
+++ b/hw/xquartz/GL/indirect.c
@@ -35,48 +35,34 @@
#include <dix-config.h>
#endif
-#include "dri.h"
-
#include <AvailabilityMacros.h>
#include <dlfcn.h>
-#define GL_GLEXT_WUNDEF_SUPPORT
-
#include <OpenGL/OpenGL.h>
-#include <OpenGL/CGLContext.h>
+#include <OpenGL/gl.h> /* Just to prevent glxserver.h from loading mesa's and colliding with OpenGL.h */
+#include <X11/Xproto.h>
#include <GL/glxproto.h>
-#include <windowstr.h>
-#include <resource.h>
-#include <GL/glxint.h>
-#include <GL/glxtokens.h>
-#include <scrnintstr.h>
+
#include <glxserver.h>
-#include <glxscreens.h>
-#include <glxdrawable.h>
-#include <glxcontext.h>
-#include <glxext.h>
#include <glxutil.h>
-#include <GL/internal/glcore.h>
-#include "x-hash.h"
-#include "x-list.h"
-
-//#include "capabilities.h"
-#include "visualConfigs.h"
typedef unsigned long long GLuint64EXT;
typedef long long GLint64EXT;
#include <dispatch.h>
-#include <Xplugin.h>
#include <glapi.h>
-#include <glapitable.h>
-__GLXprovider * GlxGetDRISWrastProvider (void);
+#include "x-hash.h"
+
+#include "visualConfigs.h"
+#include "dri.h"
#include "darwin.h"
#define GLAQUA_DEBUG_MSG(msg, args...) ASL_LOG(ASL_LEVEL_DEBUG, "GLXAqua", msg, ##args)
+__GLXprovider * GlxGetDRISWrastProvider (void);
+
static void setup_dispatch_table(void);
GLuint __glFloorLog2(GLuint val);
void warn_func(void * p1, char *format, ...);