frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Use the dirty flag (which should be set correctly all the time, 

particularly thanks to Prepare/FinishAccess) to avoid DFS/memcpy on
    pixmap move-out if it's unnecessary. This was disabled in KAA because
    cache misuse on ATI made me guess that this code was wrong.
- Unwrap Glyphs on closescreen.
This commit is contained in:
Eric Anholt 2005-09-28 20:01:37 +00:00
parent f53404bdbb
commit 58abce3f90
9 changed files with 144 additions and 186 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
exa/exa.c
View File

@ -130,44 +130,34 @@ exaPixmapSave (ScreenPtr pScreen, ExaOffscreenArea *area)
src = pPixmap->devPrivate.ptr; src = pPixmap->devPrivate.ptr;
dst = pExaPixmap->devPrivate.ptr; dst = pExaPixmap->devPrivate.ptr;
if (pExaScr->info->accel.DownloadFromScreen) if (pExaPixmap->dirty) {
{ if (pExaScr->info->accel.DownloadFromScreen &&
if (pExaScr->info->accel.DownloadFromScreen(pPixmap, (*pExaScr->info->accel.DownloadFromScreen) (pPixmap,
pPixmap->drawable.x, pPixmap->drawable.x,
pPixmap->drawable.y, pPixmap->drawable.y,
pPixmap->drawable.width, pPixmap->drawable.width,
pPixmap->drawable.height, pPixmap->drawable.height,
dst, dst,
dst_pitch)) { dst_pitch)) {
pPixmap->devKind = dst_pitch; } else {
pPixmap->devPrivate.ptr = dst; exaWaitSync (pPixmap->drawable.pScreen);
pPixmap->drawable.serialNumber = NEXT_SERIAL_NUMBER;
pExaPixmap->area = NULL; bytes = src_pitch < dst_pitch ? src_pitch : dst_pitch;
return;
} i = pPixmap->drawable.height;
while (i--) {
memcpy (dst, src, bytes);
dst += dst_pitch;
src += src_pitch;
}
}
} }
pPixmap->devKind = dst_pitch; pPixmap->devKind = dst_pitch;
pPixmap->devPrivate.ptr = dst; pPixmap->devPrivate.ptr = dst;
pPixmap->drawable.serialNumber = NEXT_SERIAL_NUMBER; pPixmap->drawable.serialNumber = NEXT_SERIAL_NUMBER;
pExaPixmap->area = NULL; pExaPixmap->area = NULL;
#if 0
if (!pExaPixmap->dirty)
return;
#endif
exaWaitSync (pPixmap->drawable.pScreen);
bytes = src_pitch < dst_pitch ? src_pitch : dst_pitch;
i = pPixmap->drawable.height;
while (i--) {
memcpy (dst, src, bytes);
dst += dst_pitch;
src += src_pitch;
}
} }
static int static int
@ -1360,6 +1350,7 @@ exaCloseScreen(int i, ScreenPtr pScreen)
#ifdef RENDER #ifdef RENDER
if (ps) { if (ps) {
ps->Composite = pExaScr->SavedComposite; ps->Composite = pExaScr->SavedComposite;
ps->Glyphs = pExaScr->SavedGlyphs;
} }
#endif #endif
if (pExaScr->wrappedEnableDisableFB) if (pExaScr->wrappedEnableDisableFB)

53
exa/exa_accel.c
View File

@ -130,44 +130,34 @@ exaPixmapSave (ScreenPtr pScreen, ExaOffscreenArea *area)
src = pPixmap->devPrivate.ptr; src = pPixmap->devPrivate.ptr;
dst = pExaPixmap->devPrivate.ptr; dst = pExaPixmap->devPrivate.ptr;
if (pExaScr->info->accel.DownloadFromScreen) if (pExaPixmap->dirty) {
{ if (pExaScr->info->accel.DownloadFromScreen &&
if (pExaScr->info->accel.DownloadFromScreen(pPixmap, (*pExaScr->info->accel.DownloadFromScreen) (pPixmap,
pPixmap->drawable.x, pPixmap->drawable.x,
pPixmap->drawable.y, pPixmap->drawable.y,
pPixmap->drawable.width, pPixmap->drawable.width,
pPixmap->drawable.height, pPixmap->drawable.height,
dst, dst,
dst_pitch)) { dst_pitch)) {
pPixmap->devKind = dst_pitch; } else {
pPixmap->devPrivate.ptr = dst; exaWaitSync (pPixmap->drawable.pScreen);
pPixmap->drawable.serialNumber = NEXT_SERIAL_NUMBER;
pExaPixmap->area = NULL; bytes = src_pitch < dst_pitch ? src_pitch : dst_pitch;
return;
} i = pPixmap->drawable.height;
while (i--) {
memcpy (dst, src, bytes);
dst += dst_pitch;
src += src_pitch;
}
}
} }
pPixmap->devKind = dst_pitch; pPixmap->devKind = dst_pitch;
pPixmap->devPrivate.ptr = dst; pPixmap->devPrivate.ptr = dst;
pPixmap->drawable.serialNumber = NEXT_SERIAL_NUMBER; pPixmap->drawable.serialNumber = NEXT_SERIAL_NUMBER;
pExaPixmap->area = NULL; pExaPixmap->area = NULL;
#if 0
if (!pExaPixmap->dirty)
return;
#endif
exaWaitSync (pPixmap->drawable.pScreen);
bytes = src_pitch < dst_pitch ? src_pitch : dst_pitch;
i = pPixmap->drawable.height;
while (i--) {
memcpy (dst, src, bytes);
dst += dst_pitch;
src += src_pitch;
}
} }
static int static int
@ -1360,6 +1350,7 @@ exaCloseScreen(int i, ScreenPtr pScreen)
#ifdef RENDER #ifdef RENDER
if (ps) { if (ps) {
ps->Composite = pExaScr->SavedComposite; ps->Composite = pExaScr->SavedComposite;
ps->Glyphs = pExaScr->SavedGlyphs;
} }
#endif #endif
if (pExaScr->wrappedEnableDisableFB) if (pExaScr->wrappedEnableDisableFB)

