summaryrefslogtreecommitdiff
path: root/src/r128_sarea.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/r128_sarea.h')
-rw-r--r--src/r128_sarea.h16
1 files changed, 5 insertions, 11 deletions
diff --git a/src/r128_sarea.h b/src/r128_sarea.h
index 2ac863f..d583091 100644
--- a/src/r128_sarea.h
+++ b/src/r128_sarea.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/r128_sarea.h,v 1.7 2002/02/16 21:26:35 herrb Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/r128_sarea.h,v 1.9 2003/10/03 20:11:11 herrb Exp $ */
/*
* Copyright 1999, 2000 ATI Technologies Inc., Markham, Ontario,
* Precision Insight, Inc., Cedar Park, Texas, and
@@ -149,12 +149,6 @@ typedef struct {
} r128_texture_regs_t;
typedef struct {
- unsigned char next, prev; /* indices to form a circular LRU */
- unsigned char in_use; /* owned by a client, or free? */
- int age; /* tracked by clients to update local LRU's */
-} r128_tex_region_t;
-
-typedef struct {
/* The channel for communication of state information to the kernel
* on firing a vertex buffer.
*/
@@ -164,12 +158,10 @@ typedef struct {
unsigned int vertsize;
unsigned int vc_format;
-#ifdef XF86DRI
/* The current cliprects, or a subset thereof.
*/
XF86DRIClipRectRec boxes[R128_NR_SAREA_CLIPRECTS];
unsigned int nbox;
-#endif
/* Counters for throttling of rendering clients.
*/
@@ -191,11 +183,13 @@ typedef struct {
* else's - simply eject them all in LRU order.
*/
/* Last elt is sentinal */
- r128_tex_region_t texList[R128_NR_TEX_HEAPS][R128_NR_TEX_REGIONS+1];
+ drmTextureRegion texList[R128_NR_TEX_HEAPS][R128_NR_TEX_REGIONS+1];
/* last time texture was uploaded */
- int texAge[R128_NR_TEX_HEAPS];
+ unsigned int texAge[R128_NR_TEX_HEAPS];
int ctxOwner; /* last context to upload state */
+ int pfAllowPageFlip; /* set by the 2d driver, read by the client */
+ int pfCurrentPage; /* set by kernel, read by others */
} R128SAREAPriv, *R128SAREAPrivPtr;
#endif