Aurelien
/
xf86-video-intel
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

The pixmap's drawable x/y coordinates are always 0, so don't bother using them.

This commit is contained in:
Eric Anholt 2006-07-20 11:15:18 -04:00
parent 9f1cec83e0
commit 2b2173c618
3 changed files with 28 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
src/i830_exa.c
View File

@ -56,7 +56,6 @@ do { \
#endif
float scale_units[2][2];
int draw_coords[3][2];
const int I830CopyROP[16] =
{
@ -431,13 +430,12 @@ IntelEXAComposite(PixmapPtr pDst, int srcX, int srcY, int maskX, int maskY,
int pMask = 1;
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,
scale_units[0][0], scale_units[0][1],
scale_units[1][0], scale_units[1][1],
draw_coords[0][0], draw_coords[0][1],
draw_coords[1][0], draw_coords[1][1]);
"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",
srcX, srcY, maskX, maskY, dstX, dstY, w, h,
scale_units[0][0], scale_units[0][1],
scale_units[1][0], scale_units[1][1]);
if (scale_units[1][0] == -1 || scale_units[1][1] == -1) {
ErrorF("mask is null\n");
@ -481,13 +479,6 @@ IntelEXAComposite(PixmapPtr pDst, int srcX, int srcY, int maskX, int maskY,
"dstX %d, dstY %d\n", srcX, srcY, srcXend, srcYend,
maskX, maskY, maskXend, maskYend, dstX, dstY);
draw_coords[0][0] -= draw_coords[2][0];
draw_coords[0][1] -= draw_coords[2][1];
if (pMask) {
draw_coords[1][0] -= draw_coords[2][0];
draw_coords[1][1] -= draw_coords[2][1];
}
{
int vertex_count;
@ -508,38 +499,38 @@ IntelEXAComposite(PixmapPtr pDst, int srcX, int srcY, int maskX, int maskY,
OUT_RING_F(dstX);
OUT_RING_F(dstY);
OUT_RING_F(((srcX - draw_coords[0][0]) / scale_units[0][0]));
OUT_RING_F(((srcY - draw_coords[0][1]) / scale_units[0][1]));
OUT_RING_F(srcX / scale_units[0][0]);
OUT_RING_F(srcY / scale_units[0][1]);
if (pMask) {
OUT_RING_F(((maskX - draw_coords[1][0]) / scale_units[1][0]));
OUT_RING_F(((maskY - draw_coords[1][1]) / scale_units[1][1]));
OUT_RING_F(maskX / scale_units[1][0]);
OUT_RING_F(maskY / scale_units[1][1]);
}
OUT_RING_F(dstX);
OUT_RING_F((dstY+h));
OUT_RING_F(((srcX - draw_coords[0][0]) / scale_units[0][0]));
OUT_RING_F(((srcYend - draw_coords[0][1]) / scale_units[0][1]));
OUT_RING_F(dstY + h);
OUT_RING_F(srcX / scale_units[0][0]);
OUT_RING_F(srcYend / scale_units[0][1]);
if (pMask) {
OUT_RING_F(((maskX - draw_coords[1][0]) / scale_units[1][0]));
OUT_RING_F(((maskYend - draw_coords[1][1]) / scale_units[1][1]));
OUT_RING_F(maskX / scale_units[1][0]);
OUT_RING_F(maskYend / scale_units[1][1]);
}
OUT_RING_F((dstX+w));
OUT_RING_F((dstY+h));
OUT_RING_F(((srcXend - draw_coords[0][0]) / scale_units[0][0]));
OUT_RING_F(((srcYend - draw_coords[0][1]) / scale_units[0][1]));
OUT_RING_F(dstX + w);
OUT_RING_F(dstY + h);
OUT_RING_F(srcXend / scale_units[0][0]);
OUT_RING_F(srcYend / scale_units[0][1]);
if (pMask) {
OUT_RING_F(((maskXend - draw_coords[1][0]) / scale_units[1][0]));
OUT_RING_F(((maskYend - draw_coords[1][1]) / scale_units[1][1]));
OUT_RING_F(maskXend / scale_units[1][0]);
OUT_RING_F(maskYend / scale_units[1][1]);
}
OUT_RING_F((dstX+w));
OUT_RING_F((dstY));
OUT_RING_F(((srcXend - draw_coords[0][0]) / scale_units[0][0]));
OUT_RING_F(((srcY - draw_coords[0][1]) / scale_units[0][1]));
OUT_RING_F(dstX + w);
OUT_RING_F(dstY);
OUT_RING_F(srcXend / scale_units[0][0]);
OUT_RING_F(srcY / scale_units[0][1]);
if (pMask) {
OUT_RING_F(((maskXend - draw_coords[1][0]) / scale_units[1][0]));
OUT_RING_F(((maskY - draw_coords[1][1]) / scale_units[1][1]));
OUT_RING_F(maskXend / scale_units[1][0]);
OUT_RING_F(maskY / scale_units[1][1]);
}
ADVANCE_LP_RING();
}

7
src/i830_exa_render.c
View File

@ -24,7 +24,6 @@ do { \
#endif
extern float scale_units[2][2];
extern int draw_coords[3][2];
extern Bool is_transform[2];
extern PictTransform *transform[2];
@ -249,8 +248,6 @@ I830TextureSetup(PicturePtr pPict, PixmapPtr pPix, int unit)
h = pPict->pDrawable->height;
scale_units[unit][0] = pPix->drawable.width;
scale_units[unit][1] = pPix->drawable.height;
draw_coords[unit][0] = pPix->drawable.x;
draw_coords[unit][1] = pPix->drawable.y;
for (i = 0; i < sizeof(I830TexFormats) / sizeof(I830TexFormats[0]); i++) {
if (I830TexFormats[i].fmt == pPict->format)
@ -378,9 +375,7 @@ I830EXAPrepareComposite(int op, PicturePtr pSrcPicture,
I830GetDestFormat(pDstPicture, &dst_format);
dst_offset = exaGetPixmapOffset(pDst);
dst_pitch = exaGetPixmapPitch(pDst);
draw_coords[2][0] = pDst->drawable.x;
draw_coords[2][1] = pDst->drawable.y;
if (!I830TextureSetup(pSrcPicture, pSrc, 0))
I830FALLBACK("fail to setup src texture\n");
if (pMask != NULL) {

5
src/i915_exa_render.c
View File

@ -27,7 +27,6 @@ do { \
#endif
extern float scale_units[2][2];
extern int draw_coords[3][2];
extern Bool is_transform[2];
extern PictTransform *transform[2];
@ -230,8 +229,6 @@ I915TextureSetup(PicturePtr pPict, PixmapPtr pPix, int unit)
h = pPict->pDrawable->height;
scale_units[unit][0] = pPix->drawable.width;
scale_units[unit][1] = pPix->drawable.height;
draw_coords[unit][0] = pPix->drawable.x;
draw_coords[unit][1] = pPix->drawable.y;
for (i = 0; i < sizeof(I915TexFormats) / sizeof(I915TexFormats[0]); i++) {
if (I915TexFormats[i].fmt == pPict->format)
@ -333,8 +330,6 @@ ErrorF("i915 prepareComposite\n");
I915GetDestFormat(pDstPicture, &dst_format);
dst_offset = exaGetPixmapOffset(pDst);
dst_pitch = exaGetPixmapPitch(pDst);
draw_coords[2][0] = pDst->drawable.x;
draw_coords[2][1] = pDst->drawable.y;
scale_units[2][0] = pDst->drawable.width;
scale_units[2][1] = pDst->drawable.height;
FS_LOCALS(20);