53
exa/exa_migration.c
View File

@ -130,44 +130,34 @@ exaPixmapSave (ScreenPtr pScreen, ExaOffscreenArea *area)
src = pPixmap->devPrivate.ptr; src = pPixmap->devPrivate.ptr;
dst = pExaPixmap->devPrivate.ptr; dst = pExaPixmap->devPrivate.ptr;
if (pExaScr->info->accel.DownloadFromScreen) if (pExaPixmap->dirty) {
{ if (pExaScr->info->accel.DownloadFromScreen &&
if (pExaScr->info->accel.DownloadFromScreen(pPixmap, (*pExaScr->info->accel.DownloadFromScreen) (pPixmap,
pPixmap->drawable.x, pPixmap->drawable.x,
pPixmap->drawable.y, pPixmap->drawable.y,
pPixmap->drawable.width, pPixmap->drawable.width,
pPixmap->drawable.height, pPixmap->drawable.height,
dst, dst,
dst_pitch)) { dst_pitch)) {
pPixmap->devKind = dst_pitch; } else {
pPixmap->devPrivate.ptr = dst; exaWaitSync (pPixmap->drawable.pScreen);
pPixmap->drawable.serialNumber = NEXT_SERIAL_NUMBER;
pExaPixmap->area = NULL; bytes = src_pitch < dst_pitch ? src_pitch : dst_pitch;
return;
} i = pPixmap->drawable.height;
while (i--) {
memcpy (dst, src, bytes);
dst += dst_pitch;
src += src_pitch;
}
}
} }
pPixmap->devKind = dst_pitch; pPixmap->devKind = dst_pitch;
pPixmap->devPrivate.ptr = dst; pPixmap->devPrivate.ptr = dst;
pPixmap->drawable.serialNumber = NEXT_SERIAL_NUMBER; pPixmap->drawable.serialNumber = NEXT_SERIAL_NUMBER;
pExaPixmap->area = NULL; pExaPixmap->area = NULL;
#if 0
if (!pExaPixmap->dirty)
return;
#endif
exaWaitSync (pPixmap->drawable.pScreen);
bytes = src_pitch < dst_pitch ? src_pitch : dst_pitch;
i = pPixmap->drawable.height;
while (i--) {
memcpy (dst, src, bytes);
dst += dst_pitch;
src += src_pitch;
}
} }
static int static int
@ -1360,6 +1350,7 @@ exaCloseScreen(int i, ScreenPtr pScreen)
#ifdef RENDER #ifdef RENDER
if (ps) { if (ps) {
ps->Composite = pExaScr->SavedComposite; ps->Composite = pExaScr->SavedComposite;
ps->Glyphs = pExaScr->SavedGlyphs;
} }
#endif #endif
if (pExaScr->wrappedEnableDisableFB) if (pExaScr->wrappedEnableDisableFB)

4
exa/exa_priv.h
View File

@ -118,6 +118,10 @@ typedef struct {
int score; int score;
int devKind; int devKind;
DevUnion devPrivate; DevUnion devPrivate;
/* True if the in-screen copy has been modified compared to the
* system-memory copy.
*/
Bool dirty; Bool dirty;
unsigned int size; unsigned int size;
} ExaPixmapPrivRec, *ExaPixmapPrivPtr; } ExaPixmapPrivRec, *ExaPixmapPrivPtr;

53
hw/xfree86/exa/exa.c
View File

