Remove the PaintWindow optimization.
This was an attempt to avoid scratch gc creation and validation for paintwin because that was expensive. This is not the case in current servers, and the danger of failure to implement it correctly (as seen in all previous implementations) is high enough to justify removing it. No performance difference detected with x11perf -create -move -resize -circulate on Xvfb. Leave the screen hooks for PaintWindow* in for now to avoid ABI change.
This commit is contained in:
@@ -504,7 +504,7 @@ bufClearImageBufferArea(pMBBuffer, x,y, w,h, generateExposures)
|
||||
|
||||
REGION_INTERSECT(pScreen, ®, ®, &pBuffer->clipList);
|
||||
if (pBuffer->backgroundState != None)
|
||||
(*pScreen->PaintWindowBackground)(pBuffer, ®, PW_BACKGROUND);
|
||||
miPaintWindow(pBuffer, ®, PW_BACKGROUND);
|
||||
if (generateExposures)
|
||||
MultibufferExpose(pMBBuffer, ®);
|
||||
#ifdef _notdef
|
||||
@@ -517,7 +517,7 @@ bufClearImageBufferArea(pMBBuffer, x,y, w,h, generateExposures)
|
||||
if (generateExposures)
|
||||
(*pScreen->WindowExposures)(pBuffer, ®, pBSReg);
|
||||
else if (pBuffer->backgroundState != None)
|
||||
(*pScreen->PaintWindowBackground)(pBuffer, ®, PW_BACKGROUND);
|
||||
miPaintWindow(pBuffer, ®, PW_BACKGROUND);
|
||||
#endif
|
||||
REGION_UNINIT(pScreen, ®);
|
||||
if (pBSReg)
|
||||
@@ -836,8 +836,7 @@ bufClipNotify(pWin, dx,dy)
|
||||
|
||||
/*
|
||||
* Updates buffer's background fields when the window's changes.
|
||||
* This is necessary because pScreen->PaintWindowBackground
|
||||
* is used to paint the buffer.
|
||||
* This is necessary because miPaintWindow is used to paint the buffer.
|
||||
*
|
||||
* XXBS - Backingstore state will have be tracked too if it is supported.
|
||||
*/
|
||||
@@ -927,7 +926,7 @@ bufWindowExposures(pWin, prgn, other_exposed)
|
||||
pBuffer = (BufferPtr) pMBBuffer->pDrawable;
|
||||
|
||||
if (i != pMBWindow->displayedMultibuffer)
|
||||
(* pScreen->PaintWindowBackground)(pBuffer,&tmp_rgn,PW_BACKGROUND);
|
||||
miPaintWindow(pBuffer, &tmp_rgn, PW_BACKGROUND);
|
||||
if ((pMBBuffer->otherEventMask | pMBBuffer->eventMask) & ExposureMask)
|
||||
MultibufferExpose(pMBBuffer, &tmp_rgn);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user