diff options
| author | marha <marha@users.sourceforge.net> | 2011-01-08 19:40:59 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-01-08 19:40:59 +0000 |
| commit | 432768f75da13ee5343957df6ce5cd316a62929f (patch) | |
| tree | b02a3961540984c3d2caf783a6f0854b9b00f92a /xorg-server/miext | |
| parent | 43b6c9073b8aad1170536ae5c6a5a019617659f1 (diff) | |
| download | vcxsrv-432768f75da13ee5343957df6ce5cd316a62929f.tar.gz vcxsrv-432768f75da13ee5343957df6ce5cd316a62929f.tar.bz2 vcxsrv-432768f75da13ee5343957df6ce5cd316a62929f.zip | |
xserver mesa libX11 xkbcomp pixman git update 8/1/2011
Diffstat (limited to 'xorg-server/miext')
| -rw-r--r-- | xorg-server/miext/damage/damage.c | 20 | ||||
| -rw-r--r-- | xorg-server/miext/rootless/rootlessScreen.c | 5 |
2 files changed, 3 insertions, 22 deletions
diff --git a/xorg-server/miext/damage/damage.c b/xorg-server/miext/damage/damage.c index 263ca8afa..0d5fab5bd 100644 --- a/xorg-server/miext/damage/damage.c +++ b/xorg-server/miext/damage/damage.c @@ -891,16 +891,6 @@ damageCopyArea(DrawablePtr pSrc, RegionPtr ret;
DAMAGE_GC_OP_PROLOGUE(pGC, pDst);
- /* The driver will only call SourceValidate() when pSrc != pDst,
- * but the software sprite (misprite.c) always need to know when a
- * drawable is copied so it can remove the sprite. See #1030. */
- if ((pSrc == pDst) && pSrc->pScreen->SourceValidate &&
- pSrc->type == DRAWABLE_WINDOW &&
- ((WindowPtr)pSrc)->viewable)
- {
- (*pSrc->pScreen->SourceValidate) (pSrc, srcx, srcy, width, height);
- }
-
if (checkGCDamage (pDst, pGC))
{
BoxRec box;
@@ -937,16 +927,6 @@ damageCopyPlane(DrawablePtr pSrc, RegionPtr ret;
DAMAGE_GC_OP_PROLOGUE(pGC, pDst);
- /* The driver will only call SourceValidate() when pSrc != pDst,
- * but the software sprite (misprite.c) always need to know when a
- * drawable is copied so it can remove the sprite. See #1030. */
- if ((pSrc == pDst) && pSrc->pScreen->SourceValidate &&
- pSrc->type == DRAWABLE_WINDOW &&
- ((WindowPtr)pSrc)->viewable)
- {
- (*pSrc->pScreen->SourceValidate) (pSrc, srcx, srcy, width, height);
- }
-
if (checkGCDamage (pDst, pGC))
{
BoxRec box;
diff --git a/xorg-server/miext/rootless/rootlessScreen.c b/xorg-server/miext/rootless/rootlessScreen.c index 364a75ac8..ca4f00c3e 100644 --- a/xorg-server/miext/rootless/rootlessScreen.c +++ b/xorg-server/miext/rootless/rootlessScreen.c @@ -223,7 +223,8 @@ out: * here and leave StopDrawing for the block handler.
*/
static void
-RootlessSourceValidate(DrawablePtr pDrawable, int x, int y, int w, int h)
+RootlessSourceValidate(DrawablePtr pDrawable, int x, int y, int w, int h,
+ unsigned int subWindowMode)
{
SCREEN_UNWRAP(pDrawable->pScreen, SourceValidate);
if (pDrawable->type == DRAWABLE_WINDOW) {
@@ -231,7 +232,7 @@ RootlessSourceValidate(DrawablePtr pDrawable, int x, int y, int w, int h) RootlessStartDrawing(pWin);
}
if (pDrawable->pScreen->SourceValidate) {
- pDrawable->pScreen->SourceValidate(pDrawable, x, y, w, h);
+ pDrawable->pScreen->SourceValidate(pDrawable, x, y, w, h, subWindowMode);
}
SCREEN_WRAP(pDrawable->pScreen, SourceValidate);
}
|