Port a few forgotten fbSolidFillmmx()'es to fbFillmmx(). Use pixman_blt() instead of fbBltmmx()

in fbCopyNToN().
This commit is contained in:
Søren Sandmann Pedersen 2007-06-11 15:19:27 -04:00
parent d06099b38e
commit 3f9adb18f1
3 changed files with 31 additions and 30 deletions

View File

@ -60,11 +60,11 @@ fbCopyNtoN (DrawablePtr pSrcDrawable,
while (nbox--) while (nbox--)
{ {
#ifdef USE_MMX #ifndef FB_ACCESS_WRAPPER /* pixman_blt() doesn't support accessors yet */
if (pm == FB_ALLONES && alu == GXcopy && !reverse && if (pm == FB_ALLONES && alu == GXcopy && !reverse &&
!upsidedown && fbHaveMMX()) !upsidedown)
{ {
if (!fbBltmmx (src, dst, srcStride, dstStride, srcBpp, dstBpp, if (!pixman_blt ((uint32_t *)src, (uint32_t *)dst, srcStride, dstStride, srcBpp, dstBpp,
(pbox->x1 + dx + srcXoff), (pbox->x1 + dx + srcXoff),
(pbox->y1 + dy + srcYoff), (pbox->y1 + dy + srcYoff),
(pbox->x1 + srcXoff), (pbox->x1 + srcXoff),
@ -94,7 +94,7 @@ fbCopyNtoN (DrawablePtr pSrcDrawable,
reverse, reverse,
upsidedown); upsidedown);
#ifdef USE_MMX #ifndef FB_ACCESS_WRAPPER
next: next:
#endif #endif
pbox++; pbox++;

View File

@ -221,10 +221,10 @@ fbSolidBoxClipped (DrawablePtr pDrawable,
#ifdef USE_MMX #ifdef USE_MMX
if (!and && fbHaveMMX()) if (!and && fbHaveMMX())
{ {
if (fbSolidFillmmx (pDrawable, if (fbFillmmx (dst, dstStride, dstBpp,
partX1, partY1, partX1 + dstXoff, partX2 + dstYoff, (partX2 - partX1), (partY2 - partY1),
(partX2 - partX1), (partY2 - partY1), xor))
xor)) { {
fbFinishAccess (pDrawable); fbFinishAccess (pDrawable);
return; return;
} }

View File

@ -233,11 +233,12 @@ fbFillRegionSolid (DrawablePtr pDrawable,
while (n--) while (n--)
{ {
#ifdef USE_MMX #ifdef USE_MMX
if (!has_mmx || !fbSolidFillmmx (pDrawable, if (!has_mmx || !fbFillmmx (dst, dstStride, dstBpp,
pbox->x1, pbox->x1 + dstXoff, pbox->y1 + dstYoff,
pbox->y1,
(pbox->x2 - pbox->x1), (pbox->x2 - pbox->x1),
(pbox->y2 - pbox->y1), xor)) { (pbox->y2 - pbox->y1),
xor))
{
#endif #endif
fbSolid (dst + (pbox->y1 + dstYoff) * dstStride, fbSolid (dst + (pbox->y1 + dstYoff) * dstStride,
dstStride, dstStride,