devPrivates rework: put back some changes that were mistakenly removed
during merge conflict resolution.
This commit is contained in:
parent
709c1a70c8
commit
fae39db795
|
@ -399,7 +399,10 @@ int dstx, dsty;
|
||||||
|
|
||||||
static DevPrivateKey copyPlaneScreenKey = ©PlaneScreenKey;
|
static DevPrivateKey copyPlaneScreenKey = ©PlaneScreenKey;
|
||||||
|
|
||||||
typedef RegionPtr (*CopyPlaneFuncPtr)(
|
Bool
|
||||||
|
mfbRegisterCopyPlaneProc (pScreen, proc)
|
||||||
|
ScreenPtr pScreen;
|
||||||
|
RegionPtr (*proc)(
|
||||||
DrawablePtr /* pSrcDrawable */,
|
DrawablePtr /* pSrcDrawable */,
|
||||||
DrawablePtr /* pDstDrawable */,
|
DrawablePtr /* pDstDrawable */,
|
||||||
GCPtr /* pGC */,
|
GCPtr /* pGC */,
|
||||||
|
@ -410,11 +413,6 @@ typedef RegionPtr (*CopyPlaneFuncPtr)(
|
||||||
int /* dstx */,
|
int /* dstx */,
|
||||||
int /* dsty */,
|
int /* dsty */,
|
||||||
unsigned long /* bitPlane */);
|
unsigned long /* bitPlane */);
|
||||||
|
|
||||||
Bool
|
|
||||||
mfbRegisterCopyPlaneProc (pScreen, proc)
|
|
||||||
ScreenPtr pScreen;
|
|
||||||
CopyPlaneFuncPtr proc;
|
|
||||||
{
|
{
|
||||||
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);
|
||||||
|
|
Loading…
Reference in New Issue
Block a user