Aurelien
/
xf86-video-intel
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dri+shadow: Only tweak the acceleration of CopyRegion if using shadow. 

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
This commit is contained in:
Chris Wilson 2010-10-06 12:36:30 +01:00
parent f286891d14
commit 1444ea3570
1 changed files with 23 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/intel_dri.c
View File

@ -409,7 +409,6 @@ I830DRI2CopyRegion(DrawablePtr drawable, RegionPtr pRegion,
DrawablePtr dst = (dstPrivate->attachment == DRI2BufferFrontLeft)
? drawable : &dstPrivate->pixmap->drawable;
RegionPtr pCopyClip;
struct intel_pixmap *src_pixmap, *dst_pixmap;
GCPtr gc;
gc = GetScratchGC(dst->depth, screen);
@ -507,23 +506,32 @@ I830DRI2CopyRegion(DrawablePtr drawable, RegionPtr pRegion,
* again. */
/* Re-enable 2D acceleration... */
src_pixmap = intel_get_pixmap_private(get_drawable_pixmap(src));
src_pixmap->offscreen = 1;
src_pixmap->busy = 1;
if (intel->use_shadow) {
struct intel_pixmap *src_pixmap, *dst_pixmap;
dst_pixmap = intel_get_pixmap_private(get_drawable_pixmap(dst));
dst_pixmap->offscreen = 1;
dst_pixmap->busy = 1;
src_pixmap = intel_get_pixmap_private(get_drawable_pixmap(src));
src_pixmap->offscreen = 1;
src_pixmap->busy = 1;
gc->ops->CopyArea(src, dst, gc,
0, 0,
drawable->width, drawable->height,
0, 0);
dst_pixmap = intel_get_pixmap_private(get_drawable_pixmap(dst));
dst_pixmap->offscreen = 1;
dst_pixmap->busy = 1;
gc->ops->CopyArea(src, dst, gc,
0, 0,
drawable->width, drawable->height,
0, 0);
/* and restore 2D/3D coherency */
src_pixmap->offscreen = 0;
dst_pixmap->offscreen = 0;
} else {
gc->ops->CopyArea(src, dst, gc,
0, 0,
drawable->width, drawable->height,
0, 0);
}
FreeScratchGC(gc);
/* and restore 2D/3D coherency */
src_pixmap->offscreen = 0;
dst_pixmap->offscreen = 0;
}
#if DRI2INFOREC_VERSION >= 4