@ -130,44 +130,34 @@ exaPixmapSave (ScreenPtr pScreen, ExaOffscreenArea *area)
src = pPixmap->devPrivate.ptr; src = pPixmap->devPrivate.ptr;
dst = pExaPixmap->devPrivate.ptr; dst = pExaPixmap->devPrivate.ptr;
if (pExaScr->info->accel.DownloadFromScreen) if (pExaPixmap->dirty) {
{ if (pExaScr->info->accel.DownloadFromScreen &&
if (pExaScr->info->accel.DownloadFromScreen(pPixmap, (*pExaScr->info->accel.DownloadFromScreen) (pPixmap,
pPixmap->drawable.x, pPixmap->drawable.x,
pPixmap->drawable.y, pPixmap->drawable.y,
pPixmap->drawable.width, pPixmap->drawable.width,
pPixmap->drawable.height, pPixmap->drawable.height,
dst, dst,
dst_pitch)) { dst_pitch)) {
pPixmap->devKind = dst_pitch; } else {
pPixmap->devPrivate.ptr = dst; exaWaitSync (pPixmap->drawable.pScreen);
pPixmap->drawable.serialNumber = NEXT_SERIAL_NUMBER;
pExaPixmap->area = NULL; bytes = src_pitch < dst_pitch ? src_pitch : dst_pitch;
return;
} i = pPixmap->drawable.height;
while (i--) {
memcpy (dst, src, bytes);
dst += dst_pitch;
src += src_pitch;
}
}
} }
pPixmap->devKind = dst_pitch; pPixmap->devKind = dst_pitch;
pPixmap->devPrivate.ptr = dst; pPixmap->devPrivate.ptr = dst;
pPixmap->drawable.serialNumber = NEXT_SERIAL_NUMBER; pPixmap->drawable.serialNumber = NEXT_SERIAL_NUMBER;
pExaPixmap->area = NULL; pExaPixmap->area = NULL;
#if 0
if (!pExaPixmap->dirty)
return;
#endif
exaWaitSync (pPixmap->drawable.pScreen);
bytes = src_pitch < dst_pitch ? src_pitch : dst_pitch;
i = pPixmap->drawable.height;
while (i--) {
memcpy (dst, src, bytes);
dst += dst_pitch;
src += src_pitch;
}
} }
static int static int
@ -1360,6 +1350,7 @@ exaCloseScreen(int i, ScreenPtr pScreen)
#ifdef RENDER #ifdef RENDER
if (ps) { if (ps) {
ps->Composite = pExaScr->SavedComposite; ps->Composite = pExaScr->SavedComposite;
ps->Glyphs = pExaScr->SavedGlyphs;
} }
#endif #endif
if (pExaScr->wrappedEnableDisableFB) if (pExaScr->wrappedEnableDisableFB)

4
hw/xfree86/exa/exaPriv.h
View File

@ -118,6 +118,10 @@ typedef struct {
int score; int score;
int devKind; int devKind;
DevUnion devPrivate; DevUnion devPrivate;
/* True if the in-screen copy has been modified compared to the
* system-memory copy.
*/
Bool dirty; Bool dirty;
unsigned int size; unsigned int size;
} ExaPixmapPrivRec, *ExaPixmapPrivPtr; } ExaPixmapPrivRec, *ExaPixmapPrivPtr;

53
hw/xfree86/exa/exa_accel.c
View File

@ -130,44 +130,34 @@ exaPixmapSave (ScreenPtr pScreen, ExaOffscreenArea *area)
src = pPixmap->devPrivate.ptr; src = pPixmap->devPrivate.ptr;
dst = pExaPixmap->devPrivate.ptr; dst = pExaPixmap->devPrivate.ptr;
if (pExaScr->info->accel.DownloadFromScreen) if (pExaPixmap->dirty) {
{ if (pExaScr->info->accel.DownloadFromScreen &&
if (pExaScr->info->accel.DownloadFromScreen(pPixmap, (*pExaScr->info->accel.DownloadFromScreen) (pPixmap,
pPixmap->drawable.x, pPixmap->drawable.x,
pPixmap->drawable.y, pPixmap->drawable.y,
pPixmap->drawable.width, pPixmap->drawable.width,
pPixmap->drawable.height, pPixmap->drawable.height,
dst, dst,
dst_pitch)) { dst_pitch)) {
pPixmap->devKind = dst_pitch; } else {
pPixmap->devPrivate.ptr = dst; exaWaitSync (pPixmap->drawable.pScreen);
pPixmap->drawable.serialNumber = NEXT_SERIAL_NUMBER;
pExaPixmap->area = NULL; bytes = src_pitch < dst_pitch ? src_pitch : dst_pitch;
return;
} i = pPixmap->drawable.height;
while (i--) {
memcpy (dst, src, bytes);
dst += dst_pitch;
src += src_pitch;
}
}
} }
pPixmap->devKind = dst_pitch; pPixmap->devKind = dst_pitch;
pPixmap->devPrivate.ptr = dst; pPixmap->devPrivate.ptr = dst;
pPixmap->drawable.serialNumber = NEXT_SERIAL_NUMBER; pPixmap->drawable.serialNumber = NEXT_SERIAL_NUMBER;
pExaPixmap->area = NULL; pExaPixmap->area = NULL;
#if 0
if (!pExaPixmap->dirty)
return;
#endif
exaWaitSync (pPixmap->drawable.pScreen);
bytes = src_pitch < dst_pitch ? src_pitch : dst_pitch;
i = pPixmap->drawable.height;
while (i--) {
memcpy (dst, src, bytes);
dst += dst_pitch;
src += src_pitch;
}
} }
static int static int
@ -1360,6 +1350,7 @@ exaCloseScreen(int i, ScreenPtr pScreen)
#ifdef RENDER #ifdef RENDER
if (ps) { if (ps) {
ps->Composite = pExaScr->SavedComposite; ps->Composite = pExaScr->SavedComposite;
ps->Glyphs = pExaScr->SavedGlyphs;
} }
#endif #endif
if (pExaScr->wrappedEnableDisableFB) if (pExaScr->wrappedEnableDisableFB)

53
hw/xfree86/exa/exa_migration.c
View File

@ -130,44 +130,34 @@ exaPixmapSave (ScreenPtr pScreen, ExaOffscreenArea *area)
src = pPixmap->devPrivate.ptr; src = pPixmap->devPrivate.ptr;
dst = pExaPixmap->devPrivate.ptr; dst = pExaPixmap->devPrivate.ptr;
if (pExaScr->info->accel.DownloadFromScreen) if (pExaPixmap->dirty) {
{ if (pExaScr->info->accel.DownloadFromScreen &&
if (pExaScr->info->accel.DownloadFromScreen(pPixmap, (*pExaScr->info->accel.DownloadFromScreen) (pPixmap,
pPixmap->drawable.x, pPixmap->drawable.x,
pPixmap->drawable.y, pPixmap->drawable.y,
pPixmap->drawable.width, pPixmap->drawable.width,
pPixmap->drawable.height, pPixmap->drawable.height,
dst, dst,
dst_pitch)) { dst_pitch)) {
pPixmap->devKind = dst_pitch; } else {
pPixmap->devPrivate.ptr = dst; exaWaitSync (pPixmap->drawable.pScreen);
pPixmap->drawable.serialNumber = NEXT_SERIAL_NUMBER;
pExaPixmap->area = NULL; bytes = src_pitch < dst_pitch ? src_pitch : dst_pitch;
return;
} i = pPixmap->drawable.height;
while (i--) {
memcpy (dst, src, bytes);
dst += dst_pitch;
src += src_pitch;
}
}
} }
pPixmap->devKind = dst_pitch; pPixmap->devKind = dst_pitch;
pPixmap->devPrivate.ptr = dst; pPixmap->devPrivate.ptr = dst;
pPixmap->drawable.serialNumber = NEXT_SERIAL_NUMBER; pPixmap->drawable.serialNumber = NEXT_SERIAL_NUMBER;
pExaPixmap->area = NULL; pExaPixmap->area = NULL;
#if 0
if (!pExaPixmap->dirty)
return;
#endif
exaWaitSync (pPixmap->drawable.pScreen);
bytes = src_pitch < dst_pitch ? src_pitch : dst_pitch;
i = pPixmap->drawable.height;
while (i--) {
memcpy (dst, src, bytes);
dst += dst_pitch;
src += src_pitch;
}
} }
static int static int
@ -1360,6 +1350,7 @@ exaCloseScreen(int i, ScreenPtr pScreen)
#ifdef RENDER #ifdef RENDER
if (ps) { if (ps) {
ps->Composite = pExaScr->SavedComposite; ps->Composite = pExaScr->SavedComposite;
ps->Glyphs = pExaScr->SavedGlyphs;
} }
#endif #endif
if (pExaScr->wrappedEnableDisableFB) if (pExaScr->wrappedEnableDisableFB)

4
hw/xfree86/exa/exa_priv.h
View File

@ -118,6 +118,10 @@ typedef struct {
int score; int score;
int devKind; int devKind;
DevUnion devPrivate; DevUnion devPrivate;
/* True if the in-screen copy has been modified compared to the
* system-memory copy.
*/
Bool dirty; Bool dirty;
unsigned int size; unsigned int size;
} ExaPixmapPrivRec, *ExaPixmapPrivPtr; } ExaPixmapPrivRec, *ExaPixmapPrivPtr;