Initial support for PowerPC specific code in Mesa and DRI drivers. DRI

[mesa.git] / src / mesa / drivers / dri / common / dri_util.h

diff --git a/src/mesa/drivers/dri/common/dri_util.h b/src/mesa/drivers/dri/common/dri_util.h
index 5ecc39a69b0b82a861d2b3e7501fd475f31506f5..cdb65763773dae75b57856437e98e1ee574cbd27 100644 (file)
--- a/src/mesa/drivers/dri/common/dri_util.h
+++ b/src/mesa/drivers/dri/common/dri_util.h
@@ -54,10 +54,17 @@
 #define CAPI  /* XXX this should be globally defined somewhere */
 
 #include <inttypes.h>
-#include "glxclient.h"           /* for GLXDrawable */
-#include "drm.h"             /* for drm_clip_rect_t */
-#include "drm_sarea.h"               /* for XF86DRISAREAPtr */
-#include "GL/internal/glcore.h"  /* for __GLcontextModes */
+#ifdef DRI_NEW_INTERFACE_ONLY
+# include <GL/gl.h>
+#else
+# include "glxclient.h"
+#endif /* DRI_NEW_INTERFACE_ONLY */
+#include "drm.h"
+#include "drm_sarea.h"
+#include "GL/internal/glcore.h"
+#include "GL/internal/dri_interface.h"
+
+#define GLX_BAD_CONTEXT                    5
 
 /* This is a temporary relic.  Once all drivers are converted to support
  * the new interface, it can go away.
@@ -551,6 +558,9 @@ extern float
 driCalculateSwapUsage( __DRIdrawablePrivate *dPriv,
                       int64_t last_swap_ust, int64_t current_ust );
 
+extern void 
+(*glXGetProcAddress(const GLubyte *procname))( void );
+
 #endif /* GLX_DIRECT_RENDERING */
 
 #endif /* _DRI_UTIL_H_ */