summaryrefslogtreecommitdiff
path: root/render
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2004-08-15 03:34:18 +0000
committerKeith Packard <keithp@keithp.com>2004-08-15 03:34:18 +0000
commit1e728c3e88f6a74b93dc11827c9fcfe7b39ca5a5 (patch)
tree3a63ec7b7c0493ac63cd2b3cd4f13d3071f9f304 /render
parent943308517905d16bda1bb27cd745bd291a84dbf6 (diff)
Copy bits from parent window when allocating pixmaps so that Background ==
None works. Copy filter to backing picture during validation. Mark picture serialNumber when setting Filter or Transform so Validate occurs. Initialize xf86Screens[i]->pScreen to NULL so that RADEON driver doesn't crash during server reset using old pScreen.
Diffstat (limited to 'render')
-rw-r--r--render/filter.c1
-rw-r--r--render/picture.c3
2 files changed, 4 insertions, 0 deletions
diff --git a/render/filter.c b/render/filter.c
index 16d01e45d..cb9297e9c 100644
--- a/render/filter.c
+++ b/render/filter.c
@@ -272,5 +272,6 @@ SetPictureFilter (PicturePtr pPicture, char *name, int len, xFixed *params, int
for (i = 0; i < nparams; i++)
pPicture->filter_params[i] = params[i];
pPicture->filter = pFilter->id;
+ pPicture->serialNumber |= GC_CHANGE_SERIAL_BIT;
return Success;
}
diff --git a/render/picture.c b/render/picture.c
index e6c1a89a4..b0c44e694 100644
--- a/render/picture.c
+++ b/render/picture.c
@@ -1177,6 +1177,8 @@ SetPictureTransform (PicturePtr pPicture,
pPicture->transform = 0;
}
}
+ pPicture->serialNumber |= GC_CHANGE_SERIAL_BIT;
+
return Success;
}
@@ -1188,6 +1190,7 @@ CopyPicture (PicturePtr pSrc,
PictureScreenPtr ps = GetPictureScreen(pSrc->pDrawable->pScreen);
Mask origMask = mask;
+ pDst->serialNumber |= GC_CHANGE_SERIAL_BIT;
pDst->stateChanges |= mask;
while (mask) {