xf86-video-intel: Branch 'exa' - src/i830_exa.c src/i915_exa_render.c
Zhenyu Wang
zhen at kemper.freedesktop.org
Mon Jul 17 19:01:08 PDT 2006
src/i830_exa.c | 8 ++++++--
src/i915_exa_render.c | 4 ++--
2 files changed, 8 insertions(+), 4 deletions(-)
New commits:
diff-tree 855a9f13cb7fd4f6c489ff280bf389475bbd9bbe (from 04d1584737fd0d14e99608a97281fd7b1549ae0e)
Author: Wang Zhenyu <zhenyu.z.wang at intel.com>
Date: Tue Jul 18 10:02:47 2006 +0800
fallback in 'repeat' case for now
diff --git a/src/i830_exa.c b/src/i830_exa.c
index 83601dc..40f6868 100644
--- a/src/i830_exa.c
+++ b/src/i830_exa.c
@@ -340,8 +340,10 @@ I830EXAUploadToScreen(PixmapPtr pDst, in
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
#ifndef UPLOAD_USE_BLIT
dst = pI830->FbBase + dst_offset + y*dst_pitch +
x* (pDst->drawable.bitsPerPixel/8);
@@ -403,8 +405,10 @@ I830EXADownloadFromScreen(PixmapPtr pSrc
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);
@@ -426,7 +430,7 @@ IntelEXAComposite(PixmapPtr pDst, int sr
PictVector v;
int pMask = 1;
-ErrorF("Composite: srcX %d, srcY %d\n\t maskX %d, maskY %d\n\t"
+ DPRINTF(PFX, "Composite: srcX %d, srcY %d\n\t maskX %d, maskY %d\n\t"
"dstX %d, dstY %d\n\twidth %d, height %d\n\t"
"src_scale_x %f, src_scale_y %f, mask_scale_x %f, mask_scale_y %f\n""\tdx0 %d, dy0 %x, dx1 %d dy1 %x\n",
srcX, srcY, maskX, maskY, dstX, dstY, w, h,
@@ -472,7 +476,7 @@ ErrorF("Composite: srcX %d, srcY %d\n\t
maskXend = xFixedToInt(v.vector[0]);
maskYend = xFixedToInt(v.vector[1]);
}
-DPRINTF(PFX, "After transform: srcX %d, srcY %d,srcXend %d, srcYend %d\n\t"
+ DPRINTF(PFX, "After transform: srcX %d, srcY %d,srcXend %d, srcYend %d\n\t"
"maskX %d, maskY %d, maskXend %d, maskYend %d\n\t"
"dstX %d, dstY %d\n", srcX, srcY, srcXend, srcYend,
maskX, maskY, maskXend, maskYend, dstX, dstY);
diff --git a/src/i915_exa_render.c b/src/i915_exa_render.c
index 68c929e..acec69f 100644
--- a/src/i915_exa_render.c
+++ b/src/i915_exa_render.c
@@ -231,8 +231,8 @@ static Bool I915CheckCompositeTexture(Pi
(int)pPict->format);
/* FIXME: fix repeat support */
- if (pPict->repeat && ((w&(w-1)) != 0) && ((h&(h-1)) != 0))
- I830FALLBACK("repeat non log2 aligned!\n");
+ if (pPict->repeat)
+ I830FALLBACK("repeat not support now!\n");
if (pPict->filter != PictFilterNearest &&
pPict->filter != PictFilterBilinear)
More information about the xorg-commit
mailing list