xf86-video-intel: Branch 'exa' - 5 commits - src/i830_exa.c src/i830_xaa.c
Eric Anholt
anholt at kemper.freedesktop.org
Fri Sep 8 21:09:02 EEST 2006
src/i830_exa.c | 66 ---------------------------------------------------------
src/i830_xaa.c | 27 +++++++++++------------
2 files changed, 13 insertions(+), 80 deletions(-)
New commits:
diff-tree 2b7602847aa7ae9b4e88fbea070710695d2cb8a4 (from parents)
Merge: e4cdc42a98dd1be74e5c2bf5d9566f7449523b14 b45f4b54b189a496255ddae12af38fc4c4408a51
Author: Eric Anholt <eric at anholt.net>
Date: Fri Sep 8 11:02:41 2006 -0700
Merge branch 'exa-origin' into exa
Conflicts:
src/i915_exa_render.c
diff-tree e4cdc42a98dd1be74e5c2bf5d9566f7449523b14 (from 099be52a3bb52516fb5e8d56c154a4d6b6707e09)
Author: Eric Anholt <eric at anholt.net>
Date: Thu Sep 7 10:32:02 2006 -0700
Remove another debug printf.
diff --git a/src/i830_exa.c b/src/i830_exa.c
index 1074649..230c8a7 100644
--- a/src/i830_exa.c
+++ b/src/i830_exa.c
@@ -339,7 +339,6 @@ IntelEXAComposite(PixmapPtr pDst, int sr
scale_units[1][0], scale_units[1][1]);
if (scale_units[1][0] == -1 || scale_units[1][1] == -1) {
- ErrorF("mask is null\n");
pMask = 0;
}
diff-tree 099be52a3bb52516fb5e8d56c154a4d6b6707e09 (from 4ad577f83f7190df4d64e66fbf7c515ee6f411ce)
Author: Eric Anholt <eric at anholt.net>
Date: Thu Sep 7 10:28:09 2006 -0700
Re-remove xf86_ansic.h, and move copyright to the top of the file.
diff --git a/src/i830_exa.c b/src/i830_exa.c
index 0829c34..1074649 100644
--- a/src/i830_exa.c
+++ b/src/i830_exa.c
@@ -31,7 +31,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN
#include "config.h"
#endif
-#include "xf86_ansic.h"
#include "xf86.h"
#include "xaarop.h"
#include "i830.h"
diff --git a/src/i830_xaa.c b/src/i830_xaa.c
index 9f3a391..d4cc743 100644
--- a/src/i830_xaa.c
+++ b/src/i830_xaa.c
@@ -1,17 +1,3 @@
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include "xf86_ansic.h"
-#include "xf86.h"
-#include "xaarop.h"
-#include "i830.h"
-#include "i810_reg.h"
-
-#ifndef DO_SCANLINE_IMAGE_WRITE
-#define DO_SCANLINE_IMAGE_WRITE 0
-#endif
-
/**************************************************************************
Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
@@ -58,6 +44,19 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN
*
*/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "xf86.h"
+#include "xaarop.h"
+#include "i830.h"
+#include "i810_reg.h"
+
+#ifndef DO_SCANLINE_IMAGE_WRITE
+#define DO_SCANLINE_IMAGE_WRITE 0
+#endif
+
/* I830 Accel Functions */
static void I830SetupForMono8x8PatternFill(ScrnInfoPtr pScrn,
int pattx, int patty,
diff-tree 4ad577f83f7190df4d64e66fbf7c515ee6f411ce (from c378328ece701756ddca966eb108e2b1f5c3ed6c)
Author: Eric Anholt <eric at anholt.net>
Date: Thu Sep 7 10:24:23 2006 -0700
Remove the UTS/DFS implementations that just match the fallback versions.
diff --git a/src/i830_exa.c b/src/i830_exa.c
index bb75b24..0829c34 100644
--- a/src/i830_exa.c
+++ b/src/i830_exa.c
@@ -112,11 +112,6 @@ union intfloat {
Bool is_transform[2];
PictTransform *transform[2];
-Bool i830UploadToScreen(PixmapPtr pDst, int x, int y, int w, int h,
- char *src, int src_pitch);
-Bool i830DownloadFromScreen(PixmapPtr pSrc, int x, int y, int w, int h,
- char *dst, int dst_pitch);
-
extern Bool I830EXACheckComposite(int, PicturePtr, PicturePtr, PicturePtr);
extern Bool I830EXAPrepareComposite(int, PicturePtr, PicturePtr, PicturePtr,
PixmapPtr, PixmapPtr, PixmapPtr);
@@ -325,61 +320,6 @@ I830EXADoneCopy(PixmapPtr pDstPixmap)
return;
}
-static Bool
-I830EXAUploadToScreen(PixmapPtr pDst, int x, int y, int w, int h,
- char *src, int src_pitch)
-{
- ScrnInfoPtr pScrn = xf86Screens[pDst->drawable.pScreen->myNum];
- I830Ptr pI830 = I830PTR(pScrn);
- int dst_pitch = exaGetPixmapPitch(pDst);
- int dst_offset = exaGetPixmapOffset(pDst);
- unsigned char *dst;
-
- I830Sync(pScrn);
-
-#ifdef I830DEBUG
- ErrorF("Up->Screen: dst offset 0x%x, dst pitch %d, x %d, y %d, src %p, src pitch %d\n",
- dst_offset, dst_pitch, x, y, src, src_pitch);
-#endif
- dst = pI830->FbBase + dst_offset + y*dst_pitch +
- x* (pDst->drawable.bitsPerPixel/8);
- w *= pDst->drawable.bitsPerPixel/8;
- while(h--) {
- memcpy(dst, src, w);
- src += src_pitch;
- dst += dst_pitch;
- }
-
- return TRUE;
-}
-
-static Bool
-I830EXADownloadFromScreen(PixmapPtr pSrc, int x, int y, int w, int h,
- char *dst, int dst_pitch)
-{
- ScrnInfoPtr pScrn = xf86Screens[pSrc->drawable.pScreen->myNum];
- I830Ptr pI830 = I830PTR(pScrn);
- int src_pitch = exaGetPixmapPitch(pSrc);
- int src_offset = exaGetPixmapOffset(pSrc);
- unsigned char *src = pI830->FbBase + src_offset + y*src_pitch +
- x*(pSrc->drawable.bitsPerPixel/8);
-
- I830Sync(pScrn);
-
-#ifdef I830DEBUG
- ErrorF("Screen->Mem: src offset 0x%x, src %p, src pitch %d, x %d, y %d, dst %p, dst_pitch %d\n",
- src_offset, src, src_pitch, x, y, dst, dst_pitch);
-#endif
- w *= pSrc->drawable.bitsPerPixel/8;
- while(h--) {
- memcpy(dst, src, w);
- src += src_pitch;
- dst += dst_pitch;
- }
-
- return TRUE;
-}
-
static void
IntelEXAComposite(PixmapPtr pDst, int srcX, int srcY, int maskX, int maskY,
int dstX, int dstY, int w, int h)
@@ -578,10 +518,6 @@ I830EXAInit(ScreenPtr pScreen)
pI830->EXADriverPtr->DoneComposite = IntelEXADoneComposite;
}
- /* Upload, download to/from Screen, experimental!! */
- pI830->EXADriverPtr->UploadToScreen = I830EXAUploadToScreen;
- pI830->EXADriverPtr->DownloadFromScreen = I830EXADownloadFromScreen;
-
if(!exaDriverInit(pScreen, pI830->EXADriverPtr)) {
xfree(pI830->EXADriverPtr);
pI830->noAccel = TRUE;
diff-tree c378328ece701756ddca966eb108e2b1f5c3ed6c (from 7458a6adb5ea62f56bb3d4ab19ad7d1aa6ad2d19)
Author: Eric Anholt <eric at anholt.net>
Date: Wed Sep 6 11:15:17 2006 -0700
Remove a debug printf.
diff --git a/src/i915_exa_render.c b/src/i915_exa_render.c
index 90240b8..ef3cf2a 100644
--- a/src/i915_exa_render.c
+++ b/src/i915_exa_render.c
@@ -330,8 +330,6 @@ I915EXAPrepareComposite(int op, PictureP
CARD32 dst_format, dst_offset, dst_pitch;
CARD32 blendctl;
- ErrorF("i915 prepareComposite\n");
-
I915GetDestFormat(pDstPicture, &dst_format);
dst_offset = exaGetPixmapOffset(pDst);
dst_pitch = exaGetPixmapPitch(pDst);
More information about the xorg-commit
mailing list