diff options
Diffstat (limited to 'xc/lib/GL/mesa/src/drv/i810/i810context.h')
| -rw-r--r-- | xc/lib/GL/mesa/src/drv/i810/i810context.h | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/xc/lib/GL/mesa/src/drv/i810/i810context.h b/xc/lib/GL/mesa/src/drv/i810/i810context.h index 0a40c374f..347a4ef20 100644 --- a/xc/lib/GL/mesa/src/drv/i810/i810context.h +++ b/xc/lib/GL/mesa/src/drv/i810/i810context.h @@ -30,10 +30,7 @@ typedef struct i810_context_t i810Context; typedef struct i810_context_t *i810ContextPtr; typedef struct i810_texture_object_t *i810TextureObjectPtr; -#include <X11/Xlibint.h> - #include "mtypes.h" -#include "drm.h" #include "mm.h" #include "i810screen.h" @@ -134,7 +131,7 @@ struct i810_context_t { GLuint BufferSetup[I810_DEST_SETUP_SIZE]; int vertex_size; int vertex_stride_shift; - GLint lastStamp; + unsigned int lastStamp; GLboolean stipple_in_hw; GLenum TexEnvImageFmt[2]; @@ -170,18 +167,17 @@ struct i810_context_t { int dirtyAge; GLboolean scissor; - drm_clip_rect_t draw_rect; - drm_clip_rect_t scissor_rect; + XF86DRIClipRectRec draw_rect; + XF86DRIClipRectRec scissor_rect; drmContext hHWContext; drmLock *driHwLock; int driFd; - Display *display; __DRIdrawablePrivate *driDrawable; __DRIscreenPrivate *driScreen; i810ScreenPrivate *i810Screen; - drm_i810_sarea_t *sarea; + I810SAREAPtr sarea; }; |