summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2008-04-23 11:08:38 -0700
committerKeith Packard <keithp@keithp.com>2008-04-23 11:08:38 -0700
commit1d467a8038946a37844795e8860be113d43219ac (patch)
tree5b9e4a017eee4c65eb6ec5e4d8fec0c7b829b1aa
parent40e0a03af57d7b3180d7066bcb15e03dcc9ca295 (diff)
Overlay video doesn't require that the target pixmap be in video memory.
I830PutImage was checking to make sure the target pixmap resided in video memory, but this isn't necessary when using the overlay. Test
-rw-r--r--src/i830_video.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/i830_video.c b/src/i830_video.c
index 1fa9d75f..e1095781 100644
--- a/src/i830_video.c
+++ b/src/i830_video.c
@@ -2441,13 +2441,13 @@ I830PutImage(ScrnInfoPtr pScrn,
}
#ifdef I830_USE_EXA
- if (pI830->useEXA) {
+ if (pPriv->textured && pI830->useEXA) {
/* Force the pixmap into framebuffer so we can draw to it. */
exaMoveInPixmap(pPixmap);
}
#endif
- if (!pI830->useEXA &&
+ if (pPriv->textured && !pI830->useEXA &&
(((char *)pPixmap->devPrivate.ptr < (char *)pI830->FbBase) ||
((char *)pPixmap->devPrivate.ptr >= (char *)pI830->FbBase +
pI830->FbMapSize))) {