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

devPrivates rework: put back some changes that were mistakenly removed

Browse Source 
during merge conflict resolution.
This commit is contained in:
Eamon Walsh 2007-11-20 15:21:31 -05:00 committed by Eamon Walsh
parent 709c1a70c8
commit fae39db795
1 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
mfb/mfbbitblt.c
View File

@ -399,22 +399,20 @@ int dstx, dsty;
static DevPrivateKey copyPlaneScreenKey = &copyPlaneScreenKey; static DevPrivateKey copyPlaneScreenKey = &copyPlaneScreenKey;
typedef RegionPtr (*CopyPlaneFuncPtr)(
DrawablePtr /* pSrcDrawable */,
DrawablePtr /* pDstDrawable */,
GCPtr /* pGC */,
int /* srcx */,
int /* srcy */,
int /* width */,
int /* height */,
int /* dstx */,
int /* dsty */,
unsigned long /* bitPlane */);
Bool Bool
mfbRegisterCopyPlaneProc (pScreen, proc) mfbRegisterCopyPlaneProc (pScreen, proc)
ScreenPtr pScreen; ScreenPtr pScreen;
CopyPlaneFuncPtr proc; RegionPtr (*proc)(
DrawablePtr /* pSrcDrawable */,
DrawablePtr /* pDstDrawable */,
GCPtr /* pGC */,
int /* srcx */,
int /* srcy */,
int /* width */,
int /* height */,
int /* dstx */,
int /* dsty */,
unsigned long /* bitPlane */);
{ {
dixSetPrivate(&pScreen->devPrivates, copyPlaneScreenKey, proc); dixSetPrivate(&pScreen->devPrivates, copyPlaneScreenKey, proc);
return TRUE; return TRUE;
@ -461,10 +459,8 @@ unsigned long plane;
if (pSrcDrawable->depth != 1) if (pSrcDrawable->depth != 1)
{ {
if ((copyPlane = (CopyPlaneFuncPtr) if ((copyPlane = dixLookupPrivate(&pSrcDrawable->pScreen->devPrivates,
dixLookupPrivate(&pSrcDrawable->pScreen->devPrivates, copyPlaneScreenKey)))
copyPlaneScreenKey))
)
{ {
return (*copyPlane) (pSrcDrawable, pDstDrawable, return (*copyPlane) (pSrcDrawable, pDstDrawable,
pGC, srcx, srcy, width, height, dstx, dsty, plane); pGC, srcx, srcy, width, height, dstx, dsty, plane);