diff options
Diffstat (limited to 'xc/programs/Xserver/hw/xfree86/drivers/i810/i810_dri.h')
| -rw-r--r-- | xc/programs/Xserver/hw/xfree86/drivers/i810/i810_dri.h | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/xc/programs/Xserver/hw/xfree86/drivers/i810/i810_dri.h b/xc/programs/Xserver/hw/xfree86/drivers/i810/i810_dri.h index 96a680b85..f52f91562 100644 --- a/xc/programs/Xserver/hw/xfree86/drivers/i810/i810_dri.h +++ b/xc/programs/Xserver/hw/xfree86/drivers/i810/i810_dri.h @@ -3,8 +3,8 @@ #ifndef _I810_DRI_ #define _I810_DRI_ -#include <xf86drm.h> -#include <xf86drmI810.h> +#include "xf86drm.h" +#include "i810_common.h" #define I810_MAX_DRAWABLES 256 @@ -57,6 +57,14 @@ typedef struct { /* WARNING: Do not change the SAREA structure without changing the kernel * as well */ +#define I810_UPLOAD_TEX0IMAGE 0x1 /* handled clientside */ +#define I810_UPLOAD_TEX1IMAGE 0x2 /* handled clientside */ +#define I810_UPLOAD_CTX 0x4 +#define I810_UPLOAD_BUFFERS 0x8 +#define I810_UPLOAD_TEX0 0x10 +#define I810_UPLOAD_TEX1 0x20 +#define I810_UPLOAD_CLIPRECTS 0x40 + typedef struct { unsigned char next, prev; /* indices to form a circular LRU */ unsigned char in_use; /* owned by a client, or free? */ @@ -64,6 +72,11 @@ typedef struct { } I810TexRegionRec, *I810TexRegionPtr; typedef struct { + unsigned int ContextState[I810_CTX_SETUP_SIZE]; + unsigned int BufferState[I810_DEST_SETUP_SIZE]; + unsigned int TexState[2][I810_TEX_SETUP_SIZE]; + unsigned int dirty; + unsigned int nbox; XF86DRIClipRectRec boxes[I810_NR_SAREA_CLIPRECTS]; @@ -91,6 +104,9 @@ typedef struct { int last_quiescent; /* */ int ctxOwner; /* last context to upload state */ + + int vertex_prim; + } I810SAREARec, *I810SAREAPtr; typedef struct { |