diff options
| author | Dave Airlie <airlied@redhat.com> | 2009-02-13 01:11:25 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2009-02-13 01:11:25 +1000 |
| commit | 53116910b10e3b8a05f42970eff311c21808699f (patch) | |
| tree | 6831e50a56a02fed324f8cb119e05d837e00d7cf /include/GL/internal/dri_interface.h | |
| parent | 7e104f9cde94279a902b408e8d1cf21779b393a8 (diff) | |
| parent | 0ccbc3c905f0594a35d72887a1f115e148aaa596 (diff) | |
Merge remote branch 'origin/master' into radeon-rewrite
Conflicts:
configure.ac
src/mesa/drivers/dri/r200/r200_context.c
src/mesa/drivers/dri/r300/r300_render.c
Diffstat (limited to 'include/GL/internal/dri_interface.h')
| -rw-r--r-- | include/GL/internal/dri_interface.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/GL/internal/dri_interface.h b/include/GL/internal/dri_interface.h index e4cc16b866..27cc1be7ff 100644 --- a/include/GL/internal/dri_interface.h +++ b/include/GL/internal/dri_interface.h @@ -40,8 +40,8 @@ #ifndef DRI_INTERFACE_H #define DRI_INTERFACE_H -/* Make this something other than __APPLE__ for other arcs with no drm.h */ -#ifndef __APPLE__ +/* For archs with no drm.h */ +#if !defined(__APPLE__) && !defined(__CYGWIN__) #include <drm.h> #else typedef unsigned int drm_context_t; @@ -624,6 +624,8 @@ struct __DRIswrastExtensionRec { #define __DRI_BUFFER_DEPTH 4 #define __DRI_BUFFER_STENCIL 5 #define __DRI_BUFFER_ACCUM 6 +#define __DRI_BUFFER_FAKE_FRONT_LEFT 7 +#define __DRI_BUFFER_FAKE_FRONT_RIGHT 8 struct __DRIbufferRec { unsigned int attachment; |