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

Support 1x1 repeat sources in R128's Blend.

This commit is contained in:
Eric Anholt 2004-01-11 00:10:34 +00:00
parent 9270256565
commit 6c97b277d9
2 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hw/kdrive/ati/ati_draw.c
View File

@ -111,7 +111,9 @@ int src_bpp;
/* If is_24bpp is set, then we are using the accelerator in 8-bit mode due /* If is_24bpp is set, then we are using the accelerator in 8-bit mode due
* to it being broken for 24bpp, so coordinates have to be multiplied by 3. * to it being broken for 24bpp, so coordinates have to be multiplied by 3.
*/ */
int is_24bpp; Bool is_24bpp;
/* For r128 Blend, tells whether to force src x/y offset to (0,0). */
Bool is_repeat;
static void static void
ATIWaitAvailMMIO(int n) ATIWaitAvailMMIO(int n)

18
hw/kdrive/ati/r128_blendtmp.h
View File

@ -54,10 +54,12 @@ TAG(R128PrepareBlend)(int op, PicturePtr pSrcPicture, PicturePtr pDstPicture,
return FALSE; return FALSE;
src_bpp = pSrc->drawable.bitsPerPixel; src_bpp = pSrc->drawable.bitsPerPixel;
is_repeat = pSrcPicture->repeat;
if (op >= sizeof(R128BlendOp)/sizeof(R128BlendOp[0])) if (op >= sizeof(R128BlendOp)/sizeof(R128BlendOp[0]))
ATI_FALLBACK(("Unsupported op 0x%x\n", op)); ATI_FALLBACK(("Unsupported op 0x%x\n", op));
if (pSrcPicture->repeat) if (pSrcPicture->repeat && (pSrc->drawable.width != 1 ||
pSrc->drawable.height != 1))
ATI_FALLBACK(("repeat unsupported\n")); ATI_FALLBACK(("repeat unsupported\n"));
if (pSrcPicture->transform != NULL) if (pSrcPicture->transform != NULL)
ATI_FALLBACK(("transform unsupported\n")); ATI_FALLBACK(("transform unsupported\n"));
@ -86,8 +88,13 @@ TAG(R128PrepareBlend)(int op, PicturePtr pSrcPicture, PicturePtr pDstPicture,
OUT_REG(R128_REG_SCALE_3D_DATATYPE, srcDatatype); OUT_REG(R128_REG_SCALE_3D_DATATYPE, srcDatatype);
OUT_REG(R128_REG_SCALE_PITCH, src_pitch / src_bpp); OUT_REG(R128_REG_SCALE_PITCH, src_pitch / src_bpp);
/* 4.16 fixed point scaling factor? */ /* 4.16 fixed point scaling factor? */
OUT_REG(R128_REG_SCALE_X_INC, 65536); if (is_repeat) {
OUT_REG(R128_REG_SCALE_Y_INC, 65536); OUT_REG(R128_REG_SCALE_X_INC, 0);
OUT_REG(R128_REG_SCALE_Y_INC, 0);
} else {
OUT_REG(R128_REG_SCALE_X_INC, 65536);
OUT_REG(R128_REG_SCALE_Y_INC, 65536);
}
OUT_REG(R128_REG_SCALE_HACC, 0x00000000); OUT_REG(R128_REG_SCALE_HACC, 0x00000000);
OUT_REG(R128_REG_SCALE_VACC, 0x00000000); OUT_REG(R128_REG_SCALE_VACC, 0x00000000);
OUT_REG(RADEON_REG_DP_CNTL, OUT_REG(RADEON_REG_DP_CNTL,
@ -104,6 +111,11 @@ TAG(R128Blend)(int srcX, int srcY, int dstX, int dstY, int width, int height)
ATICardInfo *atic = atis->atic; ATICardInfo *atic = atis->atic;
LOCALS; LOCALS;
if (is_repeat) {
srcX = 0;
srcY = 0;
}
BEGIN(4); BEGIN(4);
OUT_REG(R128_REG_SCALE_OFFSET_0, src_offset + srcY * src_pitch + srcX * OUT_REG(R128_REG_SCALE_OFFSET_0, src_offset + srcY * src_pitch + srcX *
(src_bpp >> 3)); (src_bpp >> 3));