summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichel Dänzer <daenzer@vmware.com>2009-12-10 00:04:53 +0100
committerKeith Packard <keithp@keithp.com>2009-12-10 09:11:14 -0800
commitdf2635d4644d1fa2772ff58d8d34cdf788ece412 (patch)
tree9ceae6344403cb91b817aa45a7a3f616488d42a5
parent955b9f23a34cc79a5cd9676b45b3df4ffcc7302b (diff)
EXA/mixed: Don't consider devKind for detecting dimension change.
Fixes http://bugs.freedesktop.org/show_bug.cgi?id=25536 . There should be no reason for the pitch to actually change when none of the other dimensions do, and this could lead to incorrectly freeing the system memory copy when allocating a GPU copy, resulting in loss of valid pixmap contents. Signed-off-by: Michel Dänzer <daenzer@vmware.com> Acked-by: Maarten Maathuis <madman2003@gmail.com> Signed-off-by: Keith Packard <keithp@keithp.com>
-rw-r--r--exa/exa_mixed.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/exa/exa_mixed.c b/exa/exa_mixed.c
index 0fb644b9c..155ed47c5 100644
--- a/exa/exa_mixed.c
+++ b/exa/exa_mixed.c
@@ -155,7 +155,6 @@ exaModifyPixmapHeader_mixed(PixmapPtr pPixmap, int width, int height, int depth,
if (width != pPixmap->drawable.width ||
height != pPixmap->drawable.height ||
- devKind != pPixmap->devKind ||
depth != pPixmap->drawable.depth ||
bitsPerPixel != pPixmap->drawable.bitsPerPixel) {
if (pExaPixmap->driverPriv) {