From 9db2013e9c8f55245ed6d33a2dcf34c7f5be0574 Mon Sep 17 00:00:00 2001
From: Eric Anholt <anholt@freebsd.org>
Date: Sun, 18 Sep 2005 02:32:23 +0000
Subject: [PATCH] Break EXA ABI while we still can. Add coordinates to the
 UploadToScreen     hook so we can upload a subset of a pixmap, and convert
 the current     drivers to respect that. Use this support to directly
 UploadToScreen in     exaGlyphs, providing a 47.4% +/-2.4% decrease in wall
 time for ls -lR     programs/Xserver in an antialiased gnome-terminal on an
 M6 (n=3, caches     hot). I would have bumped major version, only I can't
 tell what the     EXA_VERSION_* is supposed to be doing as opposed to the
 module version.

---
 src/sis300_accel.c |  4 ++--
 src/sis310_accel.c | 19 +++++++++++++------
 src/sis_accel.c    |  4 ++--
 3 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/src/sis300_accel.c b/src/sis300_accel.c
index 7024b6d..aad62ee 100644
--- a/src/sis300_accel.c
+++ b/src/sis300_accel.c
@@ -1,5 +1,5 @@
 /* $XFree86$ */
-/* $XdotOrg$ */
+/* $XdotOrg: xc/programs/Xserver/hw/xfree86/drivers/sis/sis300_accel.c,v 1.19 2005/08/24 23:15:23 twini Exp $ */
 /*
  * 2D Acceleration for SiS 530, 620, 300, 540, 630, 730.
  *
@@ -61,7 +61,7 @@
 
 #ifdef SIS_USE_EXA
 extern void SiSScratchSave(ScreenPtr pScreen, ExaOffscreenArea *area);
-extern Bool SiSUploadToScreen(PixmapPtr pDst, char *src, int src_pitch);
+extern Bool SiSUploadToScreen(PixmapPtr pDst, int x, int y, int w, int h, char *src, int src_pitch);
 extern Bool SiSUploadToScratch(PixmapPtr pSrc, PixmapPtr pDst);
 extern Bool SiSDownloadFromScreen(PixmapPtr pSrc, int x, int y, int w, int h,
 				char *dst, int dst_pitch);
diff --git a/src/sis310_accel.c b/src/sis310_accel.c
index 5cdc0b5..aff4c0f 100644
--- a/src/sis310_accel.c
+++ b/src/sis310_accel.c
@@ -1,5 +1,5 @@
 /* $XFree86$ */
-/* $XdotOrg$ */
+/* $XdotOrg: xc/programs/Xserver/hw/xfree86/drivers/sis/sis310_accel.c,v 1.27 2005/08/24 23:15:23 twini Exp $ */
 /*
  * 2D Acceleration for SiS 315, 330 and 340 series
  *
@@ -131,7 +131,7 @@ static CARD32 SiSDstTextureFormats32[3] = { PICT_x8r8g8b8, PICT_a8r8g8b8, 0 };
 
 #ifdef SIS_USE_EXA		/* EXA */
 void SiSScratchSave(ScreenPtr pScreen, ExaOffscreenArea *area);
-Bool SiSUploadToScreen(PixmapPtr pDst, char *src, int src_pitch);
+Bool SiSUploadToScreen(PixmapPtr pDst, int x, int y, int w, int h, char *src, int src_pitch);
 Bool SiSUploadToScratch(PixmapPtr pSrc, PixmapPtr pDst);
 Bool SiSDownloadFromScreen(PixmapPtr pSrc, int x, int y, int w, int h, char *dst, int dst_pitch);
 #endif /* EXA */
@@ -1872,19 +1872,22 @@ SiSDoneComposite(PixmapPtr pDst)
 #endif
 
 Bool
-SiSUploadToScreen(PixmapPtr pDst, char *src, int src_pitch)
+SiSUploadToScreen(PixmapPtr pDst, int x, int y, int w, int h, char *src, int src_pitch)
 {
 	ScrnInfoPtr pScrn = xf86Screens[pDst->drawable.pScreen->myNum];
 	SISPtr pSiS = SISPTR(pScrn);
 	unsigned char *dst = pDst->devPrivate.ptr;
 	int dst_pitch = exaGetPixmapPitch(pDst);
-	int size = src_pitch < dst_pitch ? src_pitch : dst_pitch;
-	int h = pDst->drawable.height;
 
 	(pSiS->SyncAccel)(pScrn);
 
+	if (pDst->drawable.bitsPerPixel < 8)
+	    return FALSE;
+
+	dst += (x * pDst->drawable.bitsPerPixel / 8) + (y * src_pitch);
 	while(h--) {
-	   SiSMemCopyToVideoRam(pSiS, dst, (unsigned char *)src, size);
+	   SiSMemCopyToVideoRam(pSiS, dst, (unsigned char *)src,
+				(w * pDst->drawable.bitsPerPixel / 8));
 	   src += src_pitch;
 	   dst += dst_pitch;
 	}
@@ -1958,6 +1961,10 @@ SiSDownloadFromScreen(PixmapPtr pSrc, int x, int y, int w, int h, char *dst, int
 
 	(pSiS->SyncAccel)(pScrn);
 
+	if (pSrc->drawable.bitsPerPixel < 8)
+	    return FALSE;
+
+	src += (x * pSrc->drawable.bitsPerPixel / 8) + (y * src_pitch);
 	while(h--) {
 	   SiSMemCopyFromVideoRam(pSiS, (unsigned char *)dst, src, size);
 	   src += src_pitch;
diff --git a/src/sis_accel.c b/src/sis_accel.c
index d256b70..700fc4c 100644
--- a/src/sis_accel.c
+++ b/src/sis_accel.c
@@ -1,5 +1,5 @@
 /* $XFree86$ */
-/* $XdotOrg$ */
+/* $XdotOrg: xc/programs/Xserver/hw/xfree86/drivers/sis/sis_accel.c,v 1.19 2005/08/24 23:15:23 twini Exp $ */
 /*
  * 2D acceleration for SiS5597/5598 and 6326
  *
@@ -55,7 +55,7 @@
 
 #ifdef SIS_USE_EXA
 extern void SiSScratchSave(ScreenPtr pScreen, ExaOffscreenArea *area);
-extern Bool SiSUploadToScreen(PixmapPtr pDst, char *src, int src_pitch);
+extern Bool SiSUploadToScreen(PixmapPtr pDst, int x, int y, int w, int h, char *src, int src_pitch);
 extern Bool SiSUploadToScratch(PixmapPtr pSrc, PixmapPtr pDst);
 extern Bool SiSDownloadFromScreen(PixmapPtr pSrc, int x, int y, int w, int h, char *dst, int dst_pitch);
 #endif /* EXA */