borisfaure
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

symbol clash! oops! 

SVN revision: 6901
This commit is contained in:
Carsten Haitzler 2003-05-12 02:26:27 +00:00
parent 57e59b4301
commit 9e87031686
7 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
legacy/evas/src/lib/engines/common/evas_blend_alpha_color_pixel.c
View File

@ -4,8 +4,8 @@
#include "evas_mmx.h"
#endif
extern DATA8 pow_lut[256][256];
extern const DATA16 const_c1[4];
extern DATA8 _evas_pow_lut[256][256];
extern const DATA16 _evas_const_c1[4];
#ifdef BUILD_C
void
@ -54,7 +54,7 @@ evas_common_blend_alpha_color_rgba_to_rgb_mmx (DATA8 *src, DATA32 *dst, int len,
movd_m2r(col, mm1);
punpcklbw_r2r(mm1, mm6);
psrlw_i2r(8, mm6);
movq_m2r(*const_c1, mm5);
movq_m2r(*_evas_const_c1, mm5);
paddw_r2r(mm5, mm6);
pxor_r2r(mm4, mm4);
@ -124,7 +124,7 @@ evas_common_blend_alpha_color_rgba_to_rgba_c (DATA8 *src, DATA32 *dst, int len,
DATA8 aa;
aa = (((*src_ptr) + 1) * A_VAL(&col)) >> 8;
a = pow_lut[aa][A_VAL(dst_ptr)];
a = _evas_pow_lut[aa][A_VAL(dst_ptr)];
BLEND_COLOR(a, R_VAL(dst_ptr),
R_VAL(&col), R_VAL(dst_ptr),

8
legacy/evas/src/lib/engines/common/evas_blend_color_pixel.c
View File

@ -4,8 +4,8 @@
#include "evas_mmx.h"
#endif
extern DATA8 pow_lut[256][256];
extern const DATA16 const_c1[4];
extern DATA8 _evas_pow_lut[256][256];
extern const DATA16 _evas_const_c1[4];
#ifdef BUILD_C
void
@ -44,7 +44,7 @@ evas_common_blend_color_rgba_to_rgb_mmx(DATA32 src, DATA32 *dst, int len)
dst_end_ptr = dst + len;
pxor_r2r(mm4, mm4);
movq_m2r(*const_c1, mm5);
movq_m2r(*_evas_const_c1, mm5);
movd_m2r(src, mm6);
@ -94,7 +94,7 @@ evas_common_blend_color_rgba_to_rgba_c(DATA32 src, DATA32 *dst, int len)
DATA32 tmp;
DATA8 a;
a = pow_lut[A_VAL(&src)][A_VAL(dst_ptr)];
a = _evas_pow_lut[A_VAL(&src)][A_VAL(dst_ptr)];
BLEND_COLOR(a, R_VAL(dst_ptr),
R_VAL(&src), R_VAL(dst_ptr),

14
legacy/evas/src/lib/engines/common/evas_blend_main.c
View File

@ -4,10 +4,10 @@
#include "evas_mmx.h"
#endif
static void blend_init_pow_lut(void);
static void blend_init__evas_pow_lut(void);
DATA8 pow_lut[256][256];
const DATA16 const_c1[4] = {1, 1, 1, 1};
DATA8 _evas_pow_lut[256][256];
const DATA16 _evas_const_c1[4] = {1, 1, 1, 1};
void
evas_common_blend_init(void)
@ -22,11 +22,11 @@ evas_common_blend_init(void)
evas_common_cpu_can_do(&mmx, &sse, &sse2);
blend_init_pow_lut();
blend_init__evas_pow_lut();
}
void
blend_init_pow_lut(void)
blend_init__evas_pow_lut(void)
{
int i, j;
@ -37,8 +37,8 @@ blend_init_pow_lut(void)
int divisor;
divisor = (i + (j * (255 - i)) / 255);
if (divisor > 0) pow_lut[i][j] = (i * 255) / divisor;
else pow_lut[i][j] = 0;
if (divisor > 0) _evas_pow_lut[i][j] = (i * 255) / divisor;
else _evas_pow_lut[i][j] = 0;
}
}
}

6
legacy/evas/src/lib/engines/common/evas_blend_pixel_cmod_pixel.c
View File

@ -4,8 +4,8 @@
#include "evas_mmx.h"
#endif
extern DATA8 pow_lut[256][256];
extern const DATA16 const_c1[4];
extern DATA8 _evas_pow_lut[256][256];
extern const DATA16 _evas_const_c1[4];
void
evas_common_blend_pixels_cmod_rgba_to_rgb_c(DATA32 *src, DATA32 *dst, int len, DATA8 *rmod, DATA8 *gmod, DATA8 *bmod, DATA8 *amod)
@ -55,7 +55,7 @@ evas_common_blend_pixels_cmod_rgba_to_rgba_c(DATA32 *src, DATA32 *dst, int len,
DATA32 tmp;
DATA8 a;
a = pow_lut[amod[A_VAL(src_ptr)]][A_VAL(dst_ptr)];
a = _evas_pow_lut[amod[A_VAL(src_ptr)]][A_VAL(dst_ptr)];
if (a) /* hmmm - do we need this? */
{
BLEND_COLOR(a, R_VAL(dst_ptr),

10
legacy/evas/src/lib/engines/common/evas_blend_pixel_mul_pixel.c
View File

@ -4,8 +4,8 @@
#include "evas_mmx.h"
#endif
extern DATA8 pow_lut[256][256];
extern const DATA16 const_c1[4];
extern DATA8 _evas_pow_lut[256][256];
extern const DATA16 _evas_const_c1[4];
#ifdef BUILD_C
void
@ -84,7 +84,7 @@ evas_common_blend_pixels_mul_color_rgba_to_rgb_mmx(DATA32 *src, DATA32 *dst, int
movd_m2r(mul_color, mm1);
punpcklbw_r2r(mm1, mm6);
psrlw_i2r(8, mm6);
movq_m2r(*const_c1, mm5);
movq_m2r(*_evas_const_c1, mm5);
paddw_r2r(mm5, mm6);
pxor_r2r(mm4, mm4);
@ -155,7 +155,7 @@ evas_common_blend_pixels_mul_color_rgba_to_rgba_c(DATA32 *src, DATA32 *dst, int
aa = (A_VAL(src_ptr) * (A_VAL(&mul_color) + 1)) >> 8;
if (aa) /* hmmm - do we need this? */
{
a = pow_lut[aa][A_VAL(dst_ptr)];
a = _evas_pow_lut[aa][A_VAL(dst_ptr)];
BLEND_COLOR(a, R_VAL(dst_ptr),
R_VAL(src_ptr), R_VAL(dst_ptr),
@ -182,7 +182,7 @@ evas_common_blend_pixels_mul_color_rgba_to_rgba_c(DATA32 *src, DATA32 *dst, int
aa = (A_VAL(src_ptr) * (A_VAL(&mul_color) + 1)) >> 8;
if (aa) /* hmmm - do we need this? */
{
a = pow_lut[aa][A_VAL(dst_ptr)];
a = _evas_pow_lut[aa][A_VAL(dst_ptr)];
BLEND_COLOR(a, R_VAL(dst_ptr),
((R_VAL(src_ptr) * (R_VAL(&mul_color) + 1)) >> 8), R_VAL(dst_ptr),

8
legacy/evas/src/lib/engines/common/evas_blend_pixel_pixel.c
View File

@ -4,8 +4,8 @@
#include "evas_mmx.h"
#endif
extern DATA8 pow_lut[256][256];
extern const DATA16 const_c1[4];
extern DATA8 _evas_pow_lut[256][256];
extern const DATA16 _evas_const_c1[4];
#ifdef BUILD_C
void
@ -50,7 +50,7 @@ evas_common_blend_pixels_rgba_to_rgb_mmx(DATA32 *src, DATA32 *dst, int len)
dst_end_ptr = dst + len;
pxor_r2r(mm4, mm4);
movq_m2r(*const_c1, mm5);
movq_m2r(*_evas_const_c1, mm5);
while (dst_ptr < dst_end_ptr)
{
@ -99,7 +99,7 @@ evas_common_blend_pixels_rgba_to_rgba_c(DATA32 *src, DATA32 *dst, int len)
if (A_VAL(src_ptr)) /* hmmm - do we need this? */
{
a = pow_lut[A_VAL(src_ptr)][A_VAL(dst_ptr)];
a = _evas_pow_lut[A_VAL(src_ptr)][A_VAL(dst_ptr)];
BLEND_COLOR(a, R_VAL(dst_ptr),
R_VAL(src_ptr), R_VAL(dst_ptr),

6
legacy/evas/src/lib/engines/common/evas_line_main.c
View File

@ -1,6 +1,6 @@
#include "evas_common.h"
extern DATA8 pow_lut[256][256];
extern DATA8 _evas_pow_lut[256][256];
void
evas_common_line_init(void)
@ -96,7 +96,7 @@ evas_common_line_draw(RGBA_Image *dst, RGBA_Draw_Context *dc, int x1, int y1, in
DATA32 __blend_tmp;
DATA8 __blend_a;
__blend_a = pow_lut[A_VAL(&(col))][A_VAL(ptr)];
__blend_a = _evas_pow_lut[A_VAL(&(col))][A_VAL(ptr)];
BLEND_COLOR(__blend_a, R_VAL(ptr),
R_VAL(&(col)), R_VAL(ptr),
@ -133,7 +133,7 @@ evas_common_line_draw(RGBA_Image *dst, RGBA_Draw_Context *dc, int x1, int y1, in
DATA32 __blend_tmp;
DATA8 __blend_a;
__blend_a = pow_lut[A_VAL(&(col))][A_VAL(ptr)];
__blend_a = _evas_pow_lut[A_VAL(&(col))][A_VAL(ptr)];
BLEND_COLOR(__blend_a, R_VAL(ptr),
R_VAL(&(col)), R_VAL(ptr),