diff options
| author | Ian Romanick <idr@us.ibm.com> | 2004-06-06 02:20:20 +0000 |
|---|---|---|
| committer | Ian Romanick <idr@us.ibm.com> | 2004-06-06 02:20:20 +0000 |
| commit | e1a7f31c2b47e053ad70f5c4c519e294c273724c (patch) | |
| tree | 1c1d8402b36cd18019409291fad75c0ebd78ced1 /src/mesa/drivers/dri/common/dri_util.h | |
| parent | 75046c5e594173c331e5978f2c856be7d8efd0ad (diff) | |
Remove the rest of the need for glxclient.h and remove it from the tree.
Diffstat (limited to 'src/mesa/drivers/dri/common/dri_util.h')
| -rw-r--r-- | src/mesa/drivers/dri/common/dri_util.h | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/src/mesa/drivers/dri/common/dri_util.h b/src/mesa/drivers/dri/common/dri_util.h index 5ecc39a69b..276650274d 100644 --- 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. |