summaryrefslogtreecommitdiff
path: root/src/i810.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/i810.h')
-rw-r--r--src/i810.h19
1 files changed, 13 insertions, 6 deletions
diff --git a/src/i810.h b/src/i810.h
index d82665dc..58345abc 100644
--- a/src/i810.h
+++ b/src/i810.h
@@ -162,9 +162,13 @@ typedef struct _I810Rec {
int auxPitch;
int auxPitchBits;
+ Bool CursorIsARGB;
int CursorOffset;
unsigned long CursorPhysical;
unsigned long CursorStart;
+ int CursorARGBOffset;
+ unsigned long CursorARGBPhysical;
+ unsigned long CursorARGBStart;
unsigned long OverlayPhysical;
unsigned long OverlayStart;
int colorKey;
@@ -184,7 +188,7 @@ typedef struct _I810Rec {
pciVideoPtr PciInfo;
PCITAG PciTag;
- I810RingBuffer LpRing;
+ I810RingBuffer *LpRing;
unsigned int BR[20];
int LmFreqSel;
@@ -195,6 +199,8 @@ typedef struct _I810Rec {
unsigned long DcacheOffset;
int HwcursKey;
unsigned long HwcursOffset;
+ int ARGBHwcursKey;
+ unsigned long ARGBHwcursOffset;
int GttBound;
@@ -235,14 +241,15 @@ typedef struct _I810Rec {
unsigned long backHandle;
unsigned long zHandle;
unsigned long cursorHandle;
+ unsigned long cursorARGBHandle;
unsigned long xvmcHandle;
unsigned long sysmemHandle;
Bool agpAcquired;
- drmHandle buffer_map;
- drmHandle ring_map;
- drmHandle overlay_map;
- drmHandle mc_map;
- drmHandle xvmcContext;
+ drm_handle_t buffer_map;
+ drm_handle_t ring_map;
+ drm_handle_t overlay_map;
+ drm_handle_t mc_map;
+ drm_handle_t xvmcContext;
#endif
Bool agpAcquired2d;