mmx scaling back in - but forcibly disabled. new C scalign for scalign down..
works now.. :) SVN revision: 2509
This commit is contained in:
parent
6f90764a22
commit
1f4e1b0a9e
10
src/blend.c
10
src/blend.c
|
@ -1109,9 +1109,9 @@ __imlib_BlendImageToImage(ImlibImage *im_src, ImlibImage *im_dst,
|
||||||
/* setup h */
|
/* setup h */
|
||||||
h = dh;
|
h = dh;
|
||||||
/* set our scaling up in x / y dir flags */
|
/* set our scaling up in x / y dir flags */
|
||||||
if (dw >= sw)
|
if (dw > sw)
|
||||||
xup = 1;
|
xup = 1;
|
||||||
if (dh >= sh)
|
if (dh > sh)
|
||||||
yup = 1;
|
yup = 1;
|
||||||
if (!IMAGE_HAS_ALPHA(im_dst))
|
if (!IMAGE_HAS_ALPHA(im_dst))
|
||||||
merge_alpha = 0;
|
merge_alpha = 0;
|
||||||
|
@ -1132,6 +1132,11 @@ __imlib_BlendImageToImage(ImlibImage *im_src, ImlibImage *im_dst,
|
||||||
/* scale the imagedata for this LINESIZE lines chunk of image */
|
/* scale the imagedata for this LINESIZE lines chunk of image */
|
||||||
if (aa)
|
if (aa)
|
||||||
{
|
{
|
||||||
|
#ifdef DO_MMX_ASM /*\ TODO: runtime mmx check \*/
|
||||||
|
__imlib_Scale_mmx_AARGBA(ypoints, xpoints, buf, xapoints,
|
||||||
|
yapoints, xup, yup, dxx, dyy + y,
|
||||||
|
0, 0, dw, hh, dw, im_src->w);
|
||||||
|
#else
|
||||||
if (IMAGE_HAS_ALPHA(im_src))
|
if (IMAGE_HAS_ALPHA(im_src))
|
||||||
__imlib_ScaleAARGBA(ypoints, xpoints, buf, xapoints,
|
__imlib_ScaleAARGBA(ypoints, xpoints, buf, xapoints,
|
||||||
yapoints, xup, yup, dxx, dyy + y,
|
yapoints, xup, yup, dxx, dyy + y,
|
||||||
|
@ -1140,6 +1145,7 @@ __imlib_BlendImageToImage(ImlibImage *im_src, ImlibImage *im_dst,
|
||||||
__imlib_ScaleAARGB(ypoints, xpoints, buf, xapoints,
|
__imlib_ScaleAARGB(ypoints, xpoints, buf, xapoints,
|
||||||
yapoints, xup, yup, dxx, dyy + y,
|
yapoints, xup, yup, dxx, dyy + y,
|
||||||
0, 0, dw, hh, dw, im_src->w);
|
0, 0, dw, hh, dw, im_src->w);
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
__imlib_ScaleSampleRGBA(ypoints, xpoints, buf, dxx, dyy + y,
|
__imlib_ScaleSampleRGBA(ypoints, xpoints, buf, dxx, dyy + y,
|
||||||
|
|
|
@ -216,6 +216,13 @@ __imlib_RenderImage(Display *d, ImlibImage *im,
|
||||||
/* scale the imagedata for this LINESIZE lines chunk of image data */
|
/* scale the imagedata for this LINESIZE lines chunk of image data */
|
||||||
if (antialias)
|
if (antialias)
|
||||||
{
|
{
|
||||||
|
#ifdef DO_MMX_ASM /*\ TODO: runtime mmx check \*/
|
||||||
|
__imlib_Scale_mmx_AARGBA(ypoints, xpoints, buf, xapoints,
|
||||||
|
yapoints, xup, yup,
|
||||||
|
((sx * dw) / sw),
|
||||||
|
((sy * dh) / sh) + y,
|
||||||
|
0, 0, dw, hh, dw, im->w);
|
||||||
|
#else
|
||||||
if (IMAGE_HAS_ALPHA(im))
|
if (IMAGE_HAS_ALPHA(im))
|
||||||
__imlib_ScaleAARGBA(ypoints, xpoints, buf, xapoints,
|
__imlib_ScaleAARGBA(ypoints, xpoints, buf, xapoints,
|
||||||
yapoints, xup, yup,
|
yapoints, xup, yup,
|
||||||
|
@ -226,6 +233,7 @@ __imlib_RenderImage(Display *d, ImlibImage *im,
|
||||||
yapoints, xup, yup,
|
yapoints, xup, yup,
|
||||||
((sx * dw) / sw), ((sy * dh) / sh) + y,
|
((sx * dw) / sw), ((sy * dh) / sh) + y,
|
||||||
0, 0, dw, hh, dw, im->w);
|
0, 0, dw, hh, dw, im->w);
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
__imlib_ScaleSampleRGBA(ypoints, xpoints, buf,
|
__imlib_ScaleSampleRGBA(ypoints, xpoints, buf,
|
||||||
|
|
1549
src/scale.c
1549
src/scale.c
File diff suppressed because it is too large
Load Diff
|
@ -18,4 +18,8 @@ void
|
||||||
__imlib_ScaleAARGB(DATA32 **ypoints, int *xpoints, DATA32 *dest,
|
__imlib_ScaleAARGB(DATA32 **ypoints, int *xpoints, DATA32 *dest,
|
||||||
int *xapoints, int *yapoints, char xup, char yup,
|
int *xapoints, int *yapoints, char xup, char yup,
|
||||||
int dxx, int dyy, int dx, int dy, int dw, int dh, int dow, int sow);
|
int dxx, int dyy, int dx, int dy, int dw, int dh, int dow, int sow);
|
||||||
|
void
|
||||||
|
__imlib_Scale_mmx_AARGBA(DATA32 **ypoints, int *xpoints, DATA32 *dest,
|
||||||
|
int *xapoints, int *yapoints, char xup, char yup,
|
||||||
|
int dxx, int dyy, int dx, int dy, int dw, int dh, int dow, int sow);
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in New Issue