andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Move the XAA private indices to be static.

Browse Source 
Technically this is an ABI break, if you aren't smart enough to be using the
getter functions.  Cope.
This commit is contained in:
Adam Jackson 2007-03-28 15:17:02 -04:00
parent 8c7f56d92d
commit 82a8b99a6c
7 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/xfree86/xaa/xaaDashLine.c
View File

@ -35,7 +35,7 @@ XAAPolyLinesDashed(
#endif #endif
){ ){
XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_GC(pGC); XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_GC(pGC);
XAAGCPtr pGCPriv = (XAAGCPtr) (pGC)->devPrivates[XAAGCIndex].ptr; XAAGCPtr pGCPriv = (XAAGCPtr) (pGC)->devPrivates[XAAGetGCIndex()].ptr;
BoxPtr pboxInit = REGION_RECTS(pGC->pCompositeClip); BoxPtr pboxInit = REGION_RECTS(pGC->pCompositeClip);
int nboxInit = REGION_NUM_RECTS(pGC->pCompositeClip); int nboxInit = REGION_NUM_RECTS(pGC->pCompositeClip);
unsigned int bias = miGetZeroLineBias(pDrawable->pScreen); unsigned int bias = miGetZeroLineBias(pDrawable->pScreen);

2
hw/xfree86/xaa/xaaGC.c
View File

@ -38,7 +38,7 @@ Bool
XAACreateGC(GCPtr pGC) XAACreateGC(GCPtr pGC)
{ {
ScreenPtr pScreen = pGC->pScreen; ScreenPtr pScreen = pGC->pScreen;
XAAGCPtr pGCPriv = (XAAGCPtr)(pGC->devPrivates[XAAGCIndex].ptr); XAAGCPtr pGCPriv = (XAAGCPtr)(pGC->devPrivates[XAAGetGCIndex()].ptr);
Bool ret; Bool ret;
XAA_SCREEN_PROLOGUE(pScreen,CreateGC); XAA_SCREEN_PROLOGUE(pScreen,CreateGC);

2
hw/xfree86/xaa/xaaGCmisc.c
View File

@ -305,7 +305,7 @@ XAAValidatePolylines(
DrawablePtr pDraw ) DrawablePtr pDraw )
{ {
XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_GC(pGC); XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_GC(pGC);
XAAGCPtr pGCPriv = (XAAGCPtr) (pGC)->devPrivates[XAAGCIndex].ptr; XAAGCPtr pGCPriv = (XAAGCPtr) (pGC)->devPrivates[XAAGetGCIndex()].ptr;
if(pGC->lineStyle == LineSolid) changes &= ~GCDashList; if(pGC->lineStyle == LineSolid) changes &= ~GCDashList;
if(!changes) return; if(!changes) return;

11
hw/xfree86/xaa/xaaInit.c
View File

@ -42,14 +42,9 @@ static int XAASetDGAMode(int index, int num, DGADevicePtr devRet);
static void XAAEnableDisableFBAccess (int index, Bool enable); static void XAAEnableDisableFBAccess (int index, Bool enable);
static Bool XAAChangeWindowAttributes (WindowPtr pWin, unsigned long mask); static Bool XAAChangeWindowAttributes (WindowPtr pWin, unsigned long mask);
/* static int XAAScreenIndex = -1;
* XXX These three should be static, but that breaks ABI compat with XF4.4 static int XAAGCIndex = -1;
* and Xorg 6.7.0 modules. DO NOT use them in new code, you should never static int XAAPixmapIndex = -1;
* be setting them, and you've got Get functions below.
*/
int XAAScreenIndex = -1;
int XAAGCIndex = -1;
int XAAPixmapIndex = -1;
static unsigned long XAAGeneration = 0; static unsigned long XAAGeneration = 0;

2
hw/xfree86/xaa/xaaLineMisc.c
View File

@ -64,7 +64,7 @@ void
XAAComputeDash(GCPtr pGC) XAAComputeDash(GCPtr pGC)
{ {
XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_GC(pGC); XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_GC(pGC);
XAAGCPtr pGCPriv = (XAAGCPtr) (pGC)->devPrivates[XAAGCIndex].ptr; XAAGCPtr pGCPriv = (XAAGCPtr) (pGC)->devPrivates[XAAGetGCIndex()].ptr;
Bool EvenDash = (pGC->numInDashList & 0x01) ? FALSE : TRUE; Bool EvenDash = (pGC->numInDashList & 0x01) ? FALSE : TRUE;
int PatternLength = 0; int PatternLength = 0;
unsigned char* DashPtr = (unsigned char*)pGC->dash; unsigned char* DashPtr = (unsigned char*)pGC->dash;

2
hw/xfree86/xaa/xaaWrapper.c
View File

@ -522,7 +522,7 @@ void
XAASync(ScreenPtr pScreen) XAASync(ScreenPtr pScreen)
{ {
XAAScreenPtr pScreenPriv = XAAScreenPtr pScreenPriv =
(XAAScreenPtr) pScreen->devPrivates[XAAScreenIndex].ptr; (XAAScreenPtr) pScreen->devPrivates[XAAGetScreenIndex()].ptr;
XAAInfoRecPtr infoRec = pScreenPriv->AccelInfoRec; XAAInfoRecPtr infoRec = pScreenPriv->AccelInfoRec;
if(infoRec->NeedToSync) { if(infoRec->NeedToSync) {

3
hw/xfree86/xaa/xaalocal.h
View File

@ -1640,9 +1640,6 @@ XAAGetPixelFromRGBA (
extern GCOps XAAFallbackOps; extern GCOps XAAFallbackOps;
extern GCOps *XAAGetFallbackOps(void); extern GCOps *XAAGetFallbackOps(void);
extern GCFuncs XAAGCFuncs; extern GCFuncs XAAGCFuncs;
extern int XAAScreenIndex; /* XXX DONTUSE */
extern int XAAGCIndex; /* XXX DONTUSE */
extern int XAAPixmapIndex; /* XXX DONTUSE */
extern int XAAGetScreenIndex(void); extern int XAAGetScreenIndex(void);
extern int XAAGetGCIndex(void); extern int XAAGetGCIndex(void);
extern int XAAGetPixmapIndex(void); extern int XAAGetPixmapIndex(void);