diff options
Diffstat (limited to 'xc/programs/Xserver/hw/xfree86/drivers/ati/radeon.h')
| -rw-r--r-- | xc/programs/Xserver/hw/xfree86/drivers/ati/radeon.h | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/xc/programs/Xserver/hw/xfree86/drivers/ati/radeon.h b/xc/programs/Xserver/hw/xfree86/drivers/ati/radeon.h index a527234d7..c1b50ace9 100644 --- a/xc/programs/Xserver/hw/xfree86/drivers/ati/radeon.h +++ b/xc/programs/Xserver/hw/xfree86/drivers/ati/radeon.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/radeon.h,v 1.13 2001/01/21 21:19:19 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/radeon.h,v 1.16 2001/03/25 05:32:09 tsi Exp $ */ /* * Copyright 2000 ATI Technologies Inc., Markham, Ontario, and * VA Linux Systems Inc., Fremont, California. @@ -58,6 +58,11 @@ #include "GL/glxint.h" #endif + /* Render support */ +#ifdef RENDER +#include "picturestr.h" +#endif + #define RADEON_DEBUG 0 /* Turn off debugging output */ #define RADEON_TIMEOUT 2000000 /* Fall out of wait loops after this count */ #define RADEON_MMIOSIZE 0x80000 @@ -358,6 +363,10 @@ typedef struct { CARD32 re_width_height; CARD32 aux_sc_cntl; + +#ifdef PER_CONTEXT_SAREA + int perctx_sarea_size; +#endif #endif XF86VideoAdaptorPtr adaptor; @@ -474,7 +483,7 @@ do { \ (n) * (int)sizeof(CARD32) > RING_THRESHOLD ) { \ RADEONCPFlushIndirect( pScrn ); \ } \ - __head = (CARD32 *)((char *)info->indirectBuffer->address + \ + __head = (pointer)((char *)info->indirectBuffer->address + \ info->indirectBuffer->used); \ __count = 0; \ } while (0) |