diff --git a/legacy/evas/src/lib/engines/common/evas_blend_alpha_color_pixel.c b/legacy/evas/src/lib/engines/common/evas_blend_alpha_color_pixel.c index 15c4e9f43b..b8b0c7bebe 100644 --- a/legacy/evas/src/lib/engines/common/evas_blend_alpha_color_pixel.c +++ b/legacy/evas/src/lib/engines/common/evas_blend_alpha_color_pixel.c @@ -9,7 +9,7 @@ extern const DATA16 const_c1[4]; #ifdef BUILD_C void -blend_alpha_color_rgba_to_rgb_c (DATA8 *src, DATA32 *dst, int len, DATA32 col) +evas_common_blend_alpha_color_rgba_to_rgb_c (DATA8 *src, DATA32 *dst, int len, DATA32 col) { DATA8 *src_ptr; DATA32 *dst_ptr, *dst_end_ptr; @@ -41,7 +41,7 @@ blend_alpha_color_rgba_to_rgb_c (DATA8 *src, DATA32 *dst, int len, DATA32 col) #ifdef BUILD_MMX void -blend_alpha_color_rgba_to_rgb_mmx (DATA8 *src, DATA32 *dst, int len, DATA32 col) +evas_common_blend_alpha_color_rgba_to_rgb_mmx (DATA8 *src, DATA32 *dst, int len, DATA32 col) { DATA8 *src_ptr; DATA32 *dst_ptr, *dst_end_ptr; @@ -108,7 +108,7 @@ blend_alpha_color_rgba_to_rgb_mmx (DATA8 *src, DATA32 *dst, int len, DATA32 col) #endif void -blend_alpha_color_rgba_to_rgba_c (DATA8 *src, DATA32 *dst, int len, DATA32 col) +evas_common_blend_alpha_color_rgba_to_rgba_c (DATA8 *src, DATA32 *dst, int len, DATA32 col) { DATA8 *src_ptr; DATA32 *dst_ptr, *dst_end_ptr; diff --git a/legacy/evas/src/lib/engines/common/evas_blend_color_pixel.c b/legacy/evas/src/lib/engines/common/evas_blend_color_pixel.c index 13c54d3be7..fd6b670d1a 100644 --- a/legacy/evas/src/lib/engines/common/evas_blend_color_pixel.c +++ b/legacy/evas/src/lib/engines/common/evas_blend_color_pixel.c @@ -9,7 +9,7 @@ extern const DATA16 const_c1[4]; #ifdef BUILD_C void -blend_color_rgba_to_rgb_c(DATA32 src, DATA32 *dst, int len) +evas_common_blend_color_rgba_to_rgb_c(DATA32 src, DATA32 *dst, int len) { DATA32 *dst_ptr, *dst_end_ptr; @@ -36,7 +36,7 @@ blend_color_rgba_to_rgb_c(DATA32 src, DATA32 *dst, int len) #ifdef BUILD_MMX void -blend_color_rgba_to_rgb_mmx(DATA32 src, DATA32 *dst, int len) +evas_common_blend_color_rgba_to_rgb_mmx(DATA32 src, DATA32 *dst, int len) { DATA32 *dst_ptr, *dst_end_ptr; @@ -82,7 +82,7 @@ blend_color_rgba_to_rgb_mmx(DATA32 src, DATA32 *dst, int len) /****************************************************************************/ void -blend_color_rgba_to_rgba_c(DATA32 src, DATA32 *dst, int len) +evas_common_blend_color_rgba_to_rgba_c(DATA32 src, DATA32 *dst, int len) { DATA32 *dst_ptr, *dst_end_ptr; @@ -115,7 +115,7 @@ blend_color_rgba_to_rgba_c(DATA32 src, DATA32 *dst, int len) #ifdef BUILD_C void -copy_color_rgba_to_rgba_c(DATA32 src, DATA32 *dst, int len) +evas_common_copy_color_rgba_to_rgba_c(DATA32 src, DATA32 *dst, int len) { DATA32 *dst_ptr, *dst_end_ptr; @@ -132,7 +132,7 @@ copy_color_rgba_to_rgba_c(DATA32 src, DATA32 *dst, int len) #ifdef BUILD_MMX void -copy_color_rgba_to_rgba_mmx(DATA32 src, DATA32 *dst, int len) +evas_common_copy_color_rgba_to_rgba_mmx(DATA32 src, DATA32 *dst, int len) { DATA32 *dst_ptr, *dst_end_ptr, *dst_end_ptr_pre; @@ -164,7 +164,7 @@ copy_color_rgba_to_rgba_mmx(DATA32 src, DATA32 *dst, int len) #ifdef BUILD_SSE void -copy_color_rgba_to_rgba_sse(DATA32 src, DATA32 *dst, int len) +evas_common_copy_color_rgba_to_rgba_sse(DATA32 src, DATA32 *dst, int len) { DATA32 *dst_ptr, *dst_end_ptr, *dst_end_ptr_pre; @@ -198,7 +198,7 @@ copy_color_rgba_to_rgba_sse(DATA32 src, DATA32 *dst, int len) /****************************************************************************/ void -copy_color_rgb_to_rgba_c(DATA32 src, DATA32 *dst, int len) +evas_common_copy_color_rgb_to_rgba_c(DATA32 src, DATA32 *dst, int len) { DATA32 *dst_ptr, *dst_end_ptr; diff --git a/legacy/evas/src/lib/engines/common/evas_blend_main.c b/legacy/evas/src/lib/engines/common/evas_blend_main.c index 8ab588ab1e..0ce61b6aa2 100644 --- a/legacy/evas/src/lib/engines/common/evas_blend_main.c +++ b/legacy/evas/src/lib/engines/common/evas_blend_main.c @@ -10,7 +10,7 @@ DATA8 pow_lut[256][256]; const DATA16 const_c1[4] = {1, 1, 1, 1}; void -blend_init(void) +evas_common_blend_init(void) { static int initialised = 0; static int mmx = 0; @@ -20,7 +20,7 @@ blend_init(void) if (initialised) return; initialised = 1; - cpu_can_do(&mmx, &sse, &sse2); + evas_common_cpu_can_do(&mmx, &sse, &sse2); blend_init_pow_lut(); } diff --git a/legacy/evas/src/lib/engines/common/evas_blend_pixel_cmod_pixel.c b/legacy/evas/src/lib/engines/common/evas_blend_pixel_cmod_pixel.c index b5509217d5..53655487a0 100644 --- a/legacy/evas/src/lib/engines/common/evas_blend_pixel_cmod_pixel.c +++ b/legacy/evas/src/lib/engines/common/evas_blend_pixel_cmod_pixel.c @@ -8,7 +8,7 @@ extern DATA8 pow_lut[256][256]; extern const DATA16 const_c1[4]; void -blend_pixels_cmod_rgba_to_rgb_c(DATA32 *src, DATA32 *dst, int len, DATA8 *rmod, DATA8 *gmod, DATA8 *bmod, DATA8 *amod) +evas_common_blend_pixels_cmod_rgba_to_rgb_c(DATA32 *src, DATA32 *dst, int len, DATA8 *rmod, DATA8 *gmod, DATA8 *bmod, DATA8 *amod) { DATA32 *src_ptr, *dst_ptr, *dst_end_ptr; @@ -42,7 +42,7 @@ blend_pixels_cmod_rgba_to_rgb_c(DATA32 *src, DATA32 *dst, int len, DATA8 *rmod, /****************************************************************************/ void -blend_pixels_cmod_rgba_to_rgba_c(DATA32 *src, DATA32 *dst, int len, DATA8 *rmod, DATA8 *gmod, DATA8 *bmod, DATA8 *amod) +evas_common_blend_pixels_cmod_rgba_to_rgba_c(DATA32 *src, DATA32 *dst, int len, DATA8 *rmod, DATA8 *gmod, DATA8 *bmod, DATA8 *amod) { DATA32 *src_ptr, *dst_ptr, *dst_end_ptr; @@ -77,7 +77,7 @@ blend_pixels_cmod_rgba_to_rgba_c(DATA32 *src, DATA32 *dst, int len, DATA8 *rmod, /****************************************************************************/ void -copy_pixels_cmod_rgba_to_rgba_c(DATA32 *src, DATA32 *dst, int len, DATA8 *rmod, DATA8 *gmod, DATA8 *bmod, DATA8 *amod) +evas_common_copy_pixels_cmod_rgba_to_rgba_c(DATA32 *src, DATA32 *dst, int len, DATA8 *rmod, DATA8 *gmod, DATA8 *bmod, DATA8 *amod) { DATA32 *src_ptr, *dst_ptr, *dst_end_ptr; @@ -99,7 +99,7 @@ copy_pixels_cmod_rgba_to_rgba_c(DATA32 *src, DATA32 *dst, int len, DATA8 *rmod, /****************************************************************************/ void -copy_pixels_cmod_rgb_to_rgba_c(DATA32 *src, DATA32 *dst, int len, DATA8 *rmod, DATA8 *gmod, DATA8 *bmod, DATA8 *amod) +evas_common_copy_pixels_cmod_rgb_to_rgba_c(DATA32 *src, DATA32 *dst, int len, DATA8 *rmod, DATA8 *gmod, DATA8 *bmod, DATA8 *amod) { DATA32 *src_ptr, *dst_ptr, *dst_end_ptr; diff --git a/legacy/evas/src/lib/engines/common/evas_blend_pixel_mul_pixel.c b/legacy/evas/src/lib/engines/common/evas_blend_pixel_mul_pixel.c index 2902105033..2a8e901eb4 100644 --- a/legacy/evas/src/lib/engines/common/evas_blend_pixel_mul_pixel.c +++ b/legacy/evas/src/lib/engines/common/evas_blend_pixel_mul_pixel.c @@ -9,7 +9,7 @@ extern const DATA16 const_c1[4]; #ifdef BUILD_C void -blend_pixels_mul_color_rgba_to_rgb_c(DATA32 *src, DATA32 *dst, int len, DATA32 mul_color) +evas_common_blend_pixels_mul_color_rgba_to_rgb_c(DATA32 *src, DATA32 *dst, int len, DATA32 mul_color) { DATA32 *src_ptr, *dst_ptr, *dst_end_ptr; @@ -72,7 +72,7 @@ blend_pixels_mul_color_rgba_to_rgb_c(DATA32 *src, DATA32 *dst, int len, DATA32 m #ifdef BUILD_MMX void -blend_pixels_mul_color_rgba_to_rgb_mmx(DATA32 *src, DATA32 *dst, int len, DATA32 mul_color) +evas_common_blend_pixels_mul_color_rgba_to_rgb_mmx(DATA32 *src, DATA32 *dst, int len, DATA32 mul_color) { DATA32 *src_ptr, *dst_ptr, *dst_end_ptr; @@ -135,7 +135,7 @@ blend_pixels_mul_color_rgba_to_rgb_mmx(DATA32 *src, DATA32 *dst, int len, DATA32 /****************************************************************************/ void -blend_pixels_mul_color_rgba_to_rgba_c(DATA32 *src, DATA32 *dst, int len, DATA32 mul_color) +evas_common_blend_pixels_mul_color_rgba_to_rgba_c(DATA32 *src, DATA32 *dst, int len, DATA32 mul_color) { DATA32 *src_ptr, *dst_ptr, *dst_end_ptr; diff --git a/legacy/evas/src/lib/engines/common/evas_blend_pixel_pixel.c b/legacy/evas/src/lib/engines/common/evas_blend_pixel_pixel.c index d3c27d03aa..189dfab678 100644 --- a/legacy/evas/src/lib/engines/common/evas_blend_pixel_pixel.c +++ b/legacy/evas/src/lib/engines/common/evas_blend_pixel_pixel.c @@ -9,7 +9,7 @@ extern const DATA16 const_c1[4]; #ifdef BUILD_C void -blend_pixels_rgba_to_rgb_c(DATA32 *src, DATA32 *dst, int len) +evas_common_blend_pixels_rgba_to_rgb_c(DATA32 *src, DATA32 *dst, int len) { DATA32 *src_ptr, *dst_ptr, *dst_end_ptr; @@ -41,7 +41,7 @@ blend_pixels_rgba_to_rgb_c(DATA32 *src, DATA32 *dst, int len) #ifdef BUILD_MMX void -blend_pixels_rgba_to_rgb_mmx(DATA32 *src, DATA32 *dst, int len) +evas_common_blend_pixels_rgba_to_rgb_mmx(DATA32 *src, DATA32 *dst, int len) { DATA32 *src_ptr, *dst_ptr, *dst_end_ptr; @@ -84,7 +84,7 @@ blend_pixels_rgba_to_rgb_mmx(DATA32 *src, DATA32 *dst, int len) #endif void -blend_pixels_rgba_to_rgba_c(DATA32 *src, DATA32 *dst, int len) +evas_common_blend_pixels_rgba_to_rgba_c(DATA32 *src, DATA32 *dst, int len) { DATA32 *src_ptr, *dst_ptr, *dst_end_ptr; @@ -121,7 +121,7 @@ blend_pixels_rgba_to_rgba_c(DATA32 *src, DATA32 *dst, int len) #ifdef BUILD_C void -copy_pixels_rgba_to_rgba_c(DATA32 *src, DATA32 *dst, int len) +evas_common_copy_pixels_rgba_to_rgba_c(DATA32 *src, DATA32 *dst, int len) { DATA32 *src_ptr, *dst_ptr, *dst_end_ptr; @@ -140,7 +140,7 @@ copy_pixels_rgba_to_rgba_c(DATA32 *src, DATA32 *dst, int len) #ifdef BUILD_MMX void -copy_pixels_rgba_to_rgba_mmx(DATA32 *src, DATA32 *dst, int len) +evas_common_copy_pixels_rgba_to_rgba_mmx(DATA32 *src, DATA32 *dst, int len) { DATA32 *src_ptr, *dst_ptr, *dst_end_ptr, *dst_end_ptr_pre; @@ -166,7 +166,7 @@ copy_pixels_rgba_to_rgba_mmx(DATA32 *src, DATA32 *dst, int len) #ifdef BUILD_SSE void -copy_pixels_rgba_to_rgba_sse(DATA32 *src, DATA32 *dst, int len) +evas_common_copy_pixels_rgba_to_rgba_sse(DATA32 *src, DATA32 *dst, int len) { DATA32 *src_ptr, *dst_ptr, *dst_end_ptr, *dst_end_ptr_pre; @@ -193,7 +193,7 @@ copy_pixels_rgba_to_rgba_sse(DATA32 *src, DATA32 *dst, int len) #endif void -copy_pixels_rgb_to_rgba_c(DATA32 *src, DATA32 *dst, int len) +evas_common_copy_pixels_rgb_to_rgba_c(DATA32 *src, DATA32 *dst, int len) { DATA32 *src_ptr, *dst_ptr, *dst_end_ptr; @@ -213,7 +213,7 @@ copy_pixels_rgb_to_rgba_c(DATA32 *src, DATA32 *dst, int len) #ifdef BUILD_C void -copy_pixels_rev_rgba_to_rgba_c(DATA32 *src, DATA32 *dst, int len) +evas_common_copy_pixels_rev_rgba_to_rgba_c(DATA32 *src, DATA32 *dst, int len) { DATA32 *src_ptr, *dst_ptr, *dst_end_ptr; @@ -232,7 +232,7 @@ copy_pixels_rev_rgba_to_rgba_c(DATA32 *src, DATA32 *dst, int len) #ifdef BUILD_MMX void -copy_pixels_rev_rgba_to_rgba_mmx(DATA32 *src, DATA32 *dst, int len) +evas_common_copy_pixels_rev_rgba_to_rgba_mmx(DATA32 *src, DATA32 *dst, int len) { DATA32 *src_ptr, *dst_ptr, *dst_end_ptr, *dst_end_ptr_pre; @@ -274,7 +274,7 @@ copy_pixels_rev_rgba_to_rgba_mmx(DATA32 *src, DATA32 *dst, int len) #ifdef BUILD_SSE void -copy_pixels_rev_rgba_to_rgba_sse(DATA32 *src, DATA32 *dst, int len) +evas_common_copy_pixels_rev_rgba_to_rgba_sse(DATA32 *src, DATA32 *dst, int len) { DATA32 *src_ptr, *dst_ptr, *dst_end_ptr, *dst_end_ptr_pre; @@ -317,7 +317,7 @@ copy_pixels_rev_rgba_to_rgba_sse(DATA32 *src, DATA32 *dst, int len) #endif void -copy_pixels_rev_rgb_to_rgba_c(DATA32 *src, DATA32 *dst, int len) +evas_common_copy_pixels_rev_rgb_to_rgba_c(DATA32 *src, DATA32 *dst, int len) { DATA32 *src_ptr, *dst_ptr, *dst_end_ptr; diff --git a/legacy/evas/src/lib/engines/common/evas_blit_main.c b/legacy/evas/src/lib/engines/common/evas_blit_main.c index bd6e2fedea..49f0e08951 100644 --- a/legacy/evas/src/lib/engines/common/evas_blit_main.c +++ b/legacy/evas/src/lib/engines/common/evas_blit_main.c @@ -1,12 +1,12 @@ #include "evas_common.h" void -blit_init(void) +evas_common_blit_init(void) { } void -blit_rectangle(RGBA_Image *src, RGBA_Image *dst, int src_x, int src_y, int w, int h, int dst_x, int dst_y) +evas_common_blit_rectangle(RGBA_Image *src, RGBA_Image *dst, int src_x, int src_y, int w, int h, int dst_x, int dst_y) { int y; Gfx_Func_Blend_Src_Dst func; @@ -62,7 +62,7 @@ blit_rectangle(RGBA_Image *src, RGBA_Image *dst, int src_x, int src_y, int w, in /* src after dst - go forward */ if (((src_y * src->image->w) + src_x) > ((dst_y * dst->image->w) + dst_x)) { - func = draw_func_copy_get(w, 0); + func = evas_common_draw_func_copy_get(w, 0); for (y = 0; y < h; y++) { src_ptr = src->image->data + ((y + src_y) * src->image->w) + src_x; @@ -73,7 +73,7 @@ blit_rectangle(RGBA_Image *src, RGBA_Image *dst, int src_x, int src_y, int w, in /* reverse */ else { - func = draw_func_copy_get(w, 1); + func = evas_common_draw_func_copy_get(w, 1); for (y = h - 1; y >= 0; y--) { src_ptr = src->image->data + ((y + src_y) * src->image->w) + src_x; @@ -84,7 +84,7 @@ blit_rectangle(RGBA_Image *src, RGBA_Image *dst, int src_x, int src_y, int w, in } else { - func = draw_func_copy_get(w, 0); + func = evas_common_draw_func_copy_get(w, 0); for (y = 0; y < h; y++) { src_ptr = src->image->data + ((y + src_y) * src->image->w) + src_x; diff --git a/legacy/evas/src/lib/engines/common/evas_convert_gry_1.c b/legacy/evas/src/lib/engines/common/evas_convert_gry_1.c index d444c6ac61..9a17b5693e 100644 --- a/legacy/evas/src/lib/engines/common/evas_convert_gry_1.c +++ b/legacy/evas/src/lib/engines/common/evas_convert_gry_1.c @@ -1,5 +1,5 @@ #include "evas_common.h" #ifdef BUILD_CONVERT_1_GRY_1 -void convert_rgba_to_1bpp_gry_1_dith (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal){} +void evas_common_convert_rgba_to_1bpp_gry_1_dith (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal){} #endif diff --git a/legacy/evas/src/lib/engines/common/evas_convert_gry_4.c b/legacy/evas/src/lib/engines/common/evas_convert_gry_4.c index dea10de404..49dc427b00 100644 --- a/legacy/evas/src/lib/engines/common/evas_convert_gry_4.c +++ b/legacy/evas/src/lib/engines/common/evas_convert_gry_4.c @@ -1,8 +1,8 @@ #include "evas_common.h" #ifdef BUILD_CONVERT_4_GRY_4 -void convert_rgba_to_4bpp_gry_4_dith (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal){} +void evas_common_convert_rgba_to_4bpp_gry_4_dith (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal){} #endif #ifdef BUILD_CONVERT_4_GRY_1 -void convert_rgba_to_4bpp_gry_1_dith (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal){} +void evas_common_convert_rgba_to_4bpp_gry_1_dith (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal){} #endif diff --git a/legacy/evas/src/lib/engines/common/evas_convert_gry_8.c b/legacy/evas/src/lib/engines/common/evas_convert_gry_8.c index 393bef49ea..89f10ee87b 100644 --- a/legacy/evas/src/lib/engines/common/evas_convert_gry_8.c +++ b/legacy/evas/src/lib/engines/common/evas_convert_gry_8.c @@ -1,17 +1,17 @@ #include "evas_common.h" #ifdef BUILD_CONVERT_8_GRY_1 -void convert_rgba_to_8bpp_gry_256_dith (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal){} +void evas_common_convert_rgba_to_8bpp_gry_256_dith (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal){} #endif #ifdef BUILD_CONVERT_8_GRY_4 -void convert_rgba_to_8bpp_gry_64_dith (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal){} +void evas_common_convert_rgba_to_8bpp_gry_64_dith (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal){} #endif #ifdef BUILD_CONVERT_8_GRY_16 -void convert_rgba_to_8bpp_gry_16_dith (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal){} +void evas_common_convert_rgba_to_8bpp_gry_16_dith (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal){} #endif #ifdef BUILD_CONVERT_8_GRY_64 -void convert_rgba_to_8bpp_gry_4_dith (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal){} +void evas_common_convert_rgba_to_8bpp_gry_4_dith (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal){} #endif #ifdef BUILD_CONVERT_8_GRY_256 -void convert_rgba_to_8bpp_gry_1_dith (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal){} +void evas_common_convert_rgba_to_8bpp_gry_1_dith (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal){} #endif diff --git a/legacy/evas/src/lib/engines/common/evas_convert_main.c b/legacy/evas/src/lib/engines/common/evas_convert_main.c index 4c101efd00..2cedb16d88 100644 --- a/legacy/evas/src/lib/engines/common/evas_convert_main.c +++ b/legacy/evas/src/lib/engines/common/evas_convert_main.c @@ -145,12 +145,12 @@ const DATA8 _dither_128128[128][128] = #endif void -convert_init(void) +evas_common_convert_init(void) { } Gfx_Func_Convert -convert_func_get(DATA8 *dest, int w, int h, int depth, DATA32 rmask, DATA32 gmask, DATA32 bmask, Convert_Pal_Mode pal_mode, int rotation) +evas_common_convert_func_get(DATA8 *dest, int w, int h, int depth, DATA32 rmask, DATA32 gmask, DATA32 bmask, Convert_Pal_Mode pal_mode, int rotation) { if ((rmask == 0) && (gmask == 0) && (bmask == 0)) { @@ -158,31 +158,31 @@ convert_func_get(DATA8 *dest, int w, int h, int depth, DATA32 rmask, DATA32 gmas { #ifdef BUILD_CONVERT_8_RGB_332 if (pal_mode == PAL_MODE_RGB332) - return convert_rgba_to_8bpp_rgb_332_dith; + return evas_common_convert_rgba_to_8bpp_rgb_332_dith; #endif #ifdef BUILD_CONVERT_8_RGB_666 if (pal_mode == PAL_MODE_RGB666) - return convert_rgba_to_8bpp_rgb_666_dith; + return evas_common_convert_rgba_to_8bpp_rgb_666_dith; #endif #ifdef BUILD_CONVERT_8_RGB_232 if (pal_mode == PAL_MODE_RGB232) - return convert_rgba_to_8bpp_rgb_232_dith; + return evas_common_convert_rgba_to_8bpp_rgb_232_dith; #endif #ifdef BUILD_CONVERT_8_RGB_222 if (pal_mode == PAL_MODE_RGB222) - return convert_rgba_to_8bpp_rgb_222_dith; + return evas_common_convert_rgba_to_8bpp_rgb_222_dith; #endif #ifdef BUILD_CONVERT_8_RGB_221 if (pal_mode == PAL_MODE_RGB221) - return convert_rgba_to_8bpp_rgb_221_dith; + return evas_common_convert_rgba_to_8bpp_rgb_221_dith; #endif #ifdef BUILD_CONVERT_8_RGB_121 if (pal_mode == PAL_MODE_RGB121) - return convert_rgba_to_8bpp_rgb_121_dith; + return evas_common_convert_rgba_to_8bpp_rgb_121_dith; #endif #ifdef BUILD_CONVERT_8_RGB_111 if (pal_mode == PAL_MODE_RGB111) - return convert_rgba_to_8bpp_rgb_111_dith; + return evas_common_convert_rgba_to_8bpp_rgb_111_dith; #endif } if (depth == 1) @@ -203,27 +203,27 @@ convert_func_get(DATA8 *dest, int w, int h, int depth, DATA32 rmask, DATA32 gmas if (rotation == 0) { if ((!(w & 0x1)) && (!((int)dest & 0x3))) - return convert_rgba2_to_16bpp_rgb_565_dith; + return evas_common_convert_rgba2_to_16bpp_rgb_565_dith; else - return convert_rgba_to_16bpp_rgb_565_dith; + return evas_common_convert_rgba_to_16bpp_rgb_565_dith; } #endif #ifdef BUILD_CONVERT_16_RGB_ROT270 if (rotation == 270) { if ((!(w & 0x1)) && (!((int)dest & 0x3))) - return convert_rgba2_to_16bpp_rgb_565_dith_rot_270; + return evas_common_convert_rgba2_to_16bpp_rgb_565_dith_rot_270; else - return convert_rgba_to_16bpp_rgb_565_dith_rot_270; + return evas_common_convert_rgba_to_16bpp_rgb_565_dith_rot_270; } #endif #ifdef BUILD_CONVERT_16_RGB_ROT90 if (rotation == 90) { if ((!(w & 0x1)) && (!((int)dest & 0x3))) - return convert_rgba2_to_16bpp_rgb_565_dith_rot_90; + return evas_common_convert_rgba2_to_16bpp_rgb_565_dith_rot_90; else - return convert_rgba_to_16bpp_rgb_565_dith_rot_90; + return evas_common_convert_rgba_to_16bpp_rgb_565_dith_rot_90; } #endif } @@ -235,27 +235,27 @@ convert_func_get(DATA8 *dest, int w, int h, int depth, DATA32 rmask, DATA32 gmas if (rotation == 0) { if ((!(w & 0x1)) && (!((int)dest & 0x3))) - return convert_rgba2_to_16bpp_rgb_555_dith; + return evas_common_convert_rgba2_to_16bpp_rgb_555_dith; else - return convert_rgba_to_16bpp_rgb_555_dith; + return evas_common_convert_rgba_to_16bpp_rgb_555_dith; } #endif #ifdef BUILD_CONVERT_16_RGB_ROT270 if (rotation == 270) { if ((!(w & 0x1)) && (!((int)dest & 0x3))) - return convert_rgba2_to_16bpp_rgb_555_dith_rot_270; + return evas_common_convert_rgba2_to_16bpp_rgb_555_dith_rot_270; else - return convert_rgba_to_16bpp_rgb_555_dith_rot_270; + return evas_common_convert_rgba_to_16bpp_rgb_555_dith_rot_270; } #endif #ifdef BUILD_CONVERT_16_RGB_ROT90 if (rotation == 90) { if ((!(w & 0x1)) && (!((int)dest & 0x3))) - return convert_rgba2_to_16bpp_rgb_555_dith_rot_90; + return evas_common_convert_rgba2_to_16bpp_rgb_555_dith_rot_90; else - return convert_rgba_to_16bpp_rgb_555_dith_rot_90; + return evas_common_convert_rgba_to_16bpp_rgb_555_dith_rot_90; } #endif } @@ -267,27 +267,27 @@ convert_func_get(DATA8 *dest, int w, int h, int depth, DATA32 rmask, DATA32 gmas if (rotation == 0) { if ((!(w & 0x1)) && (!((int)dest & 0x3))) - return convert_rgba2_to_16bpp_rgb_444_dith; + return evas_common_convert_rgba2_to_16bpp_rgb_444_dith; else - return convert_rgba_to_16bpp_rgb_444_dith; + return evas_common_convert_rgba_to_16bpp_rgb_444_dith; } #endif #ifdef BUILD_CONVERT_16_RGB_ROT270 if (rotation == 270) { if ((!(w & 0x1)) && (!((int)dest & 0x3))) - return convert_rgba2_to_16bpp_rgb_444_dith_rot_270; + return evas_common_convert_rgba2_to_16bpp_rgb_444_dith_rot_270; else - return convert_rgba_to_16bpp_rgb_444_dith_rot_270; + return evas_common_convert_rgba_to_16bpp_rgb_444_dith_rot_270; } #endif #ifdef BUILD_CONVERT_16_RGB_ROT90 if (rotation == 90) { if ((!(w & 0x1)) && (!((int)dest & 0x3))) - return convert_rgba2_to_16bpp_rgb_444_dith_rot_90; + return evas_common_convert_rgba2_to_16bpp_rgb_444_dith_rot_90; else - return convert_rgba_to_16bpp_rgb_444_dith_rot_90; + return evas_common_convert_rgba_to_16bpp_rgb_444_dith_rot_90; } #endif } @@ -299,9 +299,9 @@ convert_func_get(DATA8 *dest, int w, int h, int depth, DATA32 rmask, DATA32 gmas if (rotation == 0) { if ((!(w & 0x1)) && (!((int)dest & 0x3))) - return convert_rgba2_to_16bpp_rgb_454645_dith; + return evas_common_convert_rgba2_to_16bpp_rgb_454645_dith; else - return convert_rgba_to_16bpp_rgb_454645_dith; + return evas_common_convert_rgba_to_16bpp_rgb_454645_dith; } #endif @@ -309,18 +309,18 @@ convert_func_get(DATA8 *dest, int w, int h, int depth, DATA32 rmask, DATA32 gmas if (rotation == 270) { if ((!(w & 0x1)) && (!((int)dest & 0x3))) - return convert_rgba2_to_16bpp_rgb_454645_dith_rot_270; + return evas_common_convert_rgba2_to_16bpp_rgb_454645_dith_rot_270; else - return convert_rgba_to_16bpp_rgb_454645_dith_rot_270; + return evas_common_convert_rgba_to_16bpp_rgb_454645_dith_rot_270; } #endif #ifdef BUILD_CONVERT_16_RGB_ROT90 if (rotation == 270) { if ((!(w & 0x1)) && (!((int)dest & 0x3))) - return convert_rgba2_to_16bpp_rgb_454645_dith_rot_90; + return evas_common_convert_rgba2_to_16bpp_rgb_454645_dith_rot_90; else - return convert_rgba_to_16bpp_rgb_454645_dith_rot_90; + return evas_common_convert_rgba_to_16bpp_rgb_454645_dith_rot_90; } #endif } @@ -332,9 +332,9 @@ convert_func_get(DATA8 *dest, int w, int h, int depth, DATA32 rmask, DATA32 gmas if (rotation == 0) { if ((!(w & 0x1)) && (!((int)dest & 0x3))) - return convert_rgba2_to_16bpp_rgb_454645_dith; + return evas_common_convert_rgba2_to_16bpp_rgb_454645_dith; else - return convert_rgba_to_16bpp_rgb_454645_dith; + return evas_common_convert_rgba_to_16bpp_rgb_454645_dith; } #endif @@ -342,18 +342,18 @@ convert_func_get(DATA8 *dest, int w, int h, int depth, DATA32 rmask, DATA32 gmas if (rotation == 270) { if ((!(w & 0x1)) && (!((int)dest & 0x3))) - return convert_rgba2_to_16bpp_rgb_454645_dith_rot_270; + return evas_common_convert_rgba2_to_16bpp_rgb_454645_dith_rot_270; else - return convert_rgba_to_16bpp_rgb_454645_dith_rot_270; + return evas_common_convert_rgba_to_16bpp_rgb_454645_dith_rot_270; } #endif #ifdef BUILD_CONVERT_16_RGB_ROT90 if (rotation == 90) { if ((!(w & 0x1)) && (!((int)dest & 0x3))) - return convert_rgba2_to_16bpp_rgb_454645_dith_rot_90; + return evas_common_convert_rgba2_to_16bpp_rgb_454645_dith_rot_90; else - return convert_rgba_to_16bpp_rgb_454645_dith_rot_90; + return evas_common_convert_rgba_to_16bpp_rgb_454645_dith_rot_90; } #endif } @@ -366,15 +366,15 @@ convert_func_get(DATA8 *dest, int w, int h, int depth, DATA32 rmask, DATA32 gmas { #ifdef BUILD_CONVERT_32_RGB_ROT0 if (rotation == 0) - return convert_rgba_to_32bpp_rgb_8888; + return evas_common_convert_rgba_to_32bpp_rgb_8888; #endif #ifdef BUILD_CONVERT_32_RGB_ROT270 if (rotation == 270) - return convert_rgba_to_32bpp_rgb_8888_rot_270; + return evas_common_convert_rgba_to_32bpp_rgb_8888_rot_270; #endif #ifdef BUILD_CONVERT_32_RGB_ROT90 if (rotation == 90) - return convert_rgba_to_32bpp_rgb_8888_rot_90; + return evas_common_convert_rgba_to_32bpp_rgb_8888_rot_90; #endif } #endif @@ -383,15 +383,15 @@ convert_func_get(DATA8 *dest, int w, int h, int depth, DATA32 rmask, DATA32 gmas { #ifdef BUILD_CONVERT_32_RGB_ROT0 if (rotation == 0) - return convert_rgba_to_32bpp_rgbx_8888; + return evas_common_convert_rgba_to_32bpp_rgbx_8888; #endif #ifdef BUILD_CONVERT_32_RGB_ROT270 if (rotation == 270) - return convert_rgba_to_32bpp_rgbx_8888_rot_270; + return evas_common_convert_rgba_to_32bpp_rgbx_8888_rot_270; #endif #ifdef BUILD_CONVERT_32_RGB_ROT90 if (rotation == 90) - return convert_rgba_to_32bpp_rgbx_8888_rot_90; + return evas_common_convert_rgba_to_32bpp_rgbx_8888_rot_90; #endif } #endif @@ -400,15 +400,15 @@ convert_func_get(DATA8 *dest, int w, int h, int depth, DATA32 rmask, DATA32 gmas { #ifdef BUILD_CONVERT_32_RGB_ROT0 if (rotation == 0) - return convert_rgba_to_32bpp_bgr_8888; + return evas_common_convert_rgba_to_32bpp_bgr_8888; #endif #ifdef BUILD_CONVERT_32_RGB_ROT270 if (rotation == 270) - return convert_rgba_to_32bpp_bgr_8888_rot_270; + return evas_common_convert_rgba_to_32bpp_bgr_8888_rot_270; #endif #ifdef BUILD_CONVERT_32_RGB_ROT90 if (rotation == 90) - return convert_rgba_to_32bpp_bgr_8888_rot_90; + return evas_common_convert_rgba_to_32bpp_bgr_8888_rot_90; #endif } #endif @@ -417,15 +417,15 @@ convert_func_get(DATA8 *dest, int w, int h, int depth, DATA32 rmask, DATA32 gmas { #ifdef BUILD_CONVERT_32_RGB_ROT0 if (rotation == 0) - return convert_rgba_to_32bpp_bgrx_8888; + return evas_common_convert_rgba_to_32bpp_bgrx_8888; #endif #ifdef BUILD_CONVERT_32_RGB_ROT270 if (rotation == 270) - return convert_rgba_to_32bpp_bgrx_8888_rot_270; + return evas_common_convert_rgba_to_32bpp_bgrx_8888_rot_270; #endif #ifdef BUILD_CONVERT_32_RGB_ROT90 if (rotation == 90) - return convert_rgba_to_32bpp_bgrx_8888_rot_90; + return evas_common_convert_rgba_to_32bpp_bgrx_8888_rot_90; #endif } #endif @@ -438,31 +438,31 @@ convert_func_get(DATA8 *dest, int w, int h, int depth, DATA32 rmask, DATA32 gmas { #ifdef BUILD_CONVERT_8_RGB_332 if (pal_mode == PAL_MODE_RGB332) - return convert_rgba_to_8bpp_rgb_332_dith; + return evas_common_convert_rgba_to_8bpp_rgb_332_dith; #endif #ifdef BUILD_CONVERT_8_RGB_666 if (pal_mode == PAL_MODE_RGB666) - return convert_rgba_to_8bpp_rgb_666_dith; + return evas_common_convert_rgba_to_8bpp_rgb_666_dith; #endif #ifdef BUILD_CONVERT_8_RGB_232 if (pal_mode == PAL_MODE_RGB232) - return convert_rgba_to_8bpp_rgb_232_dith; + return evas_common_convert_rgba_to_8bpp_rgb_232_dith; #endif #ifdef BUILD_CONVERT_8_RGB_222 if (pal_mode == PAL_MODE_RGB222) - return convert_rgba_to_8bpp_rgb_222_dith; + return evas_common_convert_rgba_to_8bpp_rgb_222_dith; #endif #ifdef BUILD_CONVERT_8_RGB_221 if (pal_mode == PAL_MODE_RGB221) - return convert_rgba_to_8bpp_rgb_221_dith; + return evas_common_convert_rgba_to_8bpp_rgb_221_dith; #endif #ifdef BUILD_CONVERT_8_RGB_121 if (pal_mode == PAL_MODE_RGB121) - return convert_rgba_to_8bpp_rgb_121_dith; + return evas_common_convert_rgba_to_8bpp_rgb_121_dith; #endif #ifdef BUILD_CONVERT_8_RGB_111 if (pal_mode == PAL_MODE_RGB111) - return convert_rgba_to_8bpp_rgb_111_dith; + return evas_common_convert_rgba_to_8bpp_rgb_111_dith; #endif } if (depth == 1) diff --git a/legacy/evas/src/lib/engines/common/evas_convert_rgb_16.c b/legacy/evas/src/lib/engines/common/evas_convert_rgb_16.c index f4254a2c4b..01d6ee6f40 100644 --- a/legacy/evas/src/lib/engines/common/evas_convert_rgb_16.c +++ b/legacy/evas/src/lib/engines/common/evas_convert_rgb_16.c @@ -10,7 +10,7 @@ extern const DATA8 _dither_128128[128][128]; #ifdef BUILD_CONVERT_16_RGB_565 #ifdef BUILD_CONVERT_16_RGB_ROT0 void -convert_rgba2_to_16bpp_rgb_565_dith (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal) +evas_common_convert_rgba2_to_16bpp_rgb_565_dith (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal) { DATA32 *src_ptr; DATA16 *dst_ptr; @@ -62,7 +62,7 @@ convert_rgba2_to_16bpp_rgb_565_dith (DATA32 *src, DATA8 *dst, int src_jump, int #ifdef BUILD_CONVERT_16_RGB_565 #ifdef BUILD_CONVERT_16_RGB_ROT0 void -convert_rgba_to_16bpp_rgb_565_dith (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal) +evas_common_convert_rgba_to_16bpp_rgb_565_dith (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal) { DATA32 *src_ptr; DATA16 *dst_ptr; @@ -95,7 +95,7 @@ convert_rgba_to_16bpp_rgb_565_dith (DATA32 *src, DATA8 *dst, int src_jump, int d #ifdef BUILD_CONVERT_16_RGB_565 #ifdef BUILD_CONVERT_16_RGB_ROT270 void -convert_rgba2_to_16bpp_rgb_565_dith_rot_270 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal) +evas_common_convert_rgba2_to_16bpp_rgb_565_dith_rot_270 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal) { DATA32 *src_ptr; DATA16 *dst_ptr; @@ -148,7 +148,7 @@ convert_rgba2_to_16bpp_rgb_565_dith_rot_270 (DATA32 *src, DATA8 *dst, int src_ju #ifdef BUILD_CONVERT_16_RGB_565 #ifdef BUILD_CONVERT_16_RGB_ROT270 void -convert_rgba_to_16bpp_rgb_565_dith_rot_270 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal) +evas_common_convert_rgba_to_16bpp_rgb_565_dith_rot_270 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal) { DATA32 *src_ptr; DATA16 *dst_ptr; @@ -181,7 +181,7 @@ convert_rgba_to_16bpp_rgb_565_dith_rot_270 (DATA32 *src, DATA8 *dst, int src_jum #ifdef BUILD_CONVERT_16_RGB_565 #ifdef BUILD_CONVERT_16_RGB_ROT90 void -convert_rgba2_to_16bpp_rgb_565_dith_rot_90 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal) +evas_common_convert_rgba2_to_16bpp_rgb_565_dith_rot_90 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal) { DATA32 *src_ptr; DATA16 *dst_ptr; @@ -234,7 +234,7 @@ convert_rgba2_to_16bpp_rgb_565_dith_rot_90 (DATA32 *src, DATA8 *dst, int src_jum #ifdef BUILD_CONVERT_16_RGB_565 #ifdef BUILD_CONVERT_16_RGB_ROT90 void -convert_rgba_to_16bpp_rgb_565_dith_rot_90 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal) +evas_common_convert_rgba_to_16bpp_rgb_565_dith_rot_90 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal) { DATA32 *src_ptr; DATA16 *dst_ptr; @@ -267,7 +267,7 @@ convert_rgba_to_16bpp_rgb_565_dith_rot_90 (DATA32 *src, DATA8 *dst, int src_jump #ifdef BUILD_CONVERT_16_RGB_444 #ifdef BUILD_CONVERT_16_RGB_ROT0 void -convert_rgba2_to_16bpp_rgb_444_dith (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal) +evas_common_convert_rgba2_to_16bpp_rgb_444_dith (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal) { DATA32 *src_ptr; DATA16 *dst_ptr; @@ -318,7 +318,7 @@ convert_rgba2_to_16bpp_rgb_444_dith (DATA32 *src, DATA8 *dst, int src_jump, int #ifdef BUILD_CONVERT_16_RGB_444 #ifdef BUILD_CONVERT_16_RGB_ROT0 void -convert_rgba_to_16bpp_rgb_444_dith (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal) +evas_common_convert_rgba_to_16bpp_rgb_444_dith (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal) { DATA32 *src_ptr; DATA16 *dst_ptr; @@ -350,7 +350,7 @@ convert_rgba_to_16bpp_rgb_444_dith (DATA32 *src, DATA8 *dst, int src_jump, int d #ifdef BUILD_CONVERT_16_RGB_444 #ifdef BUILD_CONVERT_16_RGB_ROT270 void -convert_rgba2_to_16bpp_rgb_444_dith_rot_270 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal) +evas_common_convert_rgba2_to_16bpp_rgb_444_dith_rot_270 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal) { DATA32 *src_ptr; DATA16 *dst_ptr; @@ -401,7 +401,7 @@ convert_rgba2_to_16bpp_rgb_444_dith_rot_270 (DATA32 *src, DATA8 *dst, int src_ju #ifdef BUILD_CONVERT_16_RGB_444 #ifdef BUILD_CONVERT_16_RGB_ROT270 void -convert_rgba_to_16bpp_rgb_444_dith_rot_270 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal) +evas_common_convert_rgba_to_16bpp_rgb_444_dith_rot_270 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal) { DATA32 *src_ptr; DATA16 *dst_ptr; @@ -433,7 +433,7 @@ convert_rgba_to_16bpp_rgb_444_dith_rot_270 (DATA32 *src, DATA8 *dst, int src_jum #ifdef BUILD_CONVERT_16_RGB_444 #ifdef BUILD_CONVERT_16_RGB_ROT90 void -convert_rgba2_to_16bpp_rgb_444_dith_rot_90 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal) +evas_common_convert_rgba2_to_16bpp_rgb_444_dith_rot_90 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal) { DATA32 *src_ptr; DATA16 *dst_ptr; @@ -484,7 +484,7 @@ convert_rgba2_to_16bpp_rgb_444_dith_rot_90 (DATA32 *src, DATA8 *dst, int src_jum #ifdef BUILD_CONVERT_16_RGB_444 #ifdef BUILD_CONVERT_16_RGB_ROT90 void -convert_rgba_to_16bpp_rgb_444_dith_rot_90 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal) +evas_common_convert_rgba_to_16bpp_rgb_444_dith_rot_90 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal) { DATA32 *src_ptr; DATA16 *dst_ptr; @@ -516,7 +516,7 @@ convert_rgba_to_16bpp_rgb_444_dith_rot_90 (DATA32 *src, DATA8 *dst, int src_jump #ifdef BUILD_CONVERT_16_RGB_454645 #ifdef BUILD_CONVERT_16_RGB_ROT0 void -convert_rgba2_to_16bpp_rgb_454645_dith (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal) +evas_common_convert_rgba2_to_16bpp_rgb_454645_dith (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal) { DATA32 *src_ptr; DATA16 *dst_ptr; @@ -567,7 +567,7 @@ convert_rgba2_to_16bpp_rgb_454645_dith (DATA32 *src, DATA8 *dst, int src_jump, i #ifdef BUILD_CONVERT_16_RGB_454645 #ifdef BUILD_CONVERT_16_RGB_ROT0 void -convert_rgba_to_16bpp_rgb_454645_dith (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal) +evas_common_convert_rgba_to_16bpp_rgb_454645_dith (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal) { DATA32 *src_ptr; DATA16 *dst_ptr; @@ -599,7 +599,7 @@ convert_rgba_to_16bpp_rgb_454645_dith (DATA32 *src, DATA8 *dst, int src_jump, in #ifdef BUILD_CONVERT_16_RGB_454645 #ifdef BUILD_CONVERT_16_RGB_ROT270 void -convert_rgba2_to_16bpp_rgb_454645_dith_rot_270 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal) +evas_common_convert_rgba2_to_16bpp_rgb_454645_dith_rot_270 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal) { DATA32 *src_ptr; DATA16 *dst_ptr; @@ -650,7 +650,7 @@ convert_rgba2_to_16bpp_rgb_454645_dith_rot_270 (DATA32 *src, DATA8 *dst, int src #ifdef BUILD_CONVERT_16_RGB_454645 #ifdef BUILD_CONVERT_16_RGB_ROT270 void -convert_rgba_to_16bpp_rgb_454645_dith_rot_270 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal) +evas_common_convert_rgba_to_16bpp_rgb_454645_dith_rot_270 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal) { DATA32 *src_ptr; DATA16 *dst_ptr; @@ -682,7 +682,7 @@ convert_rgba_to_16bpp_rgb_454645_dith_rot_270 (DATA32 *src, DATA8 *dst, int src_ #ifdef BUILD_CONVERT_16_RGB_454645 #ifdef BUILD_CONVERT_16_RGB_ROT90 void -convert_rgba2_to_16bpp_rgb_454645_dith_rot_90 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal) +evas_common_convert_rgba2_to_16bpp_rgb_454645_dith_rot_90 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal) { DATA32 *src_ptr; DATA16 *dst_ptr; @@ -733,7 +733,7 @@ convert_rgba2_to_16bpp_rgb_454645_dith_rot_90 (DATA32 *src, DATA8 *dst, int src_ #ifdef BUILD_CONVERT_16_RGB_454645 #ifdef BUILD_CONVERT_16_RGB_ROT90 void -convert_rgba_to_16bpp_rgb_454645_dith_rot_90 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal) +evas_common_convert_rgba_to_16bpp_rgb_454645_dith_rot_90 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal) { DATA32 *src_ptr; DATA16 *dst_ptr; @@ -765,7 +765,7 @@ convert_rgba_to_16bpp_rgb_454645_dith_rot_90 (DATA32 *src, DATA8 *dst, int src_j #ifdef BUILD_CONVERT_16_RGB_555 #ifdef BUILD_CONVERT_16_RGB_ROT0 void -convert_rgba2_to_16bpp_rgb_555_dith (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal) +evas_common_convert_rgba2_to_16bpp_rgb_555_dith (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal) { DATA32 *src_ptr; DATA16 *dst_ptr; @@ -816,7 +816,7 @@ convert_rgba2_to_16bpp_rgb_555_dith (DATA32 *src, DATA8 *dst, int src_jump, int #ifdef BUILD_CONVERT_16_RGB_555 #ifdef BUILD_CONVERT_16_RGB_ROT0 void -convert_rgba_to_16bpp_rgb_555_dith (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal) +evas_common_convert_rgba_to_16bpp_rgb_555_dith (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal) { DATA32 *src_ptr; DATA16 *dst_ptr; @@ -848,7 +848,7 @@ convert_rgba_to_16bpp_rgb_555_dith (DATA32 *src, DATA8 *dst, int src_jump, int d #ifdef BUILD_CONVERT_16_RGB_555 #ifdef BUILD_CONVERT_16_RGB_ROT270 void -convert_rgba2_to_16bpp_rgb_555_dith_rot_270 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal) +evas_common_convert_rgba2_to_16bpp_rgb_555_dith_rot_270 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal) { DATA32 *src_ptr; DATA16 *dst_ptr; @@ -899,7 +899,7 @@ convert_rgba2_to_16bpp_rgb_555_dith_rot_270 (DATA32 *src, DATA8 *dst, int src_ju #ifdef BUILD_CONVERT_16_RGB_555 #ifdef BUILD_CONVERT_16_RGB_ROT270 void -convert_rgba_to_16bpp_rgb_555_dith_rot_270 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal) +evas_common_convert_rgba_to_16bpp_rgb_555_dith_rot_270 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal) { DATA32 *src_ptr; DATA16 *dst_ptr; @@ -931,7 +931,7 @@ convert_rgba_to_16bpp_rgb_555_dith_rot_270 (DATA32 *src, DATA8 *dst, int src_jum #ifdef BUILD_CONVERT_16_RGB_555 #ifdef BUILD_CONVERT_16_RGB_ROT90 void -convert_rgba2_to_16bpp_rgb_555_dith_rot_90 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal) +evas_common_convert_rgba2_to_16bpp_rgb_555_dith_rot_90 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal) { DATA32 *src_ptr; DATA16 *dst_ptr; @@ -982,7 +982,7 @@ convert_rgba2_to_16bpp_rgb_555_dith_rot_90 (DATA32 *src, DATA8 *dst, int src_jum #ifdef BUILD_CONVERT_16_RGB_555 #ifdef BUILD_CONVERT_16_RGB_ROT90 void -convert_rgba_to_16bpp_rgb_555_dith_rot_90 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal) +evas_common_convert_rgba_to_16bpp_rgb_555_dith_rot_90 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal) { DATA32 *src_ptr; DATA16 *dst_ptr; diff --git a/legacy/evas/src/lib/engines/common/evas_convert_rgb_24.c b/legacy/evas/src/lib/engines/common/evas_convert_rgb_24.c index dcadb3edf7..91da9c0c85 100644 --- a/legacy/evas/src/lib/engines/common/evas_convert_rgb_24.c +++ b/legacy/evas/src/lib/engines/common/evas_convert_rgb_24.c @@ -1,8 +1,8 @@ #include "evas_common.h" #ifdef BUILD_CONVERT_24_RGB_888 -void convert_rgba_to_24bpp_rgb_888 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal){} +void evas_common_convert_rgba_to_24bpp_rgb_888 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal){} #endif #ifdef BUILD_CONVERT_24_BGR_888 -void convert_rgba_to_24bpp_bgr_888 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal){} +void evas_common_convert_rgba_to_24bpp_bgr_888 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal){} #endif diff --git a/legacy/evas/src/lib/engines/common/evas_convert_rgb_32.c b/legacy/evas/src/lib/engines/common/evas_convert_rgb_32.c index 3e122beed1..1be580a86a 100644 --- a/legacy/evas/src/lib/engines/common/evas_convert_rgb_32.c +++ b/legacy/evas/src/lib/engines/common/evas_convert_rgb_32.c @@ -3,7 +3,7 @@ #ifdef BUILD_CONVERT_32_RGB_8888 #ifdef BUILD_CONVERT_32_RGB_ROT0 void -convert_rgba_to_32bpp_rgb_8888 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal) +evas_common_convert_rgba_to_32bpp_rgb_8888 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal) { DATA32 *src_ptr; DATA32 *dst_ptr; @@ -13,7 +13,7 @@ convert_rgba_to_32bpp_rgb_8888 (DATA32 *src, DATA8 *dst, int src_jump, int dst_j dst_ptr = (DATA32 *)dst; src_ptr = src; - func = draw_func_copy_get(w, 0); + func = evas_common_draw_func_copy_get(w, 0); for (y = 0; y < h; y++) { @@ -32,7 +32,7 @@ convert_rgba_to_32bpp_rgb_8888 (DATA32 *src, DATA8 *dst, int src_jump, int dst_j #ifdef BUILD_CONVERT_32_RGB_8888 #ifdef BUILD_CONVERT_32_RGB_ROT270 void -convert_rgba_to_32bpp_rgb_8888_rot_270 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal) +evas_common_convert_rgba_to_32bpp_rgb_8888_rot_270 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal) { DATA32 *src_ptr; DATA32 *dst_ptr; @@ -56,7 +56,7 @@ convert_rgba_to_32bpp_rgb_8888_rot_270 (DATA32 *src, DATA8 *dst, int src_jump, i #ifdef BUILD_CONVERT_32_RGB_8888 #ifdef BUILD_CONVERT_32_RGB_ROT90 void -convert_rgba_to_32bpp_rgb_8888_rot_90 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal) +evas_common_convert_rgba_to_32bpp_rgb_8888_rot_90 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal) { DATA32 *src_ptr; DATA32 *dst_ptr; @@ -80,7 +80,7 @@ convert_rgba_to_32bpp_rgb_8888_rot_90 (DATA32 *src, DATA8 *dst, int src_jump, in #ifdef BUILD_CONVERT_32_RGBX_8888 #ifdef BUILD_CONVERT_32_RGB_ROT0 void -convert_rgba_to_32bpp_rgbx_8888 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal) +evas_common_convert_rgba_to_32bpp_rgbx_8888 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal) { DATA32 *src_ptr; DATA32 *dst_ptr; @@ -104,7 +104,7 @@ convert_rgba_to_32bpp_rgbx_8888 (DATA32 *src, DATA8 *dst, int src_jump, int dst_ #ifdef BUILD_CONVERT_32_RGBX_8888 #ifdef BUILD_CONVERT_32_RGB_ROT270 void -convert_rgba_to_32bpp_rgbx_8888_rot_270 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal) +evas_common_convert_rgba_to_32bpp_rgbx_8888_rot_270 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal) { DATA32 *src_ptr; DATA32 *dst_ptr; @@ -128,7 +128,7 @@ convert_rgba_to_32bpp_rgbx_8888_rot_270 (DATA32 *src, DATA8 *dst, int src_jump, #ifdef BUILD_CONVERT_32_RGBX_8888 #ifdef BUILD_CONVERT_32_RGB_ROT90 void -convert_rgba_to_32bpp_rgbx_8888_rot_90 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal) +evas_common_convert_rgba_to_32bpp_rgbx_8888_rot_90 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal) { DATA32 *src_ptr; DATA32 *dst_ptr; @@ -152,7 +152,7 @@ convert_rgba_to_32bpp_rgbx_8888_rot_90 (DATA32 *src, DATA8 *dst, int src_jump, i #ifdef BUILD_CONVERT_32_BGR_8888 #ifdef BUILD_CONVERT_32_RGB_ROT0 void -convert_rgba_to_32bpp_bgr_8888 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal) +evas_common_convert_rgba_to_32bpp_bgr_8888 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal) { DATA32 *src_ptr; DATA32 *dst_ptr; @@ -176,7 +176,7 @@ convert_rgba_to_32bpp_bgr_8888 (DATA32 *src, DATA8 *dst, int src_jump, int dst_j #ifdef BUILD_CONVERT_32_BGR_8888 #ifdef BUILD_CONVERT_32_RGB_ROT270 void -convert_rgba_to_32bpp_bgr_8888_rot_270 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal) +evas_common_convert_rgba_to_32bpp_bgr_8888_rot_270 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal) { DATA32 *src_ptr; DATA32 *dst_ptr; @@ -200,7 +200,7 @@ convert_rgba_to_32bpp_bgr_8888_rot_270 (DATA32 *src, DATA8 *dst, int src_jump, i #ifdef BUILD_CONVERT_32_BGR_8888 #ifdef BUILD_CONVERT_32_RGB_ROT90 void -convert_rgba_to_32bpp_bgr_8888_rot_90 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal) +evas_common_convert_rgba_to_32bpp_bgr_8888_rot_90 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal) { DATA32 *src_ptr; DATA32 *dst_ptr; @@ -224,7 +224,7 @@ convert_rgba_to_32bpp_bgr_8888_rot_90 (DATA32 *src, DATA8 *dst, int src_jump, in #ifdef BUILD_CONVERT_32_BGRX_8888 #ifdef BUILD_CONVERT_32_RGB_ROT0 void -convert_rgba_to_32bpp_bgrx_8888 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal) +evas_common_convert_rgba_to_32bpp_bgrx_8888 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal) { DATA32 *src_ptr; DATA32 *dst_ptr; @@ -248,7 +248,7 @@ convert_rgba_to_32bpp_bgrx_8888 (DATA32 *src, DATA8 *dst, int src_jump, int dst_ #ifdef BUILD_CONVERT_32_BGRX_8888 #ifdef BUILD_CONVERT_32_RGB_ROT270 void -convert_rgba_to_32bpp_bgrx_8888_rot_270 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal) +evas_common_convert_rgba_to_32bpp_bgrx_8888_rot_270 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal) { DATA32 *src_ptr; DATA32 *dst_ptr; @@ -272,7 +272,7 @@ convert_rgba_to_32bpp_bgrx_8888_rot_270 (DATA32 *src, DATA8 *dst, int src_jump, #ifdef BUILD_CONVERT_32_BGRX_8888 #ifdef BUILD_CONVERT_32_RGB_ROT90 void -convert_rgba_to_32bpp_bgrx_8888_rot_90 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal) +evas_common_convert_rgba_to_32bpp_bgrx_8888_rot_90 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal) { DATA32 *src_ptr; DATA32 *dst_ptr; diff --git a/legacy/evas/src/lib/engines/common/evas_convert_rgb_8.c b/legacy/evas/src/lib/engines/common/evas_convert_rgb_8.c index 2dd8064184..eee59d0b51 100644 --- a/legacy/evas/src/lib/engines/common/evas_convert_rgb_8.c +++ b/legacy/evas/src/lib/engines/common/evas_convert_rgb_8.c @@ -8,7 +8,7 @@ extern const DATA8 _dither_128128[128][128]; #endif #ifdef BUILD_CONVERT_8_RGB_332 -void convert_rgba_to_8bpp_rgb_332_dith (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal) +void evas_common_convert_rgba_to_8bpp_rgb_332_dith (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal) { DATA32 *src_ptr; DATA8 *dst_ptr; @@ -38,7 +38,7 @@ void convert_rgba_to_8bpp_rgb_332_dith (DATA32 *src, DATA8 *dst, int src_jum static DATA8 p_to_6[256]; static DATA8 p_to_6_err[256]; -void convert_rgba_to_8bpp_rgb_666_dith (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal) +void evas_common_convert_rgba_to_8bpp_rgb_666_dith (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal) { DATA32 *src_ptr; DATA8 *dst_ptr; @@ -75,7 +75,7 @@ void convert_rgba_to_8bpp_rgb_666_dith (DATA32 *src, DATA8 *dst, int src_jum } #endif #ifdef BUILD_CONVERT_8_RGB_232 -void convert_rgba_to_8bpp_rgb_232_dith (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal) +void evas_common_convert_rgba_to_8bpp_rgb_232_dith (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal) { DATA32 *src_ptr; DATA8 *dst_ptr; @@ -102,7 +102,7 @@ void convert_rgba_to_8bpp_rgb_232_dith (DATA32 *src, DATA8 *dst, int src_jum } #endif #ifdef BUILD_CONVERT_8_RGB_222 -void convert_rgba_to_8bpp_rgb_222_dith (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal) +void evas_common_convert_rgba_to_8bpp_rgb_222_dith (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal) { DATA32 *src_ptr; DATA8 *dst_ptr; @@ -128,7 +128,7 @@ void convert_rgba_to_8bpp_rgb_222_dith (DATA32 *src, DATA8 *dst, int src_jum } #endif #ifdef BUILD_CONVERT_8_RGB_221 -void convert_rgba_to_8bpp_rgb_221_dith (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal) +void evas_common_convert_rgba_to_8bpp_rgb_221_dith (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal) { DATA32 *src_ptr; DATA8 *dst_ptr; @@ -155,7 +155,7 @@ void convert_rgba_to_8bpp_rgb_221_dith (DATA32 *src, DATA8 *dst, int src_jum } #endif #ifdef BUILD_CONVERT_8_RGB_121 -void convert_rgba_to_8bpp_rgb_121_dith (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal) +void evas_common_convert_rgba_to_8bpp_rgb_121_dith (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal) { DATA32 *src_ptr; DATA8 *dst_ptr; @@ -182,7 +182,7 @@ void convert_rgba_to_8bpp_rgb_121_dith (DATA32 *src, DATA8 *dst, int src_jum } #endif #ifdef BUILD_CONVERT_8_RGB_111 -void convert_rgba_to_8bpp_rgb_111_dith (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal) +void evas_common_convert_rgba_to_8bpp_rgb_111_dith (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal) { DATA32 *src_ptr; DATA8 *dst_ptr; diff --git a/legacy/evas/src/lib/engines/common/evas_cpu.c b/legacy/evas/src/lib/engines/common/evas_cpu.c index 67da73fc45..e5b9884e23 100644 --- a/legacy/evas/src/lib/engines/common/evas_cpu.c +++ b/legacy/evas/src/lib/engines/common/evas_cpu.c @@ -5,12 +5,12 @@ #endif void -cpu_init(void) +evas_common_cpu_init(void) { } int -cpu_have_cpuid(void) +evas_common_cpu_have_cpuid(void) { #ifdef BUILD_MMX unsigned int have_cpu_id; @@ -24,7 +24,7 @@ cpu_have_cpuid(void) } void -cpu_can_do(int *mmx, int *sse, int *sse2) +evas_common_cpu_can_do(int *mmx, int *sse, int *sse2) { #ifdef BUILD_MMX #ifndef HARD_CODED_P3 @@ -62,7 +62,7 @@ cpu_can_do(int *mmx, int *sse, int *sse2) } # ifdef BUILD_MMX - have_cpu_id = cpu_have_cpuid(); + have_cpu_id = evas_common_cpu_have_cpuid(); if (have_cpu_id) { unsigned int cpu_id; @@ -85,13 +85,13 @@ cpu_can_do(int *mmx, int *sse, int *sse2) #ifdef BUILD_MMX void -cpu_end_opt(void) +evas_common_cpu_end_opt(void) { emms(); } #else void -cpu_end_opt(void) +evas_common_cpu_end_opt(void) { } #endif diff --git a/legacy/evas/src/lib/engines/common/evas_draw_main.c b/legacy/evas/src/lib/engines/common/evas_draw_main.c index 1d90483fdf..20b1e8d9e3 100644 --- a/legacy/evas/src/lib/engines/common/evas_draw_main.c +++ b/legacy/evas/src/lib/engines/common/evas_draw_main.c @@ -1,12 +1,12 @@ #include "evas_common.h" void -draw_init(void) +evas_common_draw_init(void) { } RGBA_Draw_Context * -draw_context_new(void) +evas_common_draw_context_new(void) { RGBA_Draw_Context *dc; @@ -15,13 +15,13 @@ draw_context_new(void) } void -draw_context_free(RGBA_Draw_Context *dc) +evas_common_draw_context_free(RGBA_Draw_Context *dc) { free(dc); } void -draw_context_clip_clip(RGBA_Draw_Context *dc, int x, int y, int w, int h) +evas_common_draw_context_clip_clip(RGBA_Draw_Context *dc, int x, int y, int w, int h) { if (dc->clip.use) { @@ -29,11 +29,11 @@ draw_context_clip_clip(RGBA_Draw_Context *dc, int x, int y, int w, int h) x, y, w, h); } else - draw_context_set_clip(dc, x, y, w, h); + evas_common_draw_context_set_clip(dc, x, y, w, h); } void -draw_context_set_clip(RGBA_Draw_Context *dc, int x, int y, int w, int h) +evas_common_draw_context_set_clip(RGBA_Draw_Context *dc, int x, int y, int w, int h) { dc->clip.use = 1; dc->clip.x = x; @@ -43,13 +43,13 @@ draw_context_set_clip(RGBA_Draw_Context *dc, int x, int y, int w, int h) } void -draw_context_unset_clip(RGBA_Draw_Context *dc) +evas_common_draw_context_unset_clip(RGBA_Draw_Context *dc) { dc->clip.use = 0; } void -draw_context_set_color(RGBA_Draw_Context *dc, int r, int g, int b, int a) +evas_common_draw_context_set_color(RGBA_Draw_Context *dc, int r, int g, int b, int a) { R_VAL(&(dc->col.col)) = (DATA8)r; G_VAL(&(dc->col.col)) = (DATA8)g; @@ -58,7 +58,7 @@ draw_context_set_color(RGBA_Draw_Context *dc, int r, int g, int b, int a) } void -draw_context_set_multiplier(RGBA_Draw_Context *dc, int r, int g, int b, int a) +evas_common_draw_context_set_multiplier(RGBA_Draw_Context *dc, int r, int g, int b, int a) { dc->mul.use = 1; dc->mod.use = 0; @@ -69,13 +69,13 @@ draw_context_set_multiplier(RGBA_Draw_Context *dc, int r, int g, int b, int a) } void -draw_context_unset_multiplier(RGBA_Draw_Context *dc) +evas_common_draw_context_unset_multiplier(RGBA_Draw_Context *dc) { dc->mul.use = 0; } void -draw_context_set_modifiers(RGBA_Draw_Context *dc, DATA8 *rmod, DATA8 *gmod, DATA8 *bmod, DATA8 *amod) +evas_common_draw_context_set_modifiers(RGBA_Draw_Context *dc, DATA8 *rmod, DATA8 *gmod, DATA8 *bmod, DATA8 *amod) { int i; @@ -104,13 +104,13 @@ draw_context_set_modifiers(RGBA_Draw_Context *dc, DATA8 *rmod, DATA8 *gmod, DATA } void -draw_context_ununset_modifiers(RGBA_Draw_Context *dc) +evas_common_draw_context_ununset_modifiers(RGBA_Draw_Context *dc) { dc->mod.use = 0; } void -draw_context_add_cutout(RGBA_Draw_Context *dc, int x, int y, int w, int h) +evas_common_draw_context_add_cutout(RGBA_Draw_Context *dc, int x, int y, int w, int h) { Cutout_Rect *r; @@ -123,14 +123,14 @@ draw_context_add_cutout(RGBA_Draw_Context *dc, int x, int y, int w, int h) } void -draw_context_clear_cutouts(RGBA_Draw_Context *dc) +evas_common_draw_context_clear_cutouts(RGBA_Draw_Context *dc) { - draw_context_apply_free_cutouts(dc->cutout.rects); + evas_common_draw_context_apply_free_cutouts(dc->cutout.rects); dc->cutout.rects = NULL; } Cutout_Rect * -draw_context_apply_cutouts(RGBA_Draw_Context *dc) +evas_common_draw_context_apply_cutouts(RGBA_Draw_Context *dc) { Cutout_Rect *r, *rects; Evas_Object_List *l; @@ -146,13 +146,13 @@ draw_context_apply_cutouts(RGBA_Draw_Context *dc) for (l = (Evas_Object_List *)dc->cutout.rects; l; l = l->next) { r = (Cutout_Rect *)l; - rects = draw_context_cutouts_split(rects, r); + rects = evas_common_draw_context_cutouts_split(rects, r); } return rects; } void -draw_context_apply_free_cutouts(Cutout_Rect *rects) +evas_common_draw_context_apply_free_cutouts(Cutout_Rect *rects) { while (rects) { @@ -165,7 +165,7 @@ draw_context_apply_free_cutouts(Cutout_Rect *rects) } Cutout_Rect * -draw_context_cutouts_split(Cutout_Rect *in, Cutout_Rect *split) +evas_common_draw_context_cutouts_split(Cutout_Rect *in, Cutout_Rect *split) { /* multiple rect in, multiple out */ Cutout_Rect *out; @@ -177,7 +177,7 @@ draw_context_cutouts_split(Cutout_Rect *in, Cutout_Rect *split) Cutout_Rect *r; r = (Cutout_Rect *)l; - r = draw_context_cutout_split(r, split); + r = evas_common_draw_context_cutout_split(r, split); while (r) { Cutout_Rect *r2; @@ -187,12 +187,12 @@ draw_context_cutouts_split(Cutout_Rect *in, Cutout_Rect *split) out = evas_object_list_append(out, r2); } } - draw_context_apply_free_cutouts(in); + evas_common_draw_context_apply_free_cutouts(in); return out; } Cutout_Rect * -draw_context_cutout_split(Cutout_Rect *in, Cutout_Rect *split) +evas_common_draw_context_cutout_split(Cutout_Rect *in, Cutout_Rect *split) { /* 1 input rect, multiple out */ Cutout_Rect *out; @@ -484,18 +484,18 @@ draw_context_cutout_split(Cutout_Rect *in, Cutout_Rect *split) } Gfx_Func_Blend_Src_Dst -draw_func_blend_get(RGBA_Image *src, RGBA_Image *dst, int pixels) +evas_common_draw_func_blend_get(RGBA_Image *src, RGBA_Image *dst, int pixels) { #ifdef BUILD_MMX int mmx, sse, sse2; - cpu_can_do(&mmx, &sse, &sse2); + evas_common_cpu_can_do(&mmx, &sse, &sse2); #endif if (src->flags & RGBA_IMAGE_HAS_ALPHA) { if (dst->flags & RGBA_IMAGE_HAS_ALPHA) { - return blend_pixels_rgba_to_rgba_c; + return evas_common_blend_pixels_rgba_to_rgba_c; } else { @@ -503,13 +503,13 @@ draw_func_blend_get(RGBA_Image *src, RGBA_Image *dst, int pixels) # ifdef BUILD_C if (mmx) # endif - return blend_pixels_rgba_to_rgb_mmx; + return evas_common_blend_pixels_rgba_to_rgb_mmx; # ifdef BUILD_C else # endif #endif #ifdef BUILD_C - return blend_pixels_rgba_to_rgb_c; + return evas_common_blend_pixels_rgba_to_rgb_c; #endif } } @@ -517,13 +517,13 @@ draw_func_blend_get(RGBA_Image *src, RGBA_Image *dst, int pixels) { if (dst->flags & RGBA_IMAGE_HAS_ALPHA) { - return copy_pixels_rgb_to_rgba_c; + return evas_common_copy_pixels_rgb_to_rgba_c; } else { #ifdef BUILD_SSE if ((sse) && (pixels > 256 * 256)) - return copy_pixels_rgba_to_rgba_sse; + return evas_common_copy_pixels_rgba_to_rgba_sse; # ifdef BUILD_MMX else # endif @@ -532,45 +532,45 @@ draw_func_blend_get(RGBA_Image *src, RGBA_Image *dst, int pixels) # ifdef BUILD_C if (mmx) # endif - return copy_pixels_rgba_to_rgba_mmx; + return evas_common_copy_pixels_rgba_to_rgba_mmx; # ifdef BUILD_C else # endif #endif #ifdef BUILD_C - return copy_pixels_rgba_to_rgba_c; + return evas_common_copy_pixels_rgba_to_rgba_c; #endif } } - return blend_pixels_rgba_to_rgba_c; + return evas_common_blend_pixels_rgba_to_rgba_c; pixels = 0; } Gfx_Func_Blend_Color_Dst -draw_func_blend_color_get(DATA32 src, RGBA_Image *dst, int pixels) +evas_common_draw_func_blend_color_get(DATA32 src, RGBA_Image *dst, int pixels) { #ifdef BUILD_MMX int mmx, sse, sse2; - cpu_can_do(&mmx, &sse, &sse2); + evas_common_cpu_can_do(&mmx, &sse, &sse2); #endif if (A_VAL(&src) != 0xff) { if (dst->flags & RGBA_IMAGE_HAS_ALPHA) { - return blend_color_rgba_to_rgba_c; + return evas_common_blend_color_rgba_to_rgba_c; } else { #ifdef BUILD_MMX if (mmx) - return blend_color_rgba_to_rgb_mmx; + return evas_common_blend_color_rgba_to_rgb_mmx; #endif #ifdef BUILD_C # ifdef BUILD_MMX else # endif - return blend_color_rgba_to_rgb_c; + return evas_common_blend_color_rgba_to_rgb_c; #endif } } @@ -578,92 +578,92 @@ draw_func_blend_color_get(DATA32 src, RGBA_Image *dst, int pixels) { if (dst->flags & RGBA_IMAGE_HAS_ALPHA) { - return copy_color_rgb_to_rgba_c; + return evas_common_copy_color_rgb_to_rgba_c; } else { #ifdef BUILD_SSE if ((sse) && (pixels > 256 * 256)) - return copy_color_rgba_to_rgba_sse; + return evas_common_copy_color_rgba_to_rgba_sse; #endif #ifdef BUILD_MMX # ifdef BUILD_SSE else # endif if (mmx) - return copy_color_rgba_to_rgba_mmx; + return evas_common_copy_color_rgba_to_rgba_mmx; #endif #ifdef BUILD_C # ifdef BUILD_MMX else # endif - return copy_color_rgba_to_rgba_c; + return evas_common_copy_color_rgba_to_rgba_c; #endif } } - return blend_color_rgba_to_rgba_c; + return evas_common_blend_color_rgba_to_rgba_c; pixels = 0; } Gfx_Func_Blend_Src_Cmod_Dst -draw_func_blend_cmod_get(RGBA_Image *src, RGBA_Image *dst, int pixels) +evas_common_draw_func_blend_cmod_get(RGBA_Image *src, RGBA_Image *dst, int pixels) { #ifdef BUILD_MMX int mmx, sse, sse2; - cpu_can_do(&mmx, &sse, &sse2); + evas_common_cpu_can_do(&mmx, &sse, &sse2); #endif if (src->flags & RGBA_IMAGE_HAS_ALPHA) { if (dst->flags & RGBA_IMAGE_HAS_ALPHA) { - return blend_pixels_cmod_rgba_to_rgba_c; + return evas_common_blend_pixels_cmod_rgba_to_rgba_c; } else { - return blend_pixels_cmod_rgba_to_rgb_c; + return evas_common_blend_pixels_cmod_rgba_to_rgb_c; } } else { if (dst->flags & RGBA_IMAGE_HAS_ALPHA) { - return copy_pixels_cmod_rgb_to_rgba_c; + return evas_common_copy_pixels_cmod_rgb_to_rgba_c; } else { - return copy_pixels_cmod_rgba_to_rgba_c; + return evas_common_copy_pixels_cmod_rgba_to_rgba_c; } } - return blend_pixels_cmod_rgba_to_rgba_c; + return evas_common_blend_pixels_cmod_rgba_to_rgba_c; pixels = 0; } Gfx_Func_Blend_Src_Mul_Dst -draw_func_blend_mul_get(RGBA_Image *src, DATA32 col, RGBA_Image *dst, int pixels) +evas_common_draw_func_blend_mul_get(RGBA_Image *src, DATA32 col, RGBA_Image *dst, int pixels) { #ifdef BUILD_MMX int mmx, sse, sse2; - cpu_can_do(&mmx, &sse, &sse2); + evas_common_cpu_can_do(&mmx, &sse, &sse2); #endif if (src->flags & RGBA_IMAGE_HAS_ALPHA) { if (dst->flags & RGBA_IMAGE_HAS_ALPHA) { - return blend_pixels_mul_color_rgba_to_rgba_c; + return evas_common_blend_pixels_mul_color_rgba_to_rgba_c; } else { #ifdef BUILD_MMX if (mmx) - return blend_pixels_mul_color_rgba_to_rgb_mmx; + return evas_common_blend_pixels_mul_color_rgba_to_rgb_mmx; #endif #ifdef BUILD_C # ifdef BUILD_MMX else # endif - return blend_pixels_mul_color_rgba_to_rgb_c; + return evas_common_blend_pixels_mul_color_rgba_to_rgb_c; #endif } } @@ -671,109 +671,109 @@ draw_func_blend_mul_get(RGBA_Image *src, DATA32 col, RGBA_Image *dst, int pixels { if (dst->flags & RGBA_IMAGE_HAS_ALPHA) { - return blend_pixels_mul_color_rgba_to_rgba_c; + return evas_common_blend_pixels_mul_color_rgba_to_rgba_c; } else { #ifdef BUILD_MMX if (mmx) - return blend_pixels_mul_color_rgba_to_rgb_mmx; + return evas_common_blend_pixels_mul_color_rgba_to_rgb_mmx; #endif #ifdef BUILD_C # ifdef BUILD_MMX else # endif - return blend_pixels_mul_color_rgba_to_rgb_c; + return evas_common_blend_pixels_mul_color_rgba_to_rgb_c; #endif } } - return blend_pixels_mul_color_rgba_to_rgba_c; + return evas_common_blend_pixels_mul_color_rgba_to_rgba_c; col = 0; pixels = 0; } Gfx_Func_Blend_Src_Alpha_Mul_Dst -draw_func_blend_alpha_get(RGBA_Image *dst) +evas_common_draw_func_blend_alpha_get(RGBA_Image *dst) { #ifdef BUILD_MMX int mmx, sse, sse2; - cpu_can_do(&mmx, &sse, &sse2); + evas_common_cpu_can_do(&mmx, &sse, &sse2); #endif if (dst->flags & RGBA_IMAGE_HAS_ALPHA) { - return blend_alpha_color_rgba_to_rgba_c; + return evas_common_blend_alpha_color_rgba_to_rgba_c; } else { #ifdef BUILD_MMX if (mmx) - return blend_alpha_color_rgba_to_rgb_mmx; + return evas_common_blend_alpha_color_rgba_to_rgb_mmx; #endif #ifdef BUILD_C # ifdef BUILD_MMX else # endif - return blend_alpha_color_rgba_to_rgb_c; + return evas_common_blend_alpha_color_rgba_to_rgb_c; #endif } #ifdef BUILD_C - return blend_alpha_color_rgba_to_rgba_c; + return evas_common_blend_alpha_color_rgba_to_rgba_c; #else return NULL; #endif } Gfx_Func_Blend_Src_Dst -draw_func_copy_get(int pixels, int reverse) +evas_common_draw_func_copy_get(int pixels, int reverse) { #ifdef BUILD_MMX int mmx, sse, sse2; - cpu_can_do(&mmx, &sse, &sse2); + evas_common_cpu_can_do(&mmx, &sse, &sse2); #endif if (reverse) { #ifdef BUILD_SSE if ((sse) && (pixels > 256 * 256)) - return copy_pixels_rev_rgba_to_rgba_sse; + return evas_common_copy_pixels_rev_rgba_to_rgba_sse; #endif #ifdef BUILD_MMX # ifdef BUILD_SSE else # endif if (mmx) - return copy_pixels_rev_rgba_to_rgba_mmx; + return evas_common_copy_pixels_rev_rgba_to_rgba_mmx; #endif #ifdef BUILD_C # ifdef BUILD_MMX else # endif - return copy_pixels_rev_rgba_to_rgba_c; + return evas_common_copy_pixels_rev_rgba_to_rgba_c; #endif } else { #ifdef BUILD_SSE if ((sse) && (pixels > 256 * 256)) - return copy_pixels_rgba_to_rgba_sse; + return evas_common_copy_pixels_rgba_to_rgba_sse; #endif #ifdef BUILD_MMX # ifdef BUILD_SSE else # endif if (mmx) - return copy_pixels_rgba_to_rgba_mmx; + return evas_common_copy_pixels_rgba_to_rgba_mmx; #endif #ifdef BUILD_C # ifdef BUILD_MMX else # endif - return copy_pixels_rgba_to_rgba_c; + return evas_common_copy_pixels_rgba_to_rgba_c; #endif } #ifdef BUILD_C - return copy_pixels_rgba_to_rgba_c; + return evas_common_copy_pixels_rgba_to_rgba_c; #else return NULL; #endif diff --git a/legacy/evas/src/lib/engines/common/evas_font_draw.c b/legacy/evas/src/lib/engines/common/evas_font_draw.c index 0281fa288a..8592037258 100644 --- a/legacy/evas/src/lib/engines/common/evas_font_draw.c +++ b/legacy/evas/src/lib/engines/common/evas_font_draw.c @@ -3,7 +3,7 @@ extern FT_Library ft_lib; RGBA_Font_Glyph * -font_cache_glyph_get(RGBA_Font *fn, FT_UInt index) +evas_common_font_cache_glyph_get(RGBA_Font *fn, FT_UInt index) { RGBA_Font_Glyph *fg; char key[6]; @@ -49,7 +49,7 @@ font_cache_glyph_get(RGBA_Font *fn, FT_UInt index) } void -font_draw(RGBA_Image *dst, RGBA_Draw_Context *dc, RGBA_Font *fn, int x, int y, const char *text) +evas_common_font_draw(RGBA_Image *dst, RGBA_Draw_Context *dc, RGBA_Font *fn, int x, int y, const char *text) { int use_kerning; int pen_x, pen_y; @@ -93,7 +93,7 @@ font_draw(RGBA_Image *dst, RGBA_Draw_Context *dc, RGBA_Font *fn, int x, int y, c pen_y = y << 8; use_kerning = FT_HAS_KERNING(fn->ft.face); prev_index = 0; - func = draw_func_blend_alpha_get(dst); + func = evas_common_draw_func_blend_alpha_get(dst); for (chr = 0; text[chr];) { FT_UInt index; @@ -101,7 +101,7 @@ font_draw(RGBA_Image *dst, RGBA_Draw_Context *dc, RGBA_Font *fn, int x, int y, c int chr_x, chr_y; int gl; - gl = font_utf8_get_next((unsigned char *)text, &chr); + gl = evas_common_font_utf8_get_next((unsigned char *)text, &chr); if (gl == 0) break; index = FT_Get_Char_Index(fn->ft.face, gl); if ((use_kerning) && (prev_index) && (index)) @@ -112,7 +112,7 @@ font_draw(RGBA_Image *dst, RGBA_Draw_Context *dc, RGBA_Font *fn, int x, int y, c ft_kerning_default, &delta); pen_x += delta.x << 2; } - fg = font_cache_glyph_get(fn, index); + fg = evas_common_font_cache_glyph_get(fn, index); if (!fg) continue; chr_x = (pen_x + (fg->glyph_out->left << 8)) >> 8; diff --git a/legacy/evas/src/lib/engines/common/evas_font_load.c b/legacy/evas/src/lib/engines/common/evas_font_load.c index 4c9a31d174..9c25efd7c1 100644 --- a/legacy/evas/src/lib/engines/common/evas_font_load.c +++ b/legacy/evas/src/lib/engines/common/evas_font_load.c @@ -14,13 +14,13 @@ static int font_flush_free_glyph_cb(Evas_Hash *hash, const char *key, void *data /* face (if applicable) */ RGBA_Font * -font_load(const char *name, int size) +evas_common_font_load(const char *name, int size) { int error; RGBA_Font *fn; char *file; - fn = font_find(name, size); + fn = evas_common_font_find(name, size); if (fn) return fn; fn = malloc(sizeof(RGBA_Font)); @@ -116,13 +116,13 @@ font_load(const char *name, int size) } void -font_free(RGBA_Font *fn) +evas_common_font_free(RGBA_Font *fn) { fn->references--; if (fn->references == 0) { - font_modify_cache_by(fn, 1); - font_flush(); + evas_common_font_modify_cache_by(fn, 1); + evas_common_font_flush(); } } @@ -143,7 +143,7 @@ font_modify_cache_cb(Evas_Hash *hash, const char *key, void *data, void *fdata) } void -font_modify_cache_by(RGBA_Font *fn, int dir) +evas_common_font_modify_cache_by(RGBA_Font *fn, int dir) { int sz_name = 0, sz_file = 0, sz_hash = 0; @@ -156,23 +156,23 @@ font_modify_cache_by(RGBA_Font *fn, int dir) } int -font_cache_get(void) +evas_common_font_cache_get(void) { return font_cache; } void -font_cache_set(int size) +evas_common_font_cache_set(int size) { font_cache = size; - font_flush(); + evas_common_font_flush(); } void -font_flush(void) +evas_common_font_flush(void) { if (font_cache_usage < font_cache) return; - while (font_cache_usage > font_cache) font_flush_last(); + while (font_cache_usage > font_cache) evas_common_font_flush_last(); } static int @@ -190,7 +190,7 @@ font_flush_free_glyph_cb(Evas_Hash *hash, const char *key, void *data, void *fda } void -font_flush_last(void) +evas_common_font_flush_last(void) { Evas_Object_List *l; RGBA_Font *fn = NULL; @@ -205,7 +205,7 @@ font_flush_last(void) if (!fn) return; fonts = evas_object_list_remove(fonts, fn); - font_modify_cache_by(fn, -1); + evas_common_font_modify_cache_by(fn, -1); evas_hash_foreach(fn->glyphs, font_flush_free_glyph_cb, NULL); evas_hash_free(fn->glyphs); @@ -217,7 +217,7 @@ font_flush_last(void) } RGBA_Font * -font_find(const char *name, int size) +evas_common_font_find(const char *name, int size) { Evas_Object_List *l; @@ -228,7 +228,7 @@ font_find(const char *name, int size) fn = (RGBA_Font *)l; if ((fn->size == size) && (!strcmp(name, fn->name))) { - if (fn->references == 0) font_modify_cache_by(fn, -1); + if (fn->references == 0) evas_common_font_modify_cache_by(fn, -1); fn->references++; fonts = evas_object_list_remove(fonts, fn); fonts = evas_object_list_prepend(fonts, fn); diff --git a/legacy/evas/src/lib/engines/common/evas_font_main.c b/legacy/evas/src/lib/engines/common/evas_font_main.c index 019e20c355..5281fdf295 100644 --- a/legacy/evas/src/lib/engines/common/evas_font_main.c +++ b/legacy/evas/src/lib/engines/common/evas_font_main.c @@ -3,7 +3,7 @@ FT_Library ft_lib; void -font_init(void) +evas_common_font_init(void) { static int initialised = 0; int error; @@ -15,7 +15,7 @@ font_init(void) } int -font_ascent_get(RGBA_Font *fn) +evas_common_font_ascent_get(RGBA_Font *fn) { int val; int ret; @@ -27,7 +27,7 @@ font_ascent_get(RGBA_Font *fn) } int -font_descent_get(RGBA_Font *fn) +evas_common_font_descent_get(RGBA_Font *fn) { int val; int ret; @@ -39,7 +39,7 @@ font_descent_get(RGBA_Font *fn) } int -font_max_ascent_get(RGBA_Font *fn) +evas_common_font_max_ascent_get(RGBA_Font *fn) { int val; int ret; @@ -51,7 +51,7 @@ font_max_ascent_get(RGBA_Font *fn) } int -font_max_descent_get(RGBA_Font *fn) +evas_common_font_max_descent_get(RGBA_Font *fn) { int val; int ret; @@ -63,7 +63,7 @@ font_max_descent_get(RGBA_Font *fn) } int -font_get_line_advance(RGBA_Font *fn) +evas_common_font_get_line_advance(RGBA_Font *fn) { int val; int ret; @@ -75,7 +75,7 @@ font_get_line_advance(RGBA_Font *fn) } int -font_utf8_get_next(unsigned char *buf, int *iindex) +evas_common_font_utf8_get_next(unsigned char *buf, int *iindex) { /* Reads UTF8 bytes from @buf, starting at *@index and returns * the code point of the next valid code point. @index is diff --git a/legacy/evas/src/lib/engines/common/evas_font_query.c b/legacy/evas/src/lib/engines/common/evas_font_query.c index 918992905d..72ec516e15 100644 --- a/legacy/evas/src/lib/engines/common/evas_font_query.c +++ b/legacy/evas/src/lib/engines/common/evas_font_query.c @@ -4,7 +4,7 @@ extern FT_Library ft_lib; /* string extents */ void -font_query_size(RGBA_Font *fn, const char *text, int *w, int *h) +evas_common_font_query_size(RGBA_Font *fn, const char *text, int *w, int *h) { int use_kerning; int pen_x, pen_y; @@ -25,7 +25,7 @@ font_query_size(RGBA_Font *fn, const char *text, int *w, int *h) int chr_x, chr_y, chr_w; int gl; - gl = font_utf8_get_next((unsigned char *)text, &chr); + gl = evas_common_font_utf8_get_next((unsigned char *)text, &chr); if (gl == 0) break; index = FT_Get_Char_Index(fn->ft.face, gl); if ((use_kerning) && (prev_index) && (index)) @@ -36,7 +36,7 @@ font_query_size(RGBA_Font *fn, const char *text, int *w, int *h) ft_kerning_default, &delta); pen_x += delta.x << 2; } - fg = font_cache_glyph_get(fn, index); + fg = evas_common_font_cache_glyph_get(fn, index); if (!fg) continue; chr_x = (pen_x >> 8) + fg->glyph_out->left; @@ -50,12 +50,12 @@ font_query_size(RGBA_Font *fn, const char *text, int *w, int *h) prev_index = index; } if (w) *w = end_x - start_x; - if (h) *h = font_max_ascent_get(fn) + font_max_descent_get(fn); + if (h) *h = evas_common_font_max_ascent_get(fn) + evas_common_font_max_descent_get(fn); } /* text x inset */ int -font_query_inset(RGBA_Font *fn, const char *text) +evas_common_font_query_inset(RGBA_Font *fn, const char *text) { FT_UInt index; RGBA_Font_Glyph *fg; @@ -64,17 +64,17 @@ font_query_inset(RGBA_Font *fn, const char *text) chr = 0; if (!text[0]) return 0; - gl = font_utf8_get_next((unsigned char *)text, &chr); + gl = evas_common_font_utf8_get_next((unsigned char *)text, &chr); if (gl == 0) return 0; index = FT_Get_Char_Index(fn->ft.face, gl); - fg = font_cache_glyph_get(fn, index); + fg = evas_common_font_cache_glyph_get(fn, index); if (!fg) return 0; return fg->glyph_out->left; } /* h & v advance */ void -font_query_advance(RGBA_Font *fn, const char *text, int *h_adv, int *v_adv) +evas_common_font_query_advance(RGBA_Font *fn, const char *text, int *h_adv, int *v_adv) { int use_kerning; int pen_x, pen_y; @@ -94,7 +94,7 @@ font_query_advance(RGBA_Font *fn, const char *text, int *h_adv, int *v_adv) int chr_x, chr_y, chr_w; int gl; - gl = font_utf8_get_next((unsigned char *)text, &chr); + gl = evas_common_font_utf8_get_next((unsigned char *)text, &chr); if (gl == 0) break; index = FT_Get_Char_Index(fn->ft.face, gl); if ((use_kerning) && (prev_index) && (index)) @@ -105,7 +105,7 @@ font_query_advance(RGBA_Font *fn, const char *text, int *h_adv, int *v_adv) ft_kerning_default, &delta); pen_x += delta.x << 2; } - fg = font_cache_glyph_get(fn, index); + fg = evas_common_font_cache_glyph_get(fn, index); if (!fg) continue; chr_x = (pen_x >> 8) + fg->glyph_out->left; @@ -115,13 +115,13 @@ font_query_advance(RGBA_Font *fn, const char *text, int *h_adv, int *v_adv) pen_x += fg->glyph->advance.x >> 8; prev_index = index; } - if (v_adv) *v_adv = font_get_line_advance(fn); + if (v_adv) *v_adv = evas_common_font_get_line_advance(fn); if (h_adv) *h_adv = (pen_x >> 8) - start_x; } /* x y w h for char at char pos */ int -font_query_char_coords(RGBA_Font *fn, const char *text, int pos, int *cx, int *cy, int *cw, int *ch) +evas_common_font_query_char_coords(RGBA_Font *fn, const char *text, int pos, int *cx, int *cy, int *cw, int *ch) { int use_kerning; int pen_x, pen_y; @@ -139,7 +139,7 @@ font_query_char_coords(RGBA_Font *fn, const char *text, int pos, int *cx, int *c int chr_x, chr_y, chr_w; int gl; - gl = font_utf8_get_next((unsigned char *)text, &chr); + gl = evas_common_font_utf8_get_next((unsigned char *)text, &chr); if (gl == 0) break; index = FT_Get_Char_Index(fn->ft.face, gl); if ((use_kerning) && (prev_index) && (index)) @@ -150,7 +150,7 @@ font_query_char_coords(RGBA_Font *fn, const char *text, int pos, int *cx, int *c ft_kerning_default, &delta); pen_x += delta.x << 2; } - fg = font_cache_glyph_get(fn, index); + fg = evas_common_font_cache_glyph_get(fn, index); if (!fg) continue; chr_x = (pen_x >> 8) + fg->glyph_out->left; @@ -160,9 +160,9 @@ font_query_char_coords(RGBA_Font *fn, const char *text, int pos, int *cx, int *c if (gl == pos) { if (cx) *cx = chr_x; - if (cy) *cy = - font_max_ascent_get(fn); + if (cy) *cy = - evas_common_font_max_ascent_get(fn); if (cw) *cw = chr_w; - if (ch) *ch = font_max_ascent_get(fn) + font_max_descent_get(fn); + if (ch) *ch = evas_common_font_max_ascent_get(fn) + evas_common_font_max_descent_get(fn); return 1; } pen_x += fg->glyph->advance.x >> 8; @@ -173,7 +173,7 @@ font_query_char_coords(RGBA_Font *fn, const char *text, int pos, int *cx, int *c /* char pos of text at xy pos */ int -font_query_text_at_pos(RGBA_Font *fn, const char *text, int x, int y, int *cx, int *cy, int *cw, int *ch) +evas_common_font_query_text_at_pos(RGBA_Font *fn, const char *text, int x, int y, int *cx, int *cy, int *cw, int *ch) { int use_kerning; int pen_x, pen_y; @@ -191,7 +191,7 @@ font_query_text_at_pos(RGBA_Font *fn, const char *text, int x, int y, int *cx, i int chr_x, chr_y, chr_w; int gl; - gl = font_utf8_get_next((unsigned char *)text, &chr); + gl = evas_common_font_utf8_get_next((unsigned char *)text, &chr); if (gl == 0) break; index = FT_Get_Char_Index(fn->ft.face, gl); if ((use_kerning) && (prev_index) && (index)) @@ -202,7 +202,7 @@ font_query_text_at_pos(RGBA_Font *fn, const char *text, int x, int y, int *cx, i ft_kerning_default, &delta); pen_x += delta.x << 6; } - fg = font_cache_glyph_get(fn, index); + fg = evas_common_font_cache_glyph_get(fn, index); if (!fg) continue; chr_x = (pen_x >> 8) + fg->glyph_out->left; @@ -210,13 +210,13 @@ font_query_text_at_pos(RGBA_Font *fn, const char *text, int x, int y, int *cx, i chr_w = fg->glyph_out->bitmap.width; if ((x >= chr_x) && (x < (chr_x + chr_w)) && - (y > - font_max_ascent_get(fn)) && - (y < font_max_descent_get(fn))) + (y > - evas_common_font_max_ascent_get(fn)) && + (y < evas_common_font_max_descent_get(fn))) { if (cx) *cx = chr_x; - if (cy) *cy = - font_max_ascent_get(fn); + if (cy) *cy = - evas_common_font_max_ascent_get(fn); if (cw) *cw = chr_w; - if (ch) *ch = font_max_ascent_get(fn) + font_max_descent_get(fn); + if (ch) *ch = evas_common_font_max_ascent_get(fn) + evas_common_font_max_descent_get(fn); return gl; } pen_x += fg->glyph->advance.x >> 8; diff --git a/legacy/evas/src/lib/engines/common/evas_gradient_main.c b/legacy/evas/src/lib/engines/common/evas_gradient_main.c index cc6e24cbf3..e3eb15aff1 100644 --- a/legacy/evas/src/lib/engines/common/evas_gradient_main.c +++ b/legacy/evas/src/lib/engines/common/evas_gradient_main.c @@ -2,12 +2,12 @@ #include void -gradient_init(void) +evas_common_gradient_init(void) { } RGBA_Gradient * -gradient_new(void) +evas_common_gradient_new(void) { RGBA_Gradient *gr; @@ -16,14 +16,14 @@ gradient_new(void) } void -gradient_free(RGBA_Gradient *gr) +evas_common_gradient_free(RGBA_Gradient *gr) { - gradient_colors_clear(gr); + evas_common_gradient_colors_clear(gr); free(gr); } void -gradient_colors_clear(RGBA_Gradient *gr) +evas_common_gradient_colors_clear(RGBA_Gradient *gr) { if (gr->colors) { @@ -40,7 +40,7 @@ gradient_colors_clear(RGBA_Gradient *gr) } void -gradient_color_add(RGBA_Gradient *gr, int r, int g, int b, int a, int dist) +evas_common_gradient_color_add(RGBA_Gradient *gr, int r, int g, int b, int a, int dist) { RGBA_Gradient_Color *gc; @@ -54,7 +54,7 @@ gradient_color_add(RGBA_Gradient *gr, int r, int g, int b, int a, int dist) } void -gradient_draw(RGBA_Image *dst, RGBA_Draw_Context *dc, int x, int y, int w, int h, RGBA_Gradient *gr, double angle) +evas_common_gradient_draw(RGBA_Image *dst, RGBA_Draw_Context *dc, int x, int y, int w, int h, RGBA_Gradient *gr, double angle) { Gfx_Func_Blend_Src_Dst func; int yy, xx, i, len; @@ -120,14 +120,14 @@ gradient_draw(RGBA_Image *dst, RGBA_Draw_Context *dc, int x, int y, int w, int h if (o_w > o_h) len = o_w * 16; else len = o_h * 16; - map = gradient_map(gr, dc, len); + map = evas_common_gradient_map(gr, dc, len); if (!map) { free(hlut); free(vlut); return; } - tmp = image_create(w, 1); + tmp = evas_common_image_create(w, 1); if (!tmp) { free(hlut); @@ -137,7 +137,7 @@ gradient_draw(RGBA_Image *dst, RGBA_Draw_Context *dc, int x, int y, int w, int h } tmp->flags |= RGBA_IMAGE_HAS_ALPHA; - cpu_end_opt(); + evas_common_cpu_end_opt(); xx = (int)(32 * sin(((angle + 180) * 2 * 3.141592654) / 360)); yy = -(int)(32 * cos(((angle + 180) * 2 * 3.141592654) / 360)); divw = ((o_w - 1) << 5); @@ -163,7 +163,7 @@ gradient_draw(RGBA_Image *dst, RGBA_Draw_Context *dc, int x, int y, int w, int h } buf = tmp->image->data; - func = draw_func_blend_get(tmp, dst, w); + func = evas_common_draw_func_blend_get(tmp, dst, w); ptr = dst->image->data + (y * dst->image->w) + x; for (yy = 0; yy < h; yy++) { @@ -182,11 +182,11 @@ gradient_draw(RGBA_Image *dst, RGBA_Draw_Context *dc, int x, int y, int w, int h free(hlut); free(vlut); free(map); - image_free(tmp); + evas_common_image_free(tmp); } DATA32 * -gradient_map(RGBA_Gradient *gr, RGBA_Draw_Context *dc, int len) +evas_common_gradient_map(RGBA_Gradient *gr, RGBA_Draw_Context *dc, int len) { DATA32 *map, *pmap, v, vv; Evas_Object_List *l; diff --git a/legacy/evas/src/lib/engines/common/evas_image_load.c b/legacy/evas/src/lib/engines/common/evas_image_load.c index bc69045d14..de9ad83295 100644 --- a/legacy/evas/src/lib/engines/common/evas_image_load.c +++ b/legacy/evas/src/lib/engines/common/evas_image_load.c @@ -83,7 +83,7 @@ load_image_file_head_png(RGBA_Image *im, const char *file, const char *key) (png_uint_32 *) (&h32), &bit_depth, &color_type, &interlace_type, NULL, NULL); if (!im->image) - im->image = image_surface_new(); + im->image = evas_common_image_surface_new(); if (!im->image) { png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp) NULL); @@ -188,10 +188,10 @@ load_image_file_data_png(RGBA_Image *im, const char *file, const char *key) /* pack all pixels to byte boundaires */ png_set_packing(png_ptr); if (png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS)) png_set_expand(png_ptr); - image_surface_alloc(im->image); + evas_common_image_surface_alloc(im->image); if (!im->image->data) { - image_surface_free(im->image); + evas_common_image_surface_free(im->image); png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp) NULL); fclose(f); return -1; @@ -200,7 +200,7 @@ load_image_file_data_png(RGBA_Image *im, const char *file, const char *key) if (!lines) { - image_surface_free(im->image); + evas_common_image_surface_free(im->image); png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp) NULL); fclose(f); return -1; @@ -295,7 +295,7 @@ load_image_file_head_jpeg_internal(RGBA_Image *im, FILE *f) /* head decoding */ if (!im->image) - im->image = image_surface_new(); + im->image = evas_common_image_surface_new(); if (!im->image) { jpeg_destroy_decompress(&cinfo); @@ -353,7 +353,7 @@ load_image_file_data_jpeg_internal(RGBA_Image *im, FILE *f) jpeg_destroy_decompress(&cinfo); return -1; } - image_surface_alloc(im->image); + evas_common_image_surface_alloc(im->image); if (!im->image->data) { free(data); @@ -667,7 +667,7 @@ load_image_file_head_eet(RGBA_Image *im, const char *file, const char *key) } if (alpha) im->flags |= RGBA_IMAGE_HAS_ALPHA; if (!im->image) - im->image = image_surface_new(); + im->image = evas_common_image_surface_new(); if (!im->image) { free(ret); @@ -798,7 +798,7 @@ load_image_file_data_eet(RGBA_Image *im, const char *file, const char *key) } if (alpha) im->flags |= RGBA_IMAGE_HAS_ALPHA; if (!im->image) - im->image = image_surface_new(); + im->image = evas_common_image_surface_new(); if (!im->image) { free(ret); @@ -808,7 +808,7 @@ load_image_file_data_eet(RGBA_Image *im, const char *file, const char *key) im->image->w = w; im->image->h = h; body = &(ret[8]); - image_surface_alloc(im->image); + evas_common_image_surface_alloc(im->image); if (!im->image->data) { free(ret); @@ -907,7 +907,7 @@ load_image_file_head_edb(RGBA_Image *im, const char *file, const char *key) } if (alpha) im->flags |= RGBA_IMAGE_HAS_ALPHA; if (!im->image) - im->image = image_surface_new(); + im->image = evas_common_image_surface_new(); if (!im->image) { free(ret); @@ -978,7 +978,7 @@ load_image_file_data_edb(RGBA_Image *im, const char *file, const char *key) } if (alpha) im->flags |= RGBA_IMAGE_HAS_ALPHA; if (!im->image) - im->image = image_surface_new(); + im->image = evas_common_image_surface_new(); if (!im->image) { free(ret); @@ -988,7 +988,7 @@ load_image_file_data_edb(RGBA_Image *im, const char *file, const char *key) im->image->w = w; im->image->h = h; body = &(ret[8]); - image_surface_alloc(im->image); + evas_common_image_surface_alloc(im->image); if (!im->image->data) { free(ret); @@ -1046,20 +1046,20 @@ load_image_file_data_template(RGBA_Image *im, const char *file, const char *key) #endif RGBA_Image * -load_image_from_file(const char *file, const char *key) +evas_common_load_image_from_file(const char *file, const char *key) { RGBA_Image *im; int ok; DATA64 mod_time; mod_time = evas_file_modified_time(file); - im = image_find(file, key, mod_time); + im = evas_common_image_find(file, key, mod_time); if (im) { - image_ref(im); + evas_common_image_ref(im); return im; } - im = image_new(); + im = evas_common_image_new(); if (!im) return NULL; ok = -1; #ifdef BUILD_LOADER_PNG @@ -1092,7 +1092,7 @@ load_image_from_file(const char *file, const char *key) #endif if (ok == -1) { - image_free(im); + evas_common_image_free(im); return NULL; } im->timestamp = mod_time; @@ -1100,12 +1100,12 @@ load_image_from_file(const char *file, const char *key) im->info.file = strdup(file); if (key) im->info.key = strdup(key); - image_ref(im); + evas_common_image_ref(im); return im; } void -load_image_data_from_file(RGBA_Image *im) +evas_common_load_image_data_from_file(RGBA_Image *im) { int ok; @@ -1129,7 +1129,7 @@ load_image_data_from_file(RGBA_Image *im) #endif if (ok == -1) { - image_surface_alloc(im->image); + evas_common_image_surface_alloc(im->image); if (!im->image->data) { const DATA32 pixel = 0xffffffff; diff --git a/legacy/evas/src/lib/engines/common/evas_image_main.c b/legacy/evas/src/lib/engines/common/evas_image_main.c index b131856e65..20595cf9c9 100644 --- a/legacy/evas/src/lib/engines/common/evas_image_main.c +++ b/legacy/evas/src/lib/engines/common/evas_image_main.c @@ -16,7 +16,7 @@ image_debug_hash_cb(Evas_Hash *hash, const char *key, void *data, void *fdata) im->references, im->image->w, im->image->h, im->image->w * im->image->h * 4, - image_ram_usage(im), + evas_common_image_ram_usage(im), im->flags & RGBA_IMAGE_IS_DIRTY, im->flags & RGBA_IMAGE_INDEXED, im->info.format, @@ -42,7 +42,7 @@ image_debug(void) im->references, im->image->w, im->image->h, im->image->w * im->image->h * 4, - image_ram_usage(im), + evas_common_image_ram_usage(im), im->flags & RGBA_IMAGE_IS_DIRTY, im->flags & RGBA_IMAGE_INDEXED, im->info.format, @@ -52,12 +52,12 @@ image_debug(void) #endif void -image_init(void) +evas_common_image_init(void) { } RGBA_Surface * -image_surface_new(void) +evas_common_image_surface_new(void) { RGBA_Surface *is; @@ -66,20 +66,20 @@ image_surface_new(void) } void -image_surface_free(RGBA_Surface *is) +evas_common_image_surface_free(RGBA_Surface *is) { - image_surface_dealloc(is); + evas_common_image_surface_dealloc(is); free(is); } void -image_surface_alloc(RGBA_Surface *is) +evas_common_image_surface_alloc(RGBA_Surface *is) { is->data = malloc(is->w * is->h * sizeof(DATA32)); } void -image_surface_dealloc(RGBA_Surface *is) +evas_common_image_surface_dealloc(RGBA_Surface *is) { if ((is->data) && (!is->no_free)) { @@ -89,24 +89,24 @@ image_surface_dealloc(RGBA_Surface *is) } RGBA_Image * -image_create(int w, int h) +evas_common_image_create(int w, int h) { RGBA_Image *im; - im = image_new(); + im = evas_common_image_new(); if (!im) return NULL; - im->image = image_surface_new(); + im->image = evas_common_image_surface_new(); if (!im->image) { - image_free(im); + evas_common_image_free(im); return NULL; } im->image->w = w; im->image->h = h; - image_surface_alloc(im->image); + evas_common_image_surface_alloc(im->image); if (!im->image->data) { - image_free(im); + evas_common_image_free(im); return NULL; } im->flags = RGBA_IMAGE_IS_DIRTY; @@ -115,7 +115,7 @@ image_create(int w, int h) } RGBA_Image * -image_new(void) +evas_common_image_new(void) { RGBA_Image *im; @@ -126,15 +126,15 @@ image_new(void) } void -image_free(RGBA_Image *im) +evas_common_image_free(RGBA_Image *im) { int i; - if (im->image) image_surface_free(im->image); + if (im->image) evas_common_image_surface_free(im->image); for (i = 0; i < im->mipmaps.num; i++) { if (im->mipmaps.levels[i]) - image_surface_free(im->mipmaps.levels[i]); + evas_common_image_surface_free(im->mipmaps.levels[i]); } if (im->mipmaps.levels) free(im->mipmaps.levels); if (im->info.file) free(im->info.file); @@ -144,63 +144,63 @@ image_free(RGBA_Image *im) } void -image_ref(RGBA_Image *im) +evas_common_image_ref(RGBA_Image *im) { im->references++; if (im->references == 1) /* we were in cache - take us out */ { - image_uncache(im); - image_store(im); + evas_common_image_uncache(im); + evas_common_image_store(im); } } void -image_unref(RGBA_Image *im) +evas_common_image_unref(RGBA_Image *im) { im->references--; if (im->references <= 0) /* we were are now in cache - put us in */ { - image_unstore(im); + evas_common_image_unstore(im); if ((cache_size > 0) && (!(im->flags & RGBA_IMAGE_IS_DIRTY))) { - image_cache(im); - image_flush_cache(); + evas_common_image_cache(im); + evas_common_image_flush_cache(); } else { - image_free(im); + evas_common_image_free(im); } } } void -image_cache(RGBA_Image *im) +evas_common_image_cache(RGBA_Image *im) { int ram; if (im->flags & RGBA_IMAGE_INDEXED) return; im->flags |= RGBA_IMAGE_INDEXED; cache = evas_object_list_prepend(cache, im); - ram = image_ram_usage(im); + ram = evas_common_image_ram_usage(im); cache_usage += ram; - image_flush_cache(); + evas_common_image_flush_cache(); } void -image_uncache(RGBA_Image *im) +evas_common_image_uncache(RGBA_Image *im) { int ram; if (!(im->flags & RGBA_IMAGE_INDEXED)) return; im->flags &= ~RGBA_IMAGE_INDEXED; cache = evas_object_list_remove(cache, im); - ram = image_ram_usage(im); + ram = evas_common_image_ram_usage(im); cache_usage -= ram; } void -image_flush_cache(void) +evas_common_image_flush_cache(void) { Evas_Object_List *l, *l_next; @@ -213,28 +213,28 @@ image_flush_cache(void) l_next = l->prev; im = (RGBA_Image *)l; - image_uncache(im); - image_free(im); + evas_common_image_uncache(im); + evas_common_image_free(im); if (cache_usage <= cache_size) return; l = l_next; } } void -image_set_cache(int size) +evas_common_image_set_cache(int size) { cache_size = size; - image_flush_cache(); + evas_common_image_flush_cache(); } int -image_get_cache(void) +evas_common_image_get_cache(void) { return cache_size; } void -image_store(RGBA_Image *im) +evas_common_image_store(RGBA_Image *im) { char *key; int l1, l2, l3; @@ -263,7 +263,7 @@ image_store(RGBA_Image *im) } void -image_unstore(RGBA_Image *im) +evas_common_image_unstore(RGBA_Image *im) { char *key; int l1, l2, l3; @@ -292,7 +292,7 @@ image_unstore(RGBA_Image *im) RGBA_Image * -image_find(const char *filename, const char *key, DATA64 timestamp) +evas_common_image_find(const char *filename, const char *key, DATA64 timestamp) { Evas_Object_List *l; RGBA_Image *im; @@ -343,7 +343,7 @@ image_find(const char *filename, const char *key, DATA64 timestamp) } int -image_ram_usage(RGBA_Image *im) +evas_common_image_ram_usage(RGBA_Image *im) { int ram = 0; int i; @@ -364,13 +364,13 @@ image_ram_usage(RGBA_Image *im) } void -image_dirty(RGBA_Image *im) +evas_common_image_dirty(RGBA_Image *im) { int i; - image_unstore(im); + evas_common_image_unstore(im); im->flags |= RGBA_IMAGE_IS_DIRTY; for (i = 0; i < im->mipmaps.num; i++) - image_surface_dealloc(im->mipmaps.levels[i]); + evas_common_image_surface_dealloc(im->mipmaps.levels[i]); } diff --git a/legacy/evas/src/lib/engines/common/evas_line_main.c b/legacy/evas/src/lib/engines/common/evas_line_main.c index 283fdc7f82..188633e183 100644 --- a/legacy/evas/src/lib/engines/common/evas_line_main.c +++ b/legacy/evas/src/lib/engines/common/evas_line_main.c @@ -3,7 +3,7 @@ extern DATA8 pow_lut[256][256]; void -line_init(void) +evas_common_line_init(void) { } @@ -11,7 +11,7 @@ line_init(void) #define SGN(_x) (((_x) < 0) ? -1 : 1) void -line_draw(RGBA_Image *dst, RGBA_Draw_Context *dc, int x1, int y1, int x2, int y2) +evas_common_line_draw(RGBA_Image *dst, RGBA_Draw_Context *dc, int x1, int y1, int x2, int y2) { int dx, dy, ddx, ddy, ax, ay, sx, sy, x, y, d; DATA32 *im; diff --git a/legacy/evas/src/lib/engines/common/evas_polygon_main.c b/legacy/evas/src/lib/engines/common/evas_polygon_main.c index 1701e9c859..fadedf9bcf 100644 --- a/legacy/evas/src/lib/engines/common/evas_polygon_main.c +++ b/legacy/evas/src/lib/engines/common/evas_polygon_main.c @@ -25,12 +25,12 @@ struct _RGBA_Vertex }; void -polygon_init(void) +evas_common_polygon_init(void) { } RGBA_Polygon_Point * -polygon_point_add(RGBA_Polygon_Point *points, int x, int y) +evas_common_polygon_point_add(RGBA_Polygon_Point *points, int x, int y) { RGBA_Polygon_Point *pt; @@ -43,7 +43,7 @@ polygon_point_add(RGBA_Polygon_Point *points, int x, int y) } RGBA_Polygon_Point * -polygon_points_clear(RGBA_Polygon_Point *points) +evas_common_polygon_points_clear(RGBA_Polygon_Point *points) { if (points) { @@ -82,7 +82,7 @@ polygon_edge_sorter(const void *a, const void *b) } void -polygon_draw(RGBA_Image *dst, RGBA_Draw_Context *dc, RGBA_Polygon_Point *points) +evas_common_polygon_draw(RGBA_Image *dst, RGBA_Draw_Context *dc, RGBA_Polygon_Point *points) { Gfx_Func_Blend_Color_Dst func; RGBA_Polygon_Point *pt; @@ -123,7 +123,7 @@ polygon_draw(RGBA_Image *dst, RGBA_Draw_Context *dc, RGBA_Polygon_Point *points) } if ((ext_w <= 0) || (ext_h <= 0)) return; - cpu_end_opt(); + evas_common_cpu_end_opt(); n = 0; for (l = (Evas_Object_List *)points; l; l = l->next) n++; if (n < 3) return; @@ -231,7 +231,7 @@ polygon_draw(RGBA_Image *dst, RGBA_Draw_Context *dc, RGBA_Polygon_Point *points) free(point); free(sorted_index); - func = draw_func_blend_color_get(dc->col.col, dst, 0); + func = evas_common_draw_func_blend_color_get(dc->col.col, dst, 0); if (spans) { for (l = spans; l; l = l->next) diff --git a/legacy/evas/src/lib/engines/common/evas_rectangle_main.c b/legacy/evas/src/lib/engines/common/evas_rectangle_main.c index a54a53dee7..16f2095712 100644 --- a/legacy/evas/src/lib/engines/common/evas_rectangle_main.c +++ b/legacy/evas/src/lib/engines/common/evas_rectangle_main.c @@ -3,12 +3,12 @@ static void rectangle_draw_internal(RGBA_Image *dst, RGBA_Draw_Context *dc, int x, int y, int w, int h); void -rectangle_init(void) +evas_common_rectangle_init(void) { } void -rectangle_draw(RGBA_Image *dst, RGBA_Draw_Context *dc, int x, int y, int w, int h) +evas_common_rectangle_draw(RGBA_Image *dst, RGBA_Draw_Context *dc, int x, int y, int w, int h) { int c, cx, cy, cw, ch; Cutout_Rect *rects, *r; @@ -26,22 +26,22 @@ rectangle_draw(RGBA_Image *dst, RGBA_Draw_Context *dc, int x, int y, int w, int } /* save out clip info */ c = dc->clip.use; cx = dc->clip.x; cy = dc->clip.y; cw = dc->clip.w; ch = dc->clip.h; - draw_context_clip_clip(dc, 0, 0, dst->image->w, dst->image->h); - draw_context_clip_clip(dc, x, y, w, h); + evas_common_draw_context_clip_clip(dc, 0, 0, dst->image->w, dst->image->h); + evas_common_draw_context_clip_clip(dc, x, y, w, h); /* our clip is 0 size.. abort */ if ((dc->clip.w <= 0) || (dc->clip.h <= 0)) { dc->clip.use = c; dc->clip.x = cx; dc->clip.y = cy; dc->clip.w = cw; dc->clip.h = ch; return; } - rects = draw_context_apply_cutouts(dc); + rects = evas_common_draw_context_apply_cutouts(dc); for (l = (Evas_Object_List *)rects; l; l = l->next) { r = (Cutout_Rect *)l; - draw_context_set_clip(dc, r->x, r->y, r->w, r->h); + evas_common_draw_context_set_clip(dc, r->x, r->y, r->w, r->h); rectangle_draw_internal(dst, dc, x, y, w, h); } - draw_context_apply_free_cutouts(rects); + evas_common_draw_context_apply_free_cutouts(rects); /* restore clip info */ dc->clip.use = c; dc->clip.x = cx; dc->clip.y = cy; dc->clip.w = cw; dc->clip.h = ch; } @@ -63,7 +63,7 @@ rectangle_draw_internal(RGBA_Image *dst, RGBA_Draw_Context *dc, int x, int y, in } if ((w <= 0) || (h <= 0)) return; - func = draw_func_blend_color_get(dc->col.col, dst, w); + func = evas_common_draw_func_blend_color_get(dc->col.col, dst, w); ptr = dst->image->data + (y * dst->image->w) + x; for (yy = 0; yy < h; yy++) { diff --git a/legacy/evas/src/lib/engines/common/evas_scale_main.c b/legacy/evas/src/lib/engines/common/evas_scale_main.c index 2f3a2df4da..3015b5c445 100644 --- a/legacy/evas/src/lib/engines/common/evas_scale_main.c +++ b/legacy/evas/src/lib/engines/common/evas_scale_main.c @@ -1,6 +1,6 @@ #include "evas_common.h" void -scale_init(void) +evas_common_scale_init(void) { } diff --git a/legacy/evas/src/lib/engines/common/evas_scale_sample.c b/legacy/evas/src/lib/engines/common/evas_scale_sample.c index 5b15fdea5c..48e39c3ac4 100644 --- a/legacy/evas/src/lib/engines/common/evas_scale_sample.c +++ b/legacy/evas/src/lib/engines/common/evas_scale_sample.c @@ -5,14 +5,14 @@ void scale_rgba_in_to_out_clip_sample_internal(RGBA_Image *src, RGBA_Image *dst, #ifndef BUILD_SCALE_SMOOTH #ifdef BUILD_SCALE_SAMPLE void -scale_rgba_in_to_out_clip_smooth(RGBA_Image *src, RGBA_Image *dst, +evas_common_scale_rgba_in_to_out_clip_smooth(RGBA_Image *src, RGBA_Image *dst, RGBA_Draw_Context *dc, int src_region_x, int src_region_y, int src_region_w, int src_region_h, int dst_region_x, int dst_region_y, int dst_region_w, int dst_region_h) { - scale_rgba_in_to_out_clip_sample(src, dst, dc, + evas_common_scale_rgba_in_to_out_clip_sample(src, dst, dc, src_region_x, src_region_y, src_region_w, src_region_h, dst_region_x, dst_region_y, @@ -23,7 +23,7 @@ scale_rgba_in_to_out_clip_smooth(RGBA_Image *src, RGBA_Image *dst, #ifdef BUILD_SCALE_SAMPLE void -scale_rgba_in_to_out_clip_sample(RGBA_Image *src, RGBA_Image *dst, +evas_common_scale_rgba_in_to_out_clip_sample(RGBA_Image *src, RGBA_Image *dst, RGBA_Draw_Context *dc, int src_region_x, int src_region_y, int src_region_w, int src_region_h, @@ -50,19 +50,19 @@ scale_rgba_in_to_out_clip_sample(RGBA_Image *src, RGBA_Image *dst, } /* save out clip info */ c = dc->clip.use; cx = dc->clip.x; cy = dc->clip.y; cw = dc->clip.w; ch = dc->clip.h; - draw_context_clip_clip(dc, 0, 0, dst->image->w, dst->image->h); - draw_context_clip_clip(dc, dst_region_x, dst_region_y, dst_region_w, dst_region_h); + evas_common_draw_context_clip_clip(dc, 0, 0, dst->image->w, dst->image->h); + evas_common_draw_context_clip_clip(dc, dst_region_x, dst_region_y, dst_region_w, dst_region_h); /* our clip is 0 size.. abort */ if ((dc->clip.w <= 0) || (dc->clip.h <= 0)) { dc->clip.use = c; dc->clip.x = cx; dc->clip.y = cy; dc->clip.w = cw; dc->clip.h = ch; return; } - rects = draw_context_apply_cutouts(dc); + rects = evas_common_draw_context_apply_cutouts(dc); for (l = (Evas_Object_List *)rects; l; l = l->next) { r = (Cutout_Rect *)l; - draw_context_set_clip(dc, r->x, r->y, r->w, r->h); + evas_common_draw_context_set_clip(dc, r->x, r->y, r->w, r->h); scale_rgba_in_to_out_clip_sample_internal(src, dst, dc, src_region_x, src_region_y, src_region_w, src_region_h, @@ -70,7 +70,7 @@ scale_rgba_in_to_out_clip_sample(RGBA_Image *src, RGBA_Image *dst, dst_region_w, dst_region_h); } - draw_context_apply_free_cutouts(rects); + evas_common_draw_context_apply_free_cutouts(rects); /* restore clip info */ dc->clip.use = c; dc->clip.x = cx; dc->clip.y = cy; dc->clip.w = cw; dc->clip.h = ch; } @@ -238,7 +238,7 @@ scale_rgba_in_to_out_clip_sample_internal(RGBA_Image *src, RGBA_Image *dst, { Gfx_Func_Blend_Src_Cmod_Dst func; - func = draw_func_blend_cmod_get(src, dst, dst_clip_w); + func = evas_common_draw_func_blend_cmod_get(src, dst, dst_clip_w); /* if 1:1 scale */ if ((dst_region_w == src_region_w) && @@ -287,7 +287,7 @@ scale_rgba_in_to_out_clip_sample_internal(RGBA_Image *src, RGBA_Image *dst, { Gfx_Func_Blend_Src_Mul_Dst func; - func = draw_func_blend_mul_get(src, dc->mul.col, dst, dst_clip_w); + func = evas_common_draw_func_blend_mul_get(src, dc->mul.col, dst, dst_clip_w); /* if 1:1 scale */ if ((dst_region_w == src_region_w) && (dst_region_h == src_region_h)) @@ -335,7 +335,7 @@ scale_rgba_in_to_out_clip_sample_internal(RGBA_Image *src, RGBA_Image *dst, { Gfx_Func_Blend_Src_Dst func; - func = draw_func_blend_get(src, dst, dst_clip_w); + func = evas_common_draw_func_blend_get(src, dst, dst_clip_w); /* if 1:1 scale */ if ((dst_region_w == src_region_w) && (dst_region_h == src_region_h)) @@ -392,14 +392,14 @@ scale_rgba_in_to_out_clip_sample_internal(RGBA_Image *src, RGBA_Image *dst, #else #ifdef BUILD_SCALE_SMOOTH void -scale_rgba_in_to_out_clip_sample(RGBA_Image *src, RGBA_Image *dst, +evas_common_scale_rgba_in_to_out_clip_sample(RGBA_Image *src, RGBA_Image *dst, RGBA_Draw_Context *dc, int src_region_x, int src_region_y, int src_region_w, int src_region_h, int dst_region_x, int dst_region_y, int dst_region_w, int dst_region_h) { - scale_rgba_in_to_out_clip_smooth(src, dst, dc, + evas_common_scale_rgba_in_to_out_clip_smooth(src, dst, dc, src_region_x, src_region_y, src_region_w, src_region_h, dst_region_x, dst_region_y, diff --git a/legacy/evas/src/lib/engines/common/evas_scale_smooth.c b/legacy/evas/src/lib/engines/common/evas_scale_smooth.c index 0b1bebb075..eb77c00b8f 100644 --- a/legacy/evas/src/lib/engines/common/evas_scale_smooth.c +++ b/legacy/evas/src/lib/engines/common/evas_scale_smooth.c @@ -83,7 +83,7 @@ scale_calc_a_points(int s, int d) #ifdef BUILD_SCALE_SMOOTH #ifdef BUILD_C void -scale_rgba_mipmap_down_2x2_c(DATA32 *src, DATA32 *dst, int src_w, int src_h) +evas_common_scale_rgba_mipmap_down_2x2_c(DATA32 *src, DATA32 *dst, int src_w, int src_h) { int x, y, dst_w, dst_h; DATA32 *src_ptr, *src_ptr2, *dst_ptr; @@ -120,7 +120,7 @@ scale_rgba_mipmap_down_2x2_c(DATA32 *src, DATA32 *dst, int src_w, int src_h) #ifdef BUILD_SCALE_SMOOTH #ifdef BUILD_C void -scale_rgba_mipmap_down_2x1_c(DATA32 *src, DATA32 *dst, int src_w, int src_h) +evas_common_scale_rgba_mipmap_down_2x1_c(DATA32 *src, DATA32 *dst, int src_w, int src_h) { int x, y, dst_w, dst_h; DATA32 *src_ptr, *dst_ptr; @@ -154,7 +154,7 @@ scale_rgba_mipmap_down_2x1_c(DATA32 *src, DATA32 *dst, int src_w, int src_h) #ifdef BUILD_SCALE_SMOOTH #ifdef BUILD_C void -scale_rgba_mipmap_down_1x2_c(DATA32 *src, DATA32 *dst, int src_w, int src_h) +evas_common_scale_rgba_mipmap_down_1x2_c(DATA32 *src, DATA32 *dst, int src_w, int src_h) { int x, y, dst_w, dst_h; DATA32 *src_ptr, *src_ptr2, *dst_ptr; @@ -191,7 +191,7 @@ scale_rgba_mipmap_down_1x2_c(DATA32 *src, DATA32 *dst, int src_w, int src_h) #ifdef BUILD_SCALE_SMOOTH #ifdef BUILD_C void -scale_rgb_mipmap_down_2x2_c(DATA32 *src, DATA32 *dst, int src_w, int src_h) +evas_common_scale_rgb_mipmap_down_2x2_c(DATA32 *src, DATA32 *dst, int src_w, int src_h) { int x, y, dst_w, dst_h; DATA32 *src_ptr, *src_ptr2, *dst_ptr; @@ -228,7 +228,7 @@ scale_rgb_mipmap_down_2x2_c(DATA32 *src, DATA32 *dst, int src_w, int src_h) #ifdef BUILD_SCALE_SMOOTH #ifdef BUILD_C void -scale_rgb_mipmap_down_2x1_c(DATA32 *src, DATA32 *dst, int src_w, int src_h) +evas_common_scale_rgb_mipmap_down_2x1_c(DATA32 *src, DATA32 *dst, int src_w, int src_h) { int x, y, dst_w, dst_h; DATA32 *src_ptr, *dst_ptr; @@ -262,7 +262,7 @@ scale_rgb_mipmap_down_2x1_c(DATA32 *src, DATA32 *dst, int src_w, int src_h) #ifdef BUILD_SCALE_SMOOTH #ifdef BUILD_C void -scale_rgb_mipmap_down_1x2_c(DATA32 *src, DATA32 *dst, int src_w, int src_h) +evas_common_scale_rgb_mipmap_down_1x2_c(DATA32 *src, DATA32 *dst, int src_w, int src_h) { int x, y, dst_w, dst_h; DATA32 *src_ptr, *src_ptr2, *dst_ptr; @@ -299,7 +299,7 @@ scale_rgb_mipmap_down_1x2_c(DATA32 *src, DATA32 *dst, int src_w, int src_h) #ifdef BUILD_SCALE_SMOOTH #ifdef BUILD_MMX void -scale_rgba_mipmap_down_2x2_mmx(DATA32 *src, DATA32 *dst, int src_w, int src_h) +evas_common_scale_rgba_mipmap_down_2x2_mmx(DATA32 *src, DATA32 *dst, int src_w, int src_h) { int x, y, dst_w, dst_h; DATA32 *src_ptr, *src_ptr2, *dst_ptr; @@ -346,7 +346,7 @@ scale_rgba_mipmap_down_2x2_mmx(DATA32 *src, DATA32 *dst, int src_w, int src_h) #ifdef BUILD_SCALE_SMOOTH #ifdef BUILD_MMX void -scale_rgba_mipmap_down_2x1_mmx(DATA32 *src, DATA32 *dst, int src_w, int src_h) +evas_common_scale_rgba_mipmap_down_2x1_mmx(DATA32 *src, DATA32 *dst, int src_w, int src_h) { int x, y, dst_w, dst_h; DATA32 *src_ptr, *dst_ptr; @@ -384,7 +384,7 @@ scale_rgba_mipmap_down_2x1_mmx(DATA32 *src, DATA32 *dst, int src_w, int src_h) #ifdef BUILD_SCALE_SMOOTH #ifdef BUILD_MMX void -scale_rgba_mipmap_down_1x2_mmx(DATA32 *src, DATA32 *dst, int src_w, int src_h) +evas_common_scale_rgba_mipmap_down_1x2_mmx(DATA32 *src, DATA32 *dst, int src_w, int src_h) { int x, y, dst_w, dst_h; DATA32 *src_ptr, *src_ptr2, *dst_ptr; @@ -424,7 +424,7 @@ scale_rgba_mipmap_down_1x2_mmx(DATA32 *src, DATA32 *dst, int src_w, int src_h) #ifdef BUILD_SCALE_SMOOTH void -scale_rgba_gen_mipmap_table(RGBA_Image *src) +evas_common_scale_rgba_gen_mipmap_table(RGBA_Image *src) { int w, h, i; @@ -449,7 +449,7 @@ scale_rgba_gen_mipmap_table(RGBA_Image *src) h >>= 1; if (w < 1) w = 1; if (h < 1) h = 1; - src->mipmaps.levels[i] = image_surface_new(); + src->mipmaps.levels[i] = evas_common_image_surface_new(); src->mipmaps.levels[i]->w = w; src->mipmaps.levels[i]->h = h; } @@ -458,7 +458,7 @@ scale_rgba_gen_mipmap_table(RGBA_Image *src) #ifdef BUILD_SCALE_SMOOTH void -scale_rgba_gen_mipmap_level(RGBA_Image *src, int l) +evas_common_scale_rgba_gen_mipmap_level(RGBA_Image *src, int l) { RGBA_Surface *s_srf, *d_srf; #ifdef BUILD_MMX @@ -466,24 +466,24 @@ scale_rgba_gen_mipmap_level(RGBA_Image *src, int l) #endif if (src->mipmaps.levels[l]->data) return; - image_surface_alloc(src->mipmaps.levels[l]); + evas_common_image_surface_alloc(src->mipmaps.levels[l]); if (l > 0) - scale_rgba_gen_mipmap_level(src, l - 1); + evas_common_scale_rgba_gen_mipmap_level(src, l - 1); if (l > 0) s_srf = src->mipmaps.levels[l - 1]; else s_srf = src->image; d_srf = src->mipmaps.levels[l]; #ifdef BUILD_MMX - cpu_can_do(&mmx, &sse, &sse2); + evas_common_cpu_can_do(&mmx, &sse, &sse2); if (mmx) { if ((s_srf->w > 1) && (s_srf->h > 1)) - scale_rgba_mipmap_down_2x2_mmx(s_srf->data, d_srf->data, s_srf->w, s_srf->h); + evas_common_scale_rgba_mipmap_down_2x2_mmx(s_srf->data, d_srf->data, s_srf->w, s_srf->h); else if ((s_srf->w > 1) && (s_srf->h <= 1)) - scale_rgba_mipmap_down_2x1_mmx(s_srf->data, d_srf->data, s_srf->w, s_srf->h); + evas_common_scale_rgba_mipmap_down_2x1_mmx(s_srf->data, d_srf->data, s_srf->w, s_srf->h); else if ((s_srf->w <= 1) && (s_srf->h > 1)) - scale_rgba_mipmap_down_1x2_mmx(s_srf->data, d_srf->data, s_srf->w, s_srf->h); + evas_common_scale_rgba_mipmap_down_1x2_mmx(s_srf->data, d_srf->data, s_srf->w, s_srf->h); } else { @@ -492,20 +492,20 @@ scale_rgba_gen_mipmap_level(RGBA_Image *src, int l) if (src->flags & RGBA_IMAGE_HAS_ALPHA) { if ((s_srf->w > 1) && (s_srf->h > 1)) - scale_rgba_mipmap_down_2x2_c(s_srf->data, d_srf->data, s_srf->w, s_srf->h); + evas_common_scale_rgba_mipmap_down_2x2_c(s_srf->data, d_srf->data, s_srf->w, s_srf->h); else if ((s_srf->w > 1) && (s_srf->h <= 1)) - scale_rgba_mipmap_down_2x1_c(s_srf->data, d_srf->data, s_srf->w, s_srf->h); + evas_common_scale_rgba_mipmap_down_2x1_c(s_srf->data, d_srf->data, s_srf->w, s_srf->h); else if ((s_srf->w <= 1) && (s_srf->h > 1)) - scale_rgba_mipmap_down_1x2_c(s_srf->data, d_srf->data, s_srf->w, s_srf->h); + evas_common_scale_rgba_mipmap_down_1x2_c(s_srf->data, d_srf->data, s_srf->w, s_srf->h); } else { if ((s_srf->w > 1) && (s_srf->h > 1)) - scale_rgb_mipmap_down_2x2_c(s_srf->data, d_srf->data, s_srf->w, s_srf->h); + evas_common_scale_rgb_mipmap_down_2x2_c(s_srf->data, d_srf->data, s_srf->w, s_srf->h); else if ((s_srf->w > 1) && (s_srf->h <= 1)) - scale_rgb_mipmap_down_2x1_c(s_srf->data, d_srf->data, s_srf->w, s_srf->h); + evas_common_scale_rgb_mipmap_down_2x1_c(s_srf->data, d_srf->data, s_srf->w, s_srf->h); else if ((s_srf->w <= 1) && (s_srf->h > 1)) - scale_rgb_mipmap_down_1x2_c(s_srf->data, d_srf->data, s_srf->w, s_srf->h); + evas_common_scale_rgb_mipmap_down_1x2_c(s_srf->data, d_srf->data, s_srf->w, s_srf->h); } #endif #ifdef BUILD_MMX @@ -517,7 +517,7 @@ scale_rgba_gen_mipmap_level(RGBA_Image *src, int l) #ifdef BUILD_SCALE_SMOOTH #ifdef BUILD_SCALE_TRILINEAR int -scale_rgba_get_mipmap_surfaces(RGBA_Image *src, int src_region_w, int src_region_h, int dst_region_w, int dst_region_h, RGBA_Surface **srf1, RGBA_Surface **srf2) +evas_common_scale_rgba_get_mipmap_surfaces(RGBA_Image *src, int src_region_w, int src_region_h, int dst_region_w, int dst_region_h, RGBA_Surface **srf1, RGBA_Surface **srf2) { int scale_x, scale_y; int l, l1, l2; @@ -572,20 +572,20 @@ scale_rgba_get_mipmap_surfaces(RGBA_Image *src, int src_region_w, int src_region if (l1 == -1) *srf1 = src->image; else { - scale_rgba_gen_mipmap_level(src, l1); + evas_common_scale_rgba_gen_mipmap_level(src, l1); *srf1 = src->mipmaps.levels[l1]; } if (l2 == -1) *srf2 = src->image; else { - scale_rgba_gen_mipmap_level(src, l2); + evas_common_scale_rgba_gen_mipmap_level(src, l2); *srf2 = src->mipmaps.levels[l2]; } return mix; } #else RGBA_Surface * -scale_rgba_get_mipmap_surface(RGBA_Image *src, int src_region_w, int src_region_h, int dst_region_w, int dst_region_h) +evas_common_scale_rgba_get_mipmap_surface(RGBA_Image *src, int src_region_w, int src_region_h, int dst_region_w, int dst_region_h) { int scale_x, scale_y; int l; @@ -628,7 +628,7 @@ scale_rgba_get_mipmap_surface(RGBA_Image *src, int src_region_w, int src_region_ if (l == -1) srf = src->image; else { - scale_rgba_gen_mipmap_level(src, l); + evas_common_scale_rgba_gen_mipmap_level(src, l); srf = src->mipmaps.levels[l]; } return srf; @@ -639,19 +639,19 @@ scale_rgba_get_mipmap_surface(RGBA_Image *src, int src_region_w, int src_region_ #ifdef BUILD_SCALE_SMOOTH # ifdef BUILD_MMX # undef SCALE_FUNC -# define SCALE_FUNC scale_rgba_in_to_out_clip_smooth_mmx +# define SCALE_FUNC evas_common_scale_rgba_in_to_out_clip_smooth_mmx # undef SCALE_USING_MMX # define SCALE_USING_MMX # include "evas_scale_smooth_scaler.c" # endif # ifdef BUILD_C # undef SCALE_FUNC -# define SCALE_FUNC scale_rgba_in_to_out_clip_smooth_c +# define SCALE_FUNC evas_common_scale_rgba_in_to_out_clip_smooth_c # undef SCALE_USING_MMX # include "evas_scale_smooth_scaler.c" # endif void -scale_rgba_in_to_out_clip_smooth(RGBA_Image *src, RGBA_Image *dst, +evas_common_scale_rgba_in_to_out_clip_smooth(RGBA_Image *src, RGBA_Image *dst, RGBA_Draw_Context *dc, int src_region_x, int src_region_y, int src_region_w, int src_region_h, @@ -673,7 +673,7 @@ scale_rgba_in_to_out_clip_smooth(RGBA_Image *src, RGBA_Image *dst, return; # ifdef BUILD_MMX # ifndef BUILD_SCALE_TRILINEAR - cpu_can_do(&mmx, &sse, &sse2); + evas_common_cpu_can_do(&mmx, &sse, &sse2); # endif # endif /* no cutouts - cut right to the chase */ @@ -682,7 +682,7 @@ scale_rgba_in_to_out_clip_smooth(RGBA_Image *src, RGBA_Image *dst, # ifdef BUILD_MMX # ifndef BUILD_SCALE_TRILINEAR if (mmx) - scale_rgba_in_to_out_clip_smooth_mmx(src, dst, dc, + evas_common_scale_rgba_in_to_out_clip_smooth_mmx(src, dst, dc, src_region_x, src_region_y, src_region_w, src_region_h, dst_region_x, dst_region_y, @@ -691,7 +691,7 @@ scale_rgba_in_to_out_clip_smooth(RGBA_Image *src, RGBA_Image *dst, # endif # endif # ifdef BUILD_C - scale_rgba_in_to_out_clip_smooth_c(src, dst, dc, + evas_common_scale_rgba_in_to_out_clip_smooth_c(src, dst, dc, src_region_x, src_region_y, src_region_w, src_region_h, dst_region_x, dst_region_y, @@ -701,23 +701,23 @@ scale_rgba_in_to_out_clip_smooth(RGBA_Image *src, RGBA_Image *dst, } /* save out clip info */ c = dc->clip.use; cx = dc->clip.x; cy = dc->clip.y; cw = dc->clip.w; ch = dc->clip.h; - draw_context_clip_clip(dc, 0, 0, dst->image->w, dst->image->h); - draw_context_clip_clip(dc, dst_region_x, dst_region_y, dst_region_w, dst_region_h); + evas_common_draw_context_clip_clip(dc, 0, 0, dst->image->w, dst->image->h); + evas_common_draw_context_clip_clip(dc, dst_region_x, dst_region_y, dst_region_w, dst_region_h); /* our clip is 0 size.. abort */ if ((dc->clip.w <= 0) || (dc->clip.h <= 0)) { dc->clip.use = c; dc->clip.x = cx; dc->clip.y = cy; dc->clip.w = cw; dc->clip.h = ch; return; } - rects = draw_context_apply_cutouts(dc); + rects = evas_common_draw_context_apply_cutouts(dc); for (l = (Evas_Object_List *)rects; l; l = l->next) { r = (Cutout_Rect *)l; - draw_context_set_clip(dc, r->x, r->y, r->w, r->h); + evas_common_draw_context_set_clip(dc, r->x, r->y, r->w, r->h); # ifdef BUILD_MMX # ifndef BUILD_SCALE_TRILINEAR if (mmx) - scale_rgba_in_to_out_clip_smooth_mmx(src, dst, dc, + evas_common_scale_rgba_in_to_out_clip_smooth_mmx(src, dst, dc, src_region_x, src_region_y, src_region_w, src_region_h, dst_region_x, dst_region_y, @@ -726,14 +726,14 @@ scale_rgba_in_to_out_clip_smooth(RGBA_Image *src, RGBA_Image *dst, # endif # endif # ifdef BUILD_C - scale_rgba_in_to_out_clip_smooth_c(src, dst, dc, + evas_common_scale_rgba_in_to_out_clip_smooth_c(src, dst, dc, src_region_x, src_region_y, src_region_w, src_region_h, dst_region_x, dst_region_y, dst_region_w, dst_region_h); # endif } - draw_context_apply_free_cutouts(rects); + evas_common_draw_context_apply_free_cutouts(rects); /* restore clip info */ dc->clip.use = c; dc->clip.x = cx; dc->clip.y = cy; dc->clip.w = cw; dc->clip.h = ch; } diff --git a/legacy/evas/src/lib/engines/common/evas_scale_smooth_scaler.c b/legacy/evas/src/lib/engines/common/evas_scale_smooth_scaler.c index 1cdab4960f..9af76f35dd 100644 --- a/legacy/evas/src/lib/engines/common/evas_scale_smooth_scaler.c +++ b/legacy/evas/src/lib/engines/common/evas_scale_smooth_scaler.c @@ -223,7 +223,7 @@ SCALE_FUNC(RGBA_Image *src, RGBA_Image *dst, { Gfx_Func_Blend_Src_Cmod_Dst func; - func = draw_func_blend_cmod_get(src, dst, dst_clip_w); + func = evas_common_draw_func_blend_cmod_get(src, dst, dst_clip_w); for (y = 0; y < dst_clip_h; y++) { func(ptr, dst_ptr, dst_clip_w, dc->mod.r, dc->mod.g, dc->mod.b, dc->mod.a); @@ -235,7 +235,7 @@ SCALE_FUNC(RGBA_Image *src, RGBA_Image *dst, { Gfx_Func_Blend_Src_Mul_Dst func; - func = draw_func_blend_mul_get(src, dc->mul.col, dst, dst_clip_w); + func = evas_common_draw_func_blend_mul_get(src, dc->mul.col, dst, dst_clip_w); for (y = 0; y < dst_clip_h; y++) { func(ptr, dst_ptr, dst_clip_w, dc->mul.col); @@ -247,7 +247,7 @@ SCALE_FUNC(RGBA_Image *src, RGBA_Image *dst, { Gfx_Func_Blend_Src_Dst func; - func = draw_func_blend_get(src, dst, dst_clip_w); + func = evas_common_draw_func_blend_get(src, dst, dst_clip_w); for (y = 0; y < dst_clip_h; y++) { func(ptr, dst_ptr, dst_clip_w); @@ -266,9 +266,9 @@ SCALE_FUNC(RGBA_Image *src, RGBA_Image *dst, buf = malloc(dst_clip_w * sizeof(DATA32)); if (!buf) goto no_buf; - func = draw_func_blend_get (src, dst, dst_clip_w); - func_cmod = draw_func_blend_cmod_get (src, dst, dst_clip_w); - func_mul = draw_func_blend_mul_get (src, dc->mul.col, dst, dst_clip_w); + func = evas_common_draw_func_blend_get (src, dst, dst_clip_w); + func_cmod = evas_common_draw_func_blend_cmod_get (src, dst, dst_clip_w); + func_mul = evas_common_draw_func_blend_mul_get (src, dc->mul.col, dst, dst_clip_w); /* scaling up only - dont need anything except original */ if ((dst_region_w >= src_region_w) && (dst_region_h >= src_region_h)) @@ -607,9 +607,9 @@ SCALE_FUNC(RGBA_Image *src, RGBA_Image *dst, /* no mipmaps at all- need to populate mipmap table */ if (src->mipmaps.num == 0) - scale_rgba_gen_mipmap_table(src); + evas_common_scale_rgba_gen_mipmap_table(src); /* caclulate mix level between mipmaps */ - mix = scale_rgba_get_mipmap_surfaces(src, + mix = evas_common_scale_rgba_get_mipmap_surfaces(src, src_region_w, src_region_h, dst_region_w, dst_region_h, &srf1, &srf2); @@ -1409,10 +1409,10 @@ SCALE_FUNC(RGBA_Image *src, RGBA_Image *dst, /* no mipmaps at all- need to populate mipmap table */ if (src->mipmaps.num == 0) { - scale_rgba_gen_mipmap_table(src); + evas_common_scale_rgba_gen_mipmap_table(src); } /* caclulate mix level between mipmaps */ - srf = scale_rgba_get_mipmap_surface(src, + srf = evas_common_scale_rgba_get_mipmap_surface(src, src_region_w, src_region_h, dst_region_w, dst_region_h); /* get mipmap level */ diff --git a/legacy/evas/src/lib/engines/common/evas_tiler.c b/legacy/evas/src/lib/engines/common/evas_tiler.c index 81559c04f6..660fe078dd 100644 --- a/legacy/evas/src/lib/engines/common/evas_tiler.c +++ b/legacy/evas/src/lib/engines/common/evas_tiler.c @@ -8,12 +8,12 @@ static int tilebuf_intersect(int tsize, int tlen, int tnum, int x, int w, int * static void tilebuf_setup(Tilebuf *tb); void -tilebuf_init(void) +evas_common_tilebuf_init(void) { } Tilebuf * -tilebuf_new(int w, int h) +evas_common_tilebuf_new(int w, int h) { Tilebuf *tb; @@ -29,14 +29,14 @@ tilebuf_new(int w, int h) } void -tilebuf_free(Tilebuf *tb) +evas_common_tilebuf_free(Tilebuf *tb) { if (tb->tiles.tiles) free(tb->tiles.tiles); free(tb); } void -tilebuf_set_tile_size(Tilebuf *tb, int tw, int th) +evas_common_tilebuf_set_tile_size(Tilebuf *tb, int tw, int th) { tb->tile_size.w = tw; tb->tile_size.h = th; @@ -44,7 +44,7 @@ tilebuf_set_tile_size(Tilebuf *tb, int tw, int th) } void -tilebuf_get_tile_size(Tilebuf *tb, int *tw, int *th) +evas_common_tilebuf_get_tile_size(Tilebuf *tb, int *tw, int *th) { if (tw) *tw = tb->tile_size.w; if (th) *th = tb->tile_size.h; @@ -124,7 +124,7 @@ tilebuf_get_tile_size(Tilebuf *tb, int *tw, int *th) */ int -tilebuf_add_redraw(Tilebuf *tb, int x, int y, int w, int h) +evas_common_tilebuf_add_redraw(Tilebuf *tb, int x, int y, int w, int h) { int tx1, tx2, ty1, ty2, tfx1, tfx2, tfy1, tfy2, xx, yy; int num; @@ -151,7 +151,7 @@ tilebuf_add_redraw(Tilebuf *tb, int x, int y, int w, int h) } int -tilebuf_del_redraw(Tilebuf *tb, int x, int y, int w, int h) +evas_common_tilebuf_del_redraw(Tilebuf *tb, int x, int y, int w, int h) { int tx1, tx2, ty1, ty2, tfx1, tfx2, tfy1, tfy2, xx, yy; int num; @@ -182,28 +182,28 @@ tilebuf_del_redraw(Tilebuf *tb, int x, int y, int w, int h) } int -tilebuf_add_motion_vector(Tilebuf *tb, int x, int y, int w, int h, int dx, int dy, int alpha) +evas_common_tilebuf_add_motion_vector(Tilebuf *tb, int x, int y, int w, int h, int dx, int dy, int alpha) { /* FIXME: need to actually impliment motion vectors. for now it just */ /* implements redraws */ int num; - num = tilebuf_add_redraw(tb, x, y, w, h); - num += tilebuf_add_redraw(tb, x + dx, y + dy, w, h); + num = evas_common_tilebuf_add_redraw(tb, x, y, w, h); + num += evas_common_tilebuf_add_redraw(tb, x + dx, y + dy, w, h); return num; /* FIXME: unused */ alpha = 0; } void -tilebuf_clear(Tilebuf *tb) +evas_common_tilebuf_clear(Tilebuf *tb) { if (!tb->tiles.tiles) return; memset(tb->tiles.tiles, 0, tb->tiles.w * tb->tiles.h * sizeof(Tilebuf_Tile)); } Tilebuf_Rect * -tilebuf_get_render_rects(Tilebuf *tb) +evas_common_tilebuf_get_render_rects(Tilebuf *tb) { Tilebuf_Rect *rects = NULL; int x, y; @@ -272,7 +272,7 @@ tilebuf_get_render_rects(Tilebuf *tb) } void -tilebuf_free_render_rects(Tilebuf_Rect *rects) +evas_common_tilebuf_free_render_rects(Tilebuf_Rect *rects) { while (rects) { diff --git a/legacy/evas/src/lib/engines/directfb/evas_engine_dfb.c b/legacy/evas/src/lib/engines/directfb/evas_engine_dfb.c index 998a6fb18a..264a575e68 100644 --- a/legacy/evas/src/lib/engines/directfb/evas_engine_dfb.c +++ b/legacy/evas/src/lib/engines/directfb/evas_engine_dfb.c @@ -140,22 +140,22 @@ evas_engine_directfb_output_setup(int w, int h, IDirectFB * dfb, re = calloc(1, sizeof(Render_Engine)); /* if we haven't initialized - init (automatic abort if already done) */ - cpu_init(); - blend_init(); - image_init(); - convert_init(); - scale_init(); - rectangle_init(); - gradient_init(); - polygon_init(); - line_init(); - font_init(); - draw_init(); - tilebuf_init(); + evas_common_cpu_init(); + evas_common_blend_init(); + evas_common_image_init(); + evas_common_convert_init(); + evas_common_scale_init(); + evas_common_rectangle_init(); + evas_common_gradient_init(); + evas_common_polygon_init(); + evas_common_line_init(); + evas_common_font_init(); + evas_common_draw_init(); + evas_common_tilebuf_init(); - re->tb = tilebuf_new(w, h); + re->tb = evas_common_tilebuf_new(w, h); /* in preliminary tests 16x16 gave highest framerates */ - tilebuf_set_tile_size(re->tb, 16, 16); + evas_common_tilebuf_set_tile_size(re->tb, 16, 16); re->dfb = dfb; re->surface = surf; @@ -174,12 +174,12 @@ evas_engine_directfb_output_setup(int w, int h, IDirectFB * dfb, /* We create a "fake" RGBA_Image which points the to DFB surface. Each access * to that surface is wrapped in Lock / Unlock calls whenever the data is * manipulated directly. */ - im = image_new(); + im = evas_common_image_new(); if (!im) return; - im->image = image_surface_new(); + im->image = evas_common_image_surface_new(); if (!im->image) { - image_free(im); + evas_common_image_free(im); return; } im->image->w = w; @@ -197,11 +197,11 @@ evas_engine_directfb_output_free(void *data) Render_Engine *re; re = (Render_Engine *) data; - tilebuf_free(re->tb); + evas_common_tilebuf_free(re->tb); if (re->rects) - tilebuf_free_render_rects(re->rects); + evas_common_tilebuf_free_render_rects(re->rects); re->backbuf->Release(re->backbuf); - image_free(re->rgba_image); + evas_common_image_free(re->rgba_image); free(re); } @@ -214,10 +214,10 @@ evas_engine_directfb_output_resize(void *data, int w, int h) re = (Render_Engine *) data; if (w == re->tb->outbuf_w && h == re->tb->outbuf_h) return; - tilebuf_free(re->tb); - re->tb = tilebuf_new(w, h); + evas_common_tilebuf_free(re->tb); + re->tb = evas_common_tilebuf_new(w, h); if (re->tb) - tilebuf_set_tile_size(re->tb, 16, 16); + evas_common_tilebuf_set_tile_size(re->tb, 16, 16); memset(&dsc, 0, sizeof(DFBSurfaceDescription)); dsc.flags = DSDESC_WIDTH | DSDESC_HEIGHT | DSDESC_PIXELFORMAT; @@ -242,7 +242,7 @@ evas_engine_directfb_output_tile_size_set(void *data, int w, int h) Render_Engine *re; re = (Render_Engine *) data; - tilebuf_set_tile_size(re->tb, w, h); + evas_common_tilebuf_set_tile_size(re->tb, w, h); } void @@ -252,7 +252,7 @@ evas_engine_directfb_output_redraws_rect_add(void *data, int x, int y, int w, Render_Engine *re; re = (Render_Engine *) data; - tilebuf_add_redraw(re->tb, x, y, w, h); + evas_common_tilebuf_add_redraw(re->tb, x, y, w, h); } void @@ -262,7 +262,7 @@ evas_engine_directfb_output_redraws_rect_del(void *data, int x, int y, int w, Render_Engine *re; re = (Render_Engine *) data; - tilebuf_del_redraw(re->tb, x, y, w, h); + evas_common_tilebuf_del_redraw(re->tb, x, y, w, h); } void @@ -271,7 +271,7 @@ evas_engine_directfb_output_redraws_clear(void *data) Render_Engine *re; re = (Render_Engine *) data; - tilebuf_clear(re->tb); + evas_common_tilebuf_clear(re->tb); } void * @@ -294,7 +294,7 @@ evas_engine_directfb_output_redraws_next_update_get(void *data, int *x, int *y, } if (!re->rects) { - re->rects = tilebuf_get_render_rects(re->tb); + re->rects = evas_common_tilebuf_get_render_rects(re->tb); re->cur_rect = (Evas_Object_List *) re->rects; } if (!re->cur_rect) @@ -307,7 +307,7 @@ evas_engine_directfb_output_redraws_next_update_get(void *data, int *x, int *y, re->cur_rect = re->cur_rect->next; if (!re->cur_rect) { - tilebuf_free_render_rects(re->rects); + evas_common_tilebuf_free_render_rects(re->rects); re->rects = NULL; re->end = 1; } @@ -333,7 +333,7 @@ evas_engine_directfb_output_redraws_next_update_push(void *data, void *surface, rect.h = h; re = (Render_Engine *) data; re->surface->Blit(re->surface, re->backbuf, &rect, x, y); - cpu_end_opt(); + evas_common_cpu_end_opt(); } void @@ -350,7 +350,7 @@ evas_engine_directfb_context_new(void *data) Render_Engine *re; re = (Render_Engine *) data; - return draw_context_new(); + return evas_common_draw_context_new(); } void @@ -359,7 +359,7 @@ evas_engine_directfb_context_free(void *data, void *context) Render_Engine *re; re = (Render_Engine *) data; - draw_context_free(context); + evas_common_draw_context_free(context); } void @@ -369,7 +369,7 @@ evas_engine_directfb_context_clip_set(void *data, void *context, int x, int y, Render_Engine *re; re = (Render_Engine *) data; - draw_context_set_clip(context, x, y, w, h); + evas_common_draw_context_set_clip(context, x, y, w, h); } void @@ -379,7 +379,7 @@ evas_engine_directfb_context_clip_clip(void *data, void *context, int x, int y, Render_Engine *re; re = (Render_Engine *) data; - draw_context_clip_clip(context, x, y, w, h); + evas_common_draw_context_clip_clip(context, x, y, w, h); } void @@ -388,7 +388,7 @@ evas_engine_directfb_context_clip_unset(void *data, void *context) Render_Engine *re; re = (Render_Engine *) data; - draw_context_unset_clip(context); + evas_common_draw_context_unset_clip(context); } int @@ -413,7 +413,7 @@ evas_engine_directfb_context_color_set(void *data, void *context, int r, int g, RGBA_Draw_Context *dc = (RGBA_Draw_Context *) context; re = (Render_Engine *) data; - draw_context_set_color(dc, r, g, b, a); + evas_common_draw_context_set_color(dc, r, g, b, a); } int @@ -440,7 +440,7 @@ evas_engine_directfb_context_multiplier_set(void *data, void *context, int r, Render_Engine *re; re = (Render_Engine *) data; - draw_context_set_multiplier(context, r, g, b, a); + evas_common_draw_context_set_multiplier(context, r, g, b, a); } void @@ -449,7 +449,7 @@ evas_engine_directfb_context_multiplier_unset(void *data, void *context) Render_Engine *re; re = (Render_Engine *) data; - draw_context_unset_multiplier(context); + evas_common_draw_context_unset_multiplier(context); } int @@ -477,7 +477,7 @@ evas_engine_directfb_context_cutout_add(void *data, void *context, int x, int y, Render_Engine *re; re = (Render_Engine *) data; - draw_context_add_cutout(context, x, y, w, h); + evas_common_draw_context_add_cutout(context, x, y, w, h); } void @@ -486,7 +486,7 @@ evas_engine_directfb_context_cutout_clear(void *data, void *context) Render_Engine *re; re = (Render_Engine *) data; - draw_context_clear_cutouts(context); + evas_common_draw_context_clear_cutouts(context); } /* @@ -520,8 +520,8 @@ evas_engine_directfb_draw_rectangle(void *data, void *context, void *surface, cy = dc->clip.y; cw = dc->clip.w; ch = dc->clip.h; - draw_context_clip_clip(dc, 0, 0, re->tb->outbuf_w, re->tb->outbuf_h); - draw_context_clip_clip(dc, x, y, w, h); + evas_common_draw_context_clip_clip(dc, 0, 0, re->tb->outbuf_w, re->tb->outbuf_h); + evas_common_draw_context_clip_clip(dc, x, y, w, h); /* our clip is 0 size.. abort */ if ((dc->clip.w <= 0) || (dc->clip.h <= 0)) { @@ -532,14 +532,14 @@ evas_engine_directfb_draw_rectangle(void *data, void *context, void *surface, dc->clip.h = ch; return; } - rects = draw_context_apply_cutouts(dc); + rects = evas_common_draw_context_apply_cutouts(dc); for (l = (Evas_Object_List *) rects; l; l = l->next) { r = (Cutout_Rect *) l; - draw_context_set_clip(dc, r->x, r->y, r->w, r->h); + evas_common_draw_context_set_clip(dc, r->x, r->y, r->w, r->h); rectangle_draw_internal(data, dc, x, y, w, h); } - draw_context_apply_free_cutouts(rects); + evas_common_draw_context_apply_free_cutouts(rects); /* restore clip info */ dc->clip.use = c; dc->clip.x = cx; @@ -602,7 +602,7 @@ rectangle_draw_internal(void *data, void *context, int x, int y, int w, int h) evas_engine_directfb_context_color_get(data, context, &r, &g, &b, &a); re->backbuf->SetColor(re->backbuf, r, g, b, a); re->backbuf->FillRectangle(re->backbuf, x, y, w, h); - cpu_end_opt(); + evas_common_cpu_end_opt(); } /* @@ -638,7 +638,7 @@ evas_engine_directfb_polygon_point_add(void *data, void *context, void *polygon, Render_Engine *re; re = (Render_Engine *)data; - return polygon_point_add(polygon, x, y); + return evas_common_polygon_point_add(polygon, x, y); context = NULL; } @@ -648,7 +648,7 @@ evas_engine_directfb_polygon_points_clear(void *data, void *context, void *polyg Render_Engine *re; re = (Render_Engine *)data; - return polygon_points_clear(polygon); + return evas_common_polygon_points_clear(polygon); context = NULL; } @@ -667,10 +667,10 @@ evas_engine_directfb_polygon_draw(void *data, void *context, void *surface, void surf = (IDirectFBSurface *)im->image->data; surf->Lock(surf, DSLF_WRITE, &p, & pitch); im->image->data = p; - polygon_draw(im, context, polygon); + evas_common_polygon_draw(im, context, polygon); surf->Unlock(surf); im->image->data = (void *)surf; - cpu_end_opt(); + evas_common_cpu_end_opt(); } @@ -687,8 +687,8 @@ evas_engine_directfb_gradient_color_add(void *data, void *context, void *gradien re = (Render_Engine *)data; if (!gradient) - gradient = gradient_new(); - gradient_color_add(gradient, r, g, b, a, distance); + gradient = evas_common_gradient_new(); + evas_common_gradient_color_add(gradient, r, g, b, a, distance); return gradient; context = NULL; } @@ -699,7 +699,7 @@ evas_engine_directfb_gradient_colors_clear(void *data, void *context, void *grad Render_Engine *re; re = (Render_Engine *)data; - if (gradient) gradient_free(gradient); + if (gradient) evas_common_gradient_free(gradient); return NULL; context = NULL; } @@ -718,10 +718,10 @@ evas_engine_directfb_gradient_draw(void *data, void *context, void *surface, voi surf = (IDirectFBSurface *)im->image->data; surf->Lock(surf, DSLF_WRITE, &p, & pitch); im->image->data = p; - gradient_draw(im, context, x, y, w, h, gradient, angle); + evas_common_gradient_draw(im, context, x, y, w, h, gradient, angle); surf->Unlock(surf); im->image->data = (void *)surf; - cpu_end_opt(); + evas_common_cpu_end_opt(); } @@ -739,7 +739,7 @@ evas_engine_directfb_font_load(void *data, char *name, int size) Render_Engine *re; re = (Render_Engine *) data; - return font_load(name, size); + return evas_common_font_load(name, size); } void @@ -748,7 +748,7 @@ evas_engine_directfb_font_free(void *data, void *font) Render_Engine *re; re = (Render_Engine *) data; - font_free(font); + evas_common_font_free(font); } int @@ -757,7 +757,7 @@ evas_engine_directfb_font_ascent_get(void *data, void *font) Render_Engine *re; re = (Render_Engine *) data; - return font_ascent_get(font); + return evas_common_font_ascent_get(font); } int @@ -766,7 +766,7 @@ evas_engine_directfb_font_descent_get(void *data, void *font) Render_Engine *re; re = (Render_Engine *) data; - return font_descent_get(font); + return evas_common_font_descent_get(font); } int @@ -775,7 +775,7 @@ evas_engine_directfb_font_max_ascent_get(void *data, void *font) Render_Engine *re; re = (Render_Engine *) data; - return font_max_ascent_get(font); + return evas_common_font_max_ascent_get(font); } int @@ -784,7 +784,7 @@ evas_engine_directfb_font_max_descent_get(void *data, void *font) Render_Engine *re; re = (Render_Engine *) data; - return font_max_descent_get(font); + return evas_common_font_max_descent_get(font); } void @@ -794,7 +794,7 @@ evas_engine_directfb_font_string_size_get(void *data, void *font, char *text, Render_Engine *re; re = (Render_Engine *) data; - font_query_size(font, text, w, h); + evas_common_font_query_size(font, text, w, h); } int @@ -803,7 +803,7 @@ evas_engine_directfb_font_inset_get(void *data, void *font, char *text) Render_Engine *re; re = (Render_Engine *) data; - return font_query_inset(font, text); + return evas_common_font_query_inset(font, text); } int @@ -813,7 +813,7 @@ evas_engine_directfb_font_h_advance_get(void *data, void *font, char *text) int h, v; re = (Render_Engine *) data; - font_query_advance(font, text, &h, &v); + evas_common_font_query_advance(font, text, &h, &v); return h; } @@ -824,7 +824,7 @@ evas_engine_directfb_font_v_advance_get(void *data, void *font, char *text) int h, v; re = (Render_Engine *) data; - font_query_advance(font, text, &h, &v); + evas_common_font_query_advance(font, text, &h, &v); return v; } @@ -836,7 +836,7 @@ evas_engine_directfb_font_char_coords_get(void *data, void *font, char *text, Render_Engine *re; re = (Render_Engine *) data; - return font_query_char_coords(font, text, pos, cx, cy, cw, ch); + return evas_common_font_query_char_coords(font, text, pos, cx, cy, cw, ch); } int @@ -847,7 +847,7 @@ evas_engine_directfb_font_char_at_coords_get(void *data, void *font, char *text, Render_Engine *re; re = (Render_Engine *) data; - return font_query_text_at_pos(font, text, x, y, cx, cy, cw, ch); + return evas_common_font_query_text_at_pos(font, text, x, y, cx, cy, cw, ch); } void @@ -867,20 +867,20 @@ evas_engine_directfb_font_draw(void *data, void *context, void *surface, surf->Lock(surf, DSLF_WRITE, &p, &pitch); im->image->data = p; if ((w == ow) && (h == oh)) - font_draw(im, context, font, x, y, text); + evas_common_font_draw(im, context, font, x, y, text); else { /* create output surface size ow x oh and scale to w x h */ RGBA_Draw_Context *dc, *dc_in; dc_in = context; - dc = draw_context_new(); + dc = evas_common_draw_context_new(); if (dc) { RGBA_Image *im; dc->col.col = dc_in->col.col; - im = image_create(ow, oh); + im = evas_common_image_create(ow, oh); if (im) { int max_ascent; @@ -890,23 +890,23 @@ evas_engine_directfb_font_draw(void *data, void *context, void *surface, j = ow * oh; for (i = 0; i < j; i++) im->image->data[i] = (dc->col.col & 0xffffff); - max_ascent = font_max_ascent_get(font); + max_ascent = evas_common_font_max_ascent_get(font); - font_draw(im, dc, font, 0, max_ascent, text); - cpu_end_opt(); - scale_rgba_in_to_out_clip_smooth(im, surface, context, + evas_common_font_draw(im, dc, font, 0, max_ascent, text); + evas_common_cpu_end_opt(); + evas_common_scale_rgba_in_to_out_clip_smooth(im, surface, context, 0, 0, ow, oh, x, y - ((max_ascent * h) / oh), w, h); - image_free(im); + evas_common_image_free(im); } - draw_context_free(dc); + evas_common_draw_context_free(dc); } } surf->Unlock(surf); im->image->data = (void *)surf; - cpu_end_opt(); + evas_common_cpu_end_opt(); } void @@ -915,7 +915,7 @@ evas_engine_directfb_font_cache_flush(void *data) Render_Engine *re; re = (Render_Engine *) data; - font_flush(); + evas_common_font_flush(); } void @@ -924,7 +924,7 @@ evas_engine_directfb_font_cache_set(void *data, int bytes) Render_Engine *re; re = (Render_Engine *) data; - font_cache_set(bytes); + evas_common_font_cache_set(bytes); } int @@ -933,6 +933,6 @@ evas_engine_directfb_font_cache_get(void *data) Render_Engine *re; re = (Render_Engine *) data; - return font_cache_get(); + return evas_common_font_cache_get(); } diff --git a/legacy/evas/src/lib/engines/directfb/evas_engine_dfb_image_objects.c b/legacy/evas/src/lib/engines/directfb/evas_engine_dfb_image_objects.c index d06e73b95d..ab51125458 100644 --- a/legacy/evas/src/lib/engines/directfb/evas_engine_dfb_image_objects.c +++ b/legacy/evas/src/lib/engines/directfb/evas_engine_dfb_image_objects.c @@ -62,8 +62,8 @@ evas_engine_directfb_image_load(void *data, char *file, char *key, int *error) provider->RenderTo(provider, image, NULL); provider->Release(provider); - im = image_new(); - im->image = image_surface_new(); + im = evas_common_image_new(); + im->image = evas_common_image_surface_new(); if (!im->image) { _dfb_image_free(im); @@ -167,7 +167,7 @@ evas_engine_directfb_image_size_set(void *data, void *image, int w, int h) new_surf = (IDirectFBSurface *) im->image->data; new_surf->StretchBlit(new_surf, old_surf, NULL, &outrect); } - cpu_end_opt; + evas_common_cpu_end_opt; _dfb_image_unref(im_old); return im; @@ -461,7 +461,7 @@ evas_engine_directfb_image_draw(void *data, void *context, void *surface, re->backbuf->StretchBlit(re->backbuf, img, &inrect, &outrect); } - cpu_end_opt(); + evas_common_cpu_end_opt(); } void @@ -542,9 +542,9 @@ _dfb_image_create(Render_Engine *re, int w, int h) DFBSurfaceDescription dsc; IDirectFBSurface *surf; - im = image_new(); + im = evas_common_image_new(); if (!im) return NULL; - im->image = image_surface_new(); + im->image = evas_common_image_surface_new(); if (!im->image) { _dfb_image_free(im); @@ -643,7 +643,7 @@ _dfb_image_cache(RGBA_Image *im) if (im->flags & RGBA_IMAGE_INDEXED) return; im->flags |= RGBA_IMAGE_INDEXED; cache = evas_object_list_prepend(cache, im); - ram = image_ram_usage(im); + ram = evas_common_image_ram_usage(im); cache_usage += ram; _dfb_image_flush_cache(); } @@ -656,7 +656,7 @@ _dfb_image_uncache(RGBA_Image *im) if (!(im->flags & RGBA_IMAGE_INDEXED)) return; im->flags &= ~RGBA_IMAGE_INDEXED; cache = evas_object_list_remove(cache, im); - ram = image_ram_usage(im); + ram = evas_common_image_ram_usage(im); cache_usage -= ram; } diff --git a/legacy/evas/src/lib/engines/fb/evas_engine.c b/legacy/evas/src/lib/engines/fb/evas_engine.c index 23f97e8dba..e6a4b010b1 100644 --- a/legacy/evas/src/lib/engines/fb/evas_engine.c +++ b/legacy/evas/src/lib/engines/fb/evas_engine.c @@ -206,29 +206,29 @@ evas_engine_fb_output_setup(int w, int h, int rot, int vt, int dev, int refresh) re = calloc(1, sizeof(Render_Engine)); /* if we haven't initialized - init (automatic abort if already done) */ - cpu_init(); + evas_common_cpu_init(); - blend_init(); - image_init(); - convert_init(); - scale_init(); - rectangle_init(); - gradient_init(); - polygon_init(); - line_init(); - font_init(); - draw_init(); - tilebuf_init(); + evas_common_blend_init(); + evas_common_image_init(); + evas_common_convert_init(); + evas_common_scale_init(); + evas_common_rectangle_init(); + evas_common_gradient_init(); + evas_common_polygon_init(); + evas_common_line_init(); + evas_common_font_init(); + evas_common_draw_init(); + evas_common_tilebuf_init(); - outbuf_fb_init(); + evas_fb_outbuf_fb_init(); /* get any stored performance metrics from device (xserver) */ - re->ob = outbuf_fb_setup_fb(w, h, rot, OUTBUF_DEPTH_INHERIT, vt, dev, refresh); - re->tb = tilebuf_new(outbuf_fb_get_width(re->ob), outbuf_fb_get_height(re->ob)); + re->ob = evas_fb_outbuf_fb_setup_fb(w, h, rot, OUTBUF_DEPTH_INHERIT, vt, dev, refresh); + re->tb = evas_common_tilebuf_new(evas_fb_outbuf_fb_get_width(re->ob), evas_fb_outbuf_fb_get_height(re->ob)); /* no backbuf! */ - outbuf_fb_set_have_backbuf(re->ob, 0); + evas_fb_outbuf_fb_set_have_backbuf(re->ob, 0); /* in preliminary tests 16x16 gave highest framerates */ - tilebuf_set_tile_size(re->tb, 16, 16); + evas_common_tilebuf_set_tile_size(re->tb, 16, 16); return re; } @@ -238,9 +238,9 @@ evas_engine_fb_output_free(void *data) Render_Engine *re; re = (Render_Engine *)data; - outbuf_fb_free(re->ob); - tilebuf_free(re->tb); - if (re->rects) tilebuf_free_render_rects(re->rects); + evas_fb_outbuf_fb_free(re->ob); + evas_common_tilebuf_free(re->tb); + if (re->rects) evas_common_tilebuf_free_render_rects(re->rects); free(re); } @@ -250,13 +250,13 @@ evas_engine_fb_output_resize(void *data, int w, int h) Render_Engine *re; re = (Render_Engine *)data; - outbuf_fb_reconfigure(re->ob, w, h, - outbuf_fb_get_rot(re->ob), + evas_fb_outbuf_fb_reconfigure(re->ob, w, h, + evas_fb_outbuf_fb_get_rot(re->ob), OUTBUF_DEPTH_INHERIT); - tilebuf_free(re->tb); - re->tb = tilebuf_new(w, h); + evas_common_tilebuf_free(re->tb); + re->tb = evas_common_tilebuf_new(w, h); if (re->tb) - tilebuf_set_tile_size(re->tb, 16, 16); + evas_common_tilebuf_set_tile_size(re->tb, 16, 16); } static void @@ -265,7 +265,7 @@ evas_engine_fb_output_tile_size_set(void *data, int w, int h) Render_Engine *re; re = (Render_Engine *)data; - tilebuf_set_tile_size(re->tb, w, h); + evas_common_tilebuf_set_tile_size(re->tb, w, h); } static void @@ -274,7 +274,7 @@ evas_engine_fb_output_redraws_rect_add(void *data, int x, int y, int w, int h) Render_Engine *re; re = (Render_Engine *)data; - tilebuf_add_redraw(re->tb, x, y, w, h); + evas_common_tilebuf_add_redraw(re->tb, x, y, w, h); } static void @@ -283,7 +283,7 @@ evas_engine_fb_output_redraws_rect_del(void *data, int x, int y, int w, int h) Render_Engine *re; re = (Render_Engine *)data; - tilebuf_del_redraw(re->tb, x, y, w, h); + evas_common_tilebuf_del_redraw(re->tb, x, y, w, h); } static void @@ -292,7 +292,7 @@ evas_engine_fb_output_redraws_clear(void *data) Render_Engine *re; re = (Render_Engine *)data; - tilebuf_clear(re->tb); + evas_common_tilebuf_clear(re->tb); } static void * @@ -311,7 +311,7 @@ evas_engine_fb_output_redraws_next_update_get(void *data, int *x, int *y, int *w } if (!re->rects) { - re->rects = tilebuf_get_render_rects(re->tb); + re->rects = evas_common_tilebuf_get_render_rects(re->tb); re->cur_rect = (Evas_Object_List *)re->rects; } if (!re->cur_rect) return NULL; @@ -320,12 +320,12 @@ evas_engine_fb_output_redraws_next_update_get(void *data, int *x, int *y, int *w re->cur_rect = re->cur_rect->next; if (!re->cur_rect) { - tilebuf_free_render_rects(re->rects); + evas_common_tilebuf_free_render_rects(re->rects); re->rects = NULL; re->end = 1; } - surface = outbuf_fb_new_region_for_update(re->ob, + surface = evas_fb_outbuf_fb_new_region_for_update(re->ob, ux, uy, uw, uh, cx, cy, cw, ch); *x = ux; *y = uy; *w = uw; *h = uh; @@ -338,9 +338,9 @@ evas_engine_fb_output_redraws_next_update_push(void *data, void *surface, int x, Render_Engine *re; re = (Render_Engine *)data; - outbuf_fb_push_updated_region(re->ob, surface, x, y, w, h); - outbuf_fb_free_region_for_update(re->ob, surface); - cpu_end_opt(); + evas_fb_outbuf_fb_push_updated_region(re->ob, surface, x, y, w, h); + evas_fb_outbuf_fb_free_region_for_update(re->ob, surface); + evas_common_cpu_end_opt(); } static void @@ -357,7 +357,7 @@ evas_engine_fb_context_new(void *data) Render_Engine *re; re = (Render_Engine *)data; - return draw_context_new(); + return evas_common_draw_context_new(); } static void @@ -366,7 +366,7 @@ evas_engine_fb_context_free(void *data, void *context) Render_Engine *re; re = (Render_Engine *)data; - draw_context_free(context); + evas_common_draw_context_free(context); } static void @@ -375,7 +375,7 @@ evas_engine_fb_context_clip_set(void *data, void *context, int x, int y, int w, Render_Engine *re; re = (Render_Engine *)data; - draw_context_set_clip(context, x, y, w, h); + evas_common_draw_context_set_clip(context, x, y, w, h); } static void @@ -384,7 +384,7 @@ evas_engine_fb_context_clip_clip(void *data, void *context, int x, int y, int w, Render_Engine *re; re = (Render_Engine *)data; - draw_context_clip_clip(context, x, y, w, h); + evas_common_draw_context_clip_clip(context, x, y, w, h); } static void @@ -393,7 +393,7 @@ evas_engine_fb_context_clip_unset(void *data, void *context) Render_Engine *re; re = (Render_Engine *)data; - draw_context_unset_clip(context); + evas_common_draw_context_unset_clip(context); } static int @@ -415,7 +415,7 @@ evas_engine_fb_context_color_set(void *data, void *context, int r, int g, int b, Render_Engine *re; re = (Render_Engine *)data; - draw_context_set_color(context, r, g, b, a); + evas_common_draw_context_set_color(context, r, g, b, a); } static int @@ -437,7 +437,7 @@ evas_engine_fb_context_multiplier_set(void *data, void *context, int r, int g, i Render_Engine *re; re = (Render_Engine *)data; - draw_context_set_multiplier(context, r, g, b, a); + evas_common_draw_context_set_multiplier(context, r, g, b, a); } static void @@ -446,7 +446,7 @@ evas_engine_fb_context_multiplier_unset(void *data, void *context) Render_Engine *re; re = (Render_Engine *)data; - draw_context_unset_multiplier(context); + evas_common_draw_context_unset_multiplier(context); } static int @@ -468,7 +468,7 @@ evas_engine_fb_context_cutout_add(void *data, void *context, int x, int y, int w Render_Engine *re; re = (Render_Engine *)data; - draw_context_add_cutout(context, x, y, w, h); + evas_common_draw_context_add_cutout(context, x, y, w, h); } static void @@ -477,7 +477,7 @@ evas_engine_fb_context_cutout_clear(void *data, void *context) Render_Engine *re; re = (Render_Engine *)data; - draw_context_clear_cutouts(context); + evas_common_draw_context_clear_cutouts(context); } static void @@ -486,8 +486,8 @@ evas_engine_fb_draw_rectangle(void *data, void *context, void *surface, int x, i Render_Engine *re; re = (Render_Engine *)data; - rectangle_draw(surface, context, x, y, w, h); - cpu_end_opt(); + evas_common_rectangle_draw(surface, context, x, y, w, h); + evas_common_cpu_end_opt(); } static void @@ -496,8 +496,8 @@ evas_engine_fb_line_draw(void *data, void *context, void *surface, int x1, int y Render_Engine *re; re = (Render_Engine *)data; - line_draw(surface, context, x1, y1, x2, y2); - cpu_end_opt(); + evas_common_line_draw(surface, context, x1, y1, x2, y2); + evas_common_cpu_end_opt(); } static void * @@ -506,7 +506,7 @@ evas_engine_fb_polygon_point_add(void *data, void *context, void *polygon, int x Render_Engine *re; re = (Render_Engine *)data; - return polygon_point_add(polygon, x, y); + return evas_common_polygon_point_add(polygon, x, y); context = 0; } @@ -516,7 +516,7 @@ evas_engine_fb_polygon_points_clear(void *data, void *context, void *polygon) Render_Engine *re; re = (Render_Engine *)data; - return polygon_points_clear(polygon); + return evas_common_polygon_points_clear(polygon); context = 0; } @@ -526,8 +526,8 @@ evas_engine_fb_polygon_draw(void *data, void *context, void *surface, void *poly Render_Engine *re; re = (Render_Engine *)data; - polygon_draw(surface, context, polygon); - cpu_end_opt(); + evas_common_polygon_draw(surface, context, polygon); + evas_common_cpu_end_opt(); } static void * @@ -537,8 +537,8 @@ evas_engine_fb_gradient_color_add(void *data, void *context, void *gradient, int re = (Render_Engine *)data; if (!gradient) - gradient = gradient_new(); - gradient_color_add(gradient, r, g, b, a, distance); + gradient = evas_common_gradient_new(); + evas_common_gradient_color_add(gradient, r, g, b, a, distance); return gradient; context = 0; } @@ -549,7 +549,7 @@ evas_engine_fb_gradient_colors_clear(void *data, void *context, void *gradient) Render_Engine *re; re = (Render_Engine *)data; - if (gradient) gradient_free(gradient); + if (gradient) evas_common_gradient_free(gradient); return NULL; context = 0; } @@ -560,8 +560,8 @@ evas_engine_fb_gradient_draw(void *data, void *context, void *surface, void *gra Render_Engine *re; re = (Render_Engine *)data; - gradient_draw(surface, context, x, y, w, h, gradient, angle); - cpu_end_opt(); + evas_common_gradient_draw(surface, context, x, y, w, h, gradient, angle); + evas_common_cpu_end_opt(); } static void * @@ -571,7 +571,7 @@ evas_engine_fb_image_load(void *data, char *file, char *key, int *error) re = (Render_Engine *)data; *error = 0; - return load_image_from_file(file, key); + return evas_common_load_image_from_file(file, key); } static void * @@ -581,11 +581,11 @@ evas_engine_fb_image_new_from_data(void *data, int w, int h, DATA32 *image_data) RGBA_Image *im; re = (Render_Engine *)data; - im = image_new(); - im->image = image_surface_new(); + im = evas_common_image_new(); + im->image = evas_common_image_surface_new(); if (!im->image) { - image_free(im); + evas_common_image_free(im); return NULL; } im->image->w = w; @@ -602,7 +602,7 @@ evas_engine_fb_image_new_from_copied_data(void *data, int w, int h, DATA32 *imag RGBA_Image *im; re = (Render_Engine *)data; - im = image_create(w, h); + im = evas_common_image_create(w, h); if (!im) return NULL; if (image_data) memcpy(im->image->data, image_data, w * h * sizeof(DATA32)); @@ -615,7 +615,7 @@ evas_engine_fb_image_free(void *data, void *image) Render_Engine *re; re = (Render_Engine *)data; - image_unref(image); + evas_common_image_unref(image); } static void @@ -638,17 +638,17 @@ evas_engine_fb_image_size_set(void *data, void *image, int w, int h) re = (Render_Engine *)data; im_old = image; - im = image_create(w, h); + im = evas_common_image_create(w, h); if (!im) return im_old; if (im_old) { - load_image_data_from_file(im_old); + evas_common_load_image_data_from_file(im_old); if (im_old->image->data) { - blit_rectangle(im_old, im, 0, 0, w, h, 0, 0); - cpu_end_opt(); + evas_common_blit_rectangle(im_old, im, 0, 0, w, h, 0, 0); + evas_common_cpu_end_opt(); } - image_unref(im_old); + evas_common_image_unref(im_old); } return im; } @@ -659,7 +659,7 @@ evas_engine_fb_image_dirty_region(void *data, void *image, int x, int y, int w, Render_Engine *re; re = (Render_Engine *)data; - image_dirty(image); + evas_common_image_dirty(image); return image; x = 0; y = 0; @@ -675,22 +675,22 @@ evas_engine_fb_image_data_get(void *data, void *image, int to_write, DATA32 **im re = (Render_Engine *)data; im = image; - load_image_data_from_file(im); + evas_common_load_image_data_from_file(im); if (to_write) { if (im->references > 1) { RGBA_Image *im_new; - im_new = image_create(im->image->w, im->image->h); + im_new = evas_common_image_create(im->image->w, im->image->h); if (!im_new) return im; - blit_rectangle(im, im_new, 0, 0, im->image->w, im->image->h, 0, 0); - cpu_end_opt(); - image_unref(im); + evas_common_blit_rectangle(im, im_new, 0, 0, im->image->w, im->image->h, 0, 0); + evas_common_cpu_end_opt(); + evas_common_image_unref(im); im = im_new; } else - image_dirty(im); + evas_common_image_dirty(im); } *image_data = im->image->data; return im; @@ -710,10 +710,10 @@ evas_engine_fb_image_data_put(void *data, void *image, DATA32 *image_data) w = im->image->w; h = im->image->h; - image_unref(im); + evas_common_image_unref(im); return evas_engine_fb_image_new_from_data(data, w, h, image_data); } - image_dirty(im); + evas_common_image_dirty(im); return im; } @@ -729,16 +729,16 @@ evas_engine_fb_image_alpha_set(void *data, void *image, int has_alpha) { RGBA_Image *im_new; - im_new = image_create(im->image->w, im->image->h); + im_new = evas_common_image_create(im->image->w, im->image->h); if (!im_new) return im; - load_image_data_from_file(im); - blit_rectangle(im, im_new, 0, 0, im->image->w, im->image->h, 0, 0); - cpu_end_opt(); - image_unref(im); + evas_common_load_image_data_from_file(im); + evas_common_blit_rectangle(im, im_new, 0, 0, im->image->w, im->image->h, 0, 0); + evas_common_cpu_end_opt(); + evas_common_image_unref(im); im = im_new; } else - image_dirty(im); + evas_common_image_dirty(im); if (has_alpha) im->flags |= RGBA_IMAGE_HAS_ALPHA; else @@ -765,16 +765,16 @@ evas_engine_fb_image_draw(void *data, void *context, void *surface, void *image, Render_Engine *re; re = (Render_Engine *)data; - load_image_data_from_file(image); + evas_common_load_image_data_from_file(image); if (smooth) - scale_rgba_in_to_out_clip_smooth(image, surface, context, + evas_common_scale_rgba_in_to_out_clip_smooth(image, surface, context, src_x, src_y, src_w, src_h, dst_x, dst_y, dst_w, dst_h); else - scale_rgba_in_to_out_clip_sample(image, surface, context, + evas_common_scale_rgba_in_to_out_clip_sample(image, surface, context, src_x, src_y, src_w, src_h, dst_x, dst_y, dst_w, dst_h); - cpu_end_opt(); + evas_common_cpu_end_opt(); } static char * @@ -808,9 +808,9 @@ evas_engine_fb_image_cache_flush(void *data) int tmp_size; re = (Render_Engine *)data; - tmp_size = image_get_cache(); - image_set_cache(0); - image_set_cache(tmp_size); + tmp_size = evas_common_image_get_cache(); + evas_common_image_set_cache(0); + evas_common_image_set_cache(tmp_size); } static void @@ -819,7 +819,7 @@ evas_engine_fb_image_cache_set(void *data, int bytes) Render_Engine *re; re = (Render_Engine *)data; - image_set_cache(bytes); + evas_common_image_set_cache(bytes); } static int @@ -828,7 +828,7 @@ evas_engine_fb_image_cache_get(void *data) Render_Engine *re; re = (Render_Engine *)data; - return image_get_cache(); + return evas_common_image_get_cache(); } static void * @@ -837,7 +837,7 @@ evas_engine_fb_font_load(void *data, char *name, int size) Render_Engine *re; re = (Render_Engine *)data; - return font_load(name, size); + return evas_common_font_load(name, size); } static void @@ -846,7 +846,7 @@ evas_engine_fb_font_free(void *data, void *font) Render_Engine *re; re = (Render_Engine *)data; - font_free(font); + evas_common_font_free(font); } static int @@ -855,7 +855,7 @@ evas_engine_fb_font_ascent_get(void *data, void *font) Render_Engine *re; re = (Render_Engine *)data; - return font_ascent_get(font); + return evas_common_font_ascent_get(font); } static int @@ -864,7 +864,7 @@ evas_engine_fb_font_descent_get(void *data, void *font) Render_Engine *re; re = (Render_Engine *)data; - return font_descent_get(font); + return evas_common_font_descent_get(font); } static int @@ -873,7 +873,7 @@ evas_engine_fb_font_max_ascent_get(void *data, void *font) Render_Engine *re; re = (Render_Engine *)data; - return font_max_ascent_get(font); + return evas_common_font_max_ascent_get(font); } static int @@ -882,7 +882,7 @@ evas_engine_fb_font_max_descent_get(void *data, void *font) Render_Engine *re; re = (Render_Engine *)data; - return font_max_descent_get(font); + return evas_common_font_max_descent_get(font); } static void @@ -891,7 +891,7 @@ evas_engine_fb_font_string_size_get(void *data, void *font, char *text, int *w, Render_Engine *re; re = (Render_Engine *)data; - font_query_size(font, text, w, h); + evas_common_font_query_size(font, text, w, h); } static int @@ -900,7 +900,7 @@ evas_engine_fb_font_inset_get(void *data, void *font, char *text) Render_Engine *re; re = (Render_Engine *)data; - return font_query_inset(font, text); + return evas_common_font_query_inset(font, text); } static int @@ -910,7 +910,7 @@ evas_engine_fb_font_h_advance_get(void *data, void *font, char *text) int h, v; re = (Render_Engine *)data; - font_query_advance(font, text, &h, &v); + evas_common_font_query_advance(font, text, &h, &v); return h; } @@ -921,7 +921,7 @@ evas_engine_fb_font_v_advance_get(void *data, void *font, char *text) int h, v; re = (Render_Engine *)data; - font_query_advance(font, text, &h, &v); + evas_common_font_query_advance(font, text, &h, &v); return v; } @@ -931,7 +931,7 @@ evas_engine_fb_font_char_coords_get(void *data, void *font, char *text, int pos, Render_Engine *re; re = (Render_Engine *)data; - return font_query_char_coords(font, text, pos, cx, cy, cw, ch); + return evas_common_font_query_char_coords(font, text, pos, cx, cy, cw, ch); } static int @@ -940,7 +940,7 @@ evas_engine_fb_font_char_at_coords_get(void *data, void *font, char *text, int x Render_Engine *re; re = (Render_Engine *)data; - return font_query_text_at_pos(font, text, x, y, cx, cy, cw, ch); + return evas_common_font_query_text_at_pos(font, text, x, y, cx, cy, cw, ch); } static void @@ -950,20 +950,20 @@ evas_engine_fb_font_draw(void *data, void *context, void *surface, void *font, i re = (Render_Engine *)data; if ((w == ow) && (h == oh)) - font_draw(surface, context, font, x, y, text); + evas_common_font_draw(surface, context, font, x, y, text); else { /* create output surface size ow x oh and scale to w x h */ RGBA_Draw_Context *dc, *dc_in; dc_in = context; - dc = draw_context_new(); + dc = evas_common_draw_context_new(); if (dc) { RGBA_Image *im; dc->col.col = dc_in->col.col; - im = image_create(ow, oh); + im = evas_common_image_create(ow, oh); if (im) { int max_ascent; @@ -973,20 +973,20 @@ evas_engine_fb_font_draw(void *data, void *context, void *surface, void *font, i j = ow * oh; for (i = 0; i < j; i++) im->image->data[i] = (dc->col.col & 0xffffff); - max_ascent = font_max_ascent_get(font); + max_ascent = evas_common_font_max_ascent_get(font); - font_draw(im, dc, font, 0, max_ascent, text); - cpu_end_opt(); - scale_rgba_in_to_out_clip_smooth(im, surface, context, + evas_common_font_draw(im, dc, font, 0, max_ascent, text); + evas_common_cpu_end_opt(); + evas_common_scale_rgba_in_to_out_clip_smooth(im, surface, context, 0, 0, ow, oh, x, y - ((max_ascent * h) / oh), w, h); - image_free(im); + evas_common_image_free(im); } - draw_context_free(dc); + evas_common_draw_context_free(dc); } } - cpu_end_opt(); + evas_common_cpu_end_opt(); } static void @@ -995,7 +995,7 @@ evas_engine_fb_font_cache_flush(void *data) Render_Engine *re; re = (Render_Engine *)data; - font_flush(); + evas_common_font_flush(); } static void @@ -1004,7 +1004,7 @@ evas_engine_fb_font_cache_set(void *data, int bytes) Render_Engine *re; re = (Render_Engine *)data; - font_cache_set(bytes); + evas_common_font_cache_set(bytes); } static int @@ -1013,5 +1013,5 @@ evas_engine_fb_font_cache_get(void *data) Render_Engine *re; re = (Render_Engine *)data; - return font_cache_get(); + return evas_common_font_cache_get(); } diff --git a/legacy/evas/src/lib/engines/fb/evas_engine.h b/legacy/evas/src/lib/engines/fb/evas_engine.h index 4e2adad928..381e2e2022 100644 --- a/legacy/evas/src/lib/engines/fb/evas_engine.h +++ b/legacy/evas/src/lib/engines/fb/evas_engine.h @@ -38,22 +38,22 @@ struct _Outbuf /****/ -void outbuf_fb_init (void); -void outbuf_fb_free (Outbuf *buf); +void evas_fb_outbuf_fb_init (void); +void evas_fb_outbuf_fb_free (Outbuf *buf); -Outbuf *outbuf_fb_setup_fb (int w, int h, int rot, Outbuf_Depth depth, int vt_no, int dev_no, int refresh); +Outbuf *evas_fb_outbuf_fb_setup_fb (int w, int h, int rot, Outbuf_Depth depth, int vt_no, int dev_no, int refresh); -void outbuf_fb_blit (Outbuf *buf, int src_x, int src_y, int w, int h, int dst_x, int dst_y); -void outbuf_fb_update (Outbuf *buf, int x, int y, int w, int h); -RGBA_Image *outbuf_fb_new_region_for_update (Outbuf *buf, int x, int y, int w, int h, int *cx, int *cy, int *cw, int *ch); -void outbuf_fb_free_region_for_update (Outbuf *buf, RGBA_Image *update); -void outbuf_fb_push_updated_region (Outbuf *buf, RGBA_Image *update, int x, int y, int w, int h); -void outbuf_fb_reconfigure (Outbuf *buf, int w, int h, int rot, Outbuf_Depth depth); -int outbuf_fb_get_width (Outbuf *buf); -int outbuf_fb_get_height (Outbuf *buf); -Outbuf_Depth outbuf_fb_get_depth (Outbuf *buf); -int outbuf_fb_get_rot (Outbuf *buf); -int outbuf_fb_get_have_backbuf (Outbuf *buf); -void outbuf_fb_set_have_backbuf (Outbuf *buf, int have_backbuf); +void evas_fb_outbuf_fb_blit (Outbuf *buf, int src_x, int src_y, int w, int h, int dst_x, int dst_y); +void evas_fb_outbuf_fb_update (Outbuf *buf, int x, int y, int w, int h); +RGBA_Image *evas_fb_outbuf_fb_new_region_for_update (Outbuf *buf, int x, int y, int w, int h, int *cx, int *cy, int *cw, int *ch); +void evas_fb_outbuf_fb_free_region_for_update (Outbuf *buf, RGBA_Image *update); +void evas_fb_outbuf_fb_push_updated_region (Outbuf *buf, RGBA_Image *update, int x, int y, int w, int h); +void evas_fb_outbuf_fb_reconfigure (Outbuf *buf, int w, int h, int rot, Outbuf_Depth depth); +int evas_fb_outbuf_fb_get_width (Outbuf *buf); +int evas_fb_outbuf_fb_get_height (Outbuf *buf); +Outbuf_Depth evas_fb_outbuf_fb_get_depth (Outbuf *buf); +int evas_fb_outbuf_fb_get_rot (Outbuf *buf); +int evas_fb_outbuf_fb_get_have_backbuf (Outbuf *buf); +void evas_fb_outbuf_fb_set_have_backbuf (Outbuf *buf, int have_backbuf); #endif diff --git a/legacy/evas/src/lib/engines/fb/evas_outbuf.c b/legacy/evas/src/lib/engines/fb/evas_outbuf.c index 8f201ef00b..fd1cdb7d5f 100644 --- a/legacy/evas/src/lib/engines/fb/evas_outbuf.c +++ b/legacy/evas/src/lib/engines/fb/evas_outbuf.c @@ -4,22 +4,22 @@ #include void -outbuf_fb_init(void) +evas_fb_outbuf_fb_init(void) { } void -outbuf_fb_free(Outbuf *buf) +evas_fb_outbuf_fb_free(Outbuf *buf) { /* FIXME: impliment */ printf("destroying fb info.. not implemented!!!! WARNING. LEAK!\n"); if (buf->priv.back_buf) - image_free(buf->priv.back_buf); + evas_common_image_free(buf->priv.back_buf); free(buf); } Outbuf * -outbuf_fb_setup_fb(int w, int h, int rot, Outbuf_Depth depth, int vt_no, int dev_no, int refresh) +evas_fb_outbuf_fb_setup_fb(int w, int h, int rot, Outbuf_Depth depth, int vt_no, int dev_no, int refresh) { /* create outbuf struct */ /* setup window and/or fb */ @@ -89,7 +89,7 @@ outbuf_fb_setup_fb(int w, int h, int rot, Outbuf_Depth depth, int vt_no, int dev conv_func = NULL; if (buf->rot == 0) - conv_func = convert_func_get(0, buf->w, buf->h, + conv_func = evas_common_convert_func_get(0, buf->w, buf->h, buf->priv.fb.fb->fb_var.bits_per_pixel, buf->priv.mask.r, buf->priv.mask.g, @@ -97,7 +97,7 @@ outbuf_fb_setup_fb(int w, int h, int rot, Outbuf_Depth depth, int vt_no, int dev PAL_MODE_NONE, buf->rot); else if (buf->rot == 270) - conv_func = convert_func_get(0, buf->h, buf->w, + conv_func = evas_common_convert_func_get(0, buf->h, buf->w, buf->priv.fb.fb->fb_var.bits_per_pixel, buf->priv.mask.r, buf->priv.mask.g, @@ -105,7 +105,7 @@ outbuf_fb_setup_fb(int w, int h, int rot, Outbuf_Depth depth, int vt_no, int dev PAL_MODE_NONE, buf->rot); else if (buf->rot == 90) - conv_func = convert_func_get(0, buf->h, buf->w, + conv_func = evas_common_convert_func_get(0, buf->h, buf->w, buf->priv.fb.fb->fb_var.bits_per_pixel, buf->priv.mask.r, buf->priv.mask.g, @@ -119,19 +119,19 @@ outbuf_fb_setup_fb(int w, int h, int rot, Outbuf_Depth depth, int vt_no, int dev } } if (buf->priv.fb.fb->fb_var.bits_per_pixel < 24) - buf->priv.back_buf = image_create(buf->w, buf->h); + buf->priv.back_buf = evas_common_image_create(buf->w, buf->h); return buf; } void -outbuf_fb_blit(Outbuf *buf, int src_x, int src_y, int w, int h, int dst_x, int dst_y) +evas_fb_outbuf_fb_blit(Outbuf *buf, int src_x, int src_y, int w, int h, int dst_x, int dst_y) { if (buf->priv.back_buf) { - blit_rectangle(buf->priv.back_buf, buf->priv.back_buf, + evas_common_blit_rectangle(buf->priv.back_buf, buf->priv.back_buf, src_x, src_y, w, h, dst_x, dst_y); - outbuf_fb_update(buf, dst_x, dst_y, w, h); + evas_fb_outbuf_fb_update(buf, dst_x, dst_y, w, h); } else { @@ -143,7 +143,7 @@ outbuf_fb_blit(Outbuf *buf, int src_x, int src_y, int w, int h, int dst_x, int d } void -outbuf_fb_update(Outbuf *buf, int x, int y, int w, int h) +evas_fb_outbuf_fb_update(Outbuf *buf, int x, int y, int w, int h) { if (!(buf->priv.back_buf)) return; if (buf->priv.fb.fb) @@ -158,7 +158,7 @@ outbuf_fb_update(Outbuf *buf, int x, int y, int w, int h) data = (DATA8 *)buf->priv.fb.fb->mem + buf->priv.fb.fb->mem_offset + buf->priv.fb.fb->bpp * (x + (y * buf->priv.fb.fb->width)); - conv_func = convert_func_get(data, w, h, buf->priv.fb.fb->fb_var.bits_per_pixel, + conv_func = evas_common_convert_func_get(data, w, h, buf->priv.fb.fb->fb_var.bits_per_pixel, buf->priv.mask.r, buf->priv.mask.g, buf->priv.mask.b, PAL_MODE_NONE, buf->rot); @@ -168,7 +168,7 @@ outbuf_fb_update(Outbuf *buf, int x, int y, int w, int h) data = (DATA8 *)buf->priv.fb.fb->mem + buf->priv.fb.fb->mem_offset + buf->priv.fb.fb->bpp * (buf->h - y - h + (x * buf->priv.fb.fb->width)); - conv_func = convert_func_get(data, h, w, buf->priv.fb.fb->fb_var.bits_per_pixel, + conv_func = evas_common_convert_func_get(data, h, w, buf->priv.fb.fb->fb_var.bits_per_pixel, buf->priv.mask.r, buf->priv.mask.g, buf->priv.mask.b, PAL_MODE_NONE, buf->rot); @@ -178,7 +178,7 @@ outbuf_fb_update(Outbuf *buf, int x, int y, int w, int h) data = (DATA8 *)buf->priv.fb.fb->mem + buf->priv.fb.fb->mem_offset + buf->priv.fb.fb->bpp * (y + ((buf->w - x - w) * buf->priv.fb.fb->width)); - conv_func = convert_func_get(data, h, w, buf->priv.fb.fb->fb_var.bits_per_pixel, + conv_func = evas_common_convert_func_get(data, h, w, buf->priv.fb.fb->fb_var.bits_per_pixel, buf->priv.mask.r, buf->priv.mask.g, buf->priv.mask.b, PAL_MODE_NONE, buf->rot); @@ -217,7 +217,7 @@ outbuf_fb_update(Outbuf *buf, int x, int y, int w, int h) } RGBA_Image * -outbuf_fb_new_region_for_update(Outbuf *buf, int x, int y, int w, int h, int *cx, int *cy, int *cw, int *ch) +evas_fb_outbuf_fb_new_region_for_update(Outbuf *buf, int x, int y, int w, int h, int *cx, int *cy, int *cw, int *ch) { if (buf->priv.back_buf) { @@ -229,28 +229,28 @@ outbuf_fb_new_region_for_update(Outbuf *buf, int x, int y, int w, int h, int *cx RGBA_Image *im; *cx = 0; *cy = 0; *cw = w; *ch = h; - im = image_create(w, h); + im = evas_common_image_create(w, h); return im; } return NULL; } void -outbuf_fb_free_region_for_update(Outbuf *buf, RGBA_Image *update) +evas_fb_outbuf_fb_free_region_for_update(Outbuf *buf, RGBA_Image *update) { - if (update != buf->priv.back_buf) image_free(update); + if (update != buf->priv.back_buf) evas_common_image_free(update); } void -outbuf_fb_push_updated_region(Outbuf *buf, RGBA_Image *update, int x, int y, int w, int h) +evas_fb_outbuf_fb_push_updated_region(Outbuf *buf, RGBA_Image *update, int x, int y, int w, int h) { if (!buf->priv.fb.fb) return; if (buf->priv.back_buf) { if (update != buf->priv.back_buf) - blit_rectangle(update, buf->priv.back_buf, + evas_common_blit_rectangle(update, buf->priv.back_buf, 0, 0, w, h, x, y); - outbuf_fb_update(buf, x, y, w, h); + evas_fb_outbuf_fb_update(buf, x, y, w, h); } else { @@ -265,7 +265,7 @@ outbuf_fb_push_updated_region(Outbuf *buf, RGBA_Image *update, int x, int y, int buf->priv.fb.fb->mem_offset + buf->priv.fb.fb->bpp * (x + (y * buf->priv.fb.fb->width)); - conv_func = convert_func_get(data, w, h, + conv_func = evas_common_convert_func_get(data, w, h, buf->priv.fb.fb->fb_var.bits_per_pixel, buf->priv.mask.r, buf->priv.mask.g, buf->priv.mask.b, PAL_MODE_NONE, @@ -277,7 +277,7 @@ outbuf_fb_push_updated_region(Outbuf *buf, RGBA_Image *update, int x, int y, int buf->priv.fb.fb->mem_offset + buf->priv.fb.fb->bpp * (buf->h - y - h + (x * buf->priv.fb.fb->width)); - conv_func = convert_func_get(data, h, w, + conv_func = evas_common_convert_func_get(data, h, w, buf->priv.fb.fb->fb_var.bits_per_pixel, buf->priv.mask.r, buf->priv.mask.g, buf->priv.mask.b, PAL_MODE_NONE, @@ -289,7 +289,7 @@ outbuf_fb_push_updated_region(Outbuf *buf, RGBA_Image *update, int x, int y, int buf->priv.fb.fb->mem_offset + buf->priv.fb.fb->bpp * (y + ((buf->w - x - w) * buf->priv.fb.fb->width)); - conv_func = convert_func_get(data, h, w, + conv_func = evas_common_convert_func_get(data, h, w, buf->priv.fb.fb->fb_var.bits_per_pixel, buf->priv.mask.r, buf->priv.mask.g, buf->priv.mask.b, PAL_MODE_NONE, @@ -329,14 +329,14 @@ outbuf_fb_push_updated_region(Outbuf *buf, RGBA_Image *update, int x, int y, int } void -outbuf_fb_reconfigure(Outbuf *buf, int w, int h, int rot, Outbuf_Depth depth) +evas_fb_outbuf_fb_reconfigure(Outbuf *buf, int w, int h, int rot, Outbuf_Depth depth) { if ((w == buf->w) && (h == buf->h) && (rot == buf->rot) && (depth == buf->depth)) return; if (buf->priv.back_buf) { - image_free(buf->priv.back_buf); + evas_common_image_free(buf->priv.back_buf); buf->priv.back_buf = NULL; } if (buf->priv.fb.fb) @@ -349,43 +349,43 @@ outbuf_fb_reconfigure(Outbuf *buf, int w, int h, int rot, Outbuf_Depth depth) } int -outbuf_fb_get_width(Outbuf *buf) +evas_fb_outbuf_fb_get_width(Outbuf *buf) { return buf->w; } int -outbuf_fb_get_height(Outbuf *buf) +evas_fb_outbuf_fb_get_height(Outbuf *buf) { return buf->h; } Outbuf_Depth -outbuf_fb_get_depth(Outbuf *buf) +evas_fb_outbuf_fb_get_depth(Outbuf *buf) { return buf->depth; } int -outbuf_fb_get_rot(Outbuf *buf) +evas_fb_outbuf_fb_get_rot(Outbuf *buf) { return buf->rot; } int -outbuf_fb_get_have_backbuf(Outbuf *buf) +evas_fb_outbuf_fb_get_have_backbuf(Outbuf *buf) { if (buf->priv.back_buf) return 1; return 0; } void -outbuf_fb_set_have_backbuf(Outbuf *buf, int have_backbuf) +evas_fb_outbuf_fb_set_have_backbuf(Outbuf *buf, int have_backbuf) { if (buf->priv.back_buf) { if (have_backbuf) return; - image_free(buf->priv.back_buf); + evas_common_image_free(buf->priv.back_buf); buf->priv.back_buf = NULL; } else @@ -395,7 +395,7 @@ outbuf_fb_set_have_backbuf(Outbuf *buf, int have_backbuf) { if (buf->priv.fb.fb->fb_var.bits_per_pixel < 24) { - buf->priv.back_buf = image_create(buf->w, buf->h); + buf->priv.back_buf = evas_common_image_create(buf->w, buf->h); } } } diff --git a/legacy/evas/src/lib/engines/gl_x11/evas_engine.c b/legacy/evas/src/lib/engines/gl_x11/evas_engine.c index 57b6397336..99de8e64c8 100644 --- a/legacy/evas/src/lib/engines/gl_x11/evas_engine.c +++ b/legacy/evas/src/lib/engines/gl_x11/evas_engine.c @@ -212,19 +212,19 @@ evas_engine_gl_x11_output_setup(int w, int h, int rot, Display *disp, Drawable d re = calloc(1, sizeof(Render_Engine)); /* if we haven't initialized - init (automatic abort if already done) */ - cpu_init(); + evas_common_cpu_init(); - blend_init(); - image_init(); - convert_init(); - scale_init(); - rectangle_init(); - gradient_init(); - polygon_init(); - line_init(); - font_init(); - draw_init(); - tilebuf_init(); + evas_common_blend_init(); + evas_common_image_init(); + evas_common_convert_init(); + evas_common_scale_init(); + evas_common_rectangle_init(); + evas_common_gradient_init(); + evas_common_polygon_init(); + evas_common_line_init(); + evas_common_font_init(); + evas_common_draw_init(); + evas_common_tilebuf_init(); evas_gl_x11_init(); diff --git a/legacy/evas/src/lib/engines/software_qtopia/evas_engine.c b/legacy/evas/src/lib/engines/software_qtopia/evas_engine.c index e869b27f4a..ef18d3fec2 100644 --- a/legacy/evas/src/lib/engines/software_qtopia/evas_engine.c +++ b/legacy/evas/src/lib/engines/software_qtopia/evas_engine.c @@ -212,39 +212,39 @@ evas_engine_software_qtopia_output_setup(int w, int h, int rot, QWidget *target) re = calloc(1, sizeof(Render_Engine)); /* if we haven't initialized - init (automatic abort if already done) */ - cpu_init(); + evas_common_cpu_init(); - blend_init(); - image_init(); - convert_init(); - scale_init(); - rectangle_init(); - gradient_init(); - polygon_init(); - line_init(); - font_init(); - draw_init(); - tilebuf_init(); + evas_common_blend_init(); + evas_common_image_init(); + evas_common_convert_init(); + evas_common_scale_init(); + evas_common_rectangle_init(); + evas_common_gradient_init(); + evas_common_polygon_init(); + evas_common_line_init(); + evas_common_font_init(); + evas_common_draw_init(); + evas_common_tilebuf_init(); - outbuf_software_qtopia_init(); + evas_qtopia_outbuf_software_qtopia_init(); /* get any stored performance metrics from device (xserver) */ - re->ob = outbuf_software_qtopia_setup_q(w, h, rot, OUTBUF_DEPTH_INHERIT, target); + re->ob = evas_qtopia_outbuf_software_qtopia_setup_q(w, h, rot, OUTBUF_DEPTH_INHERIT, target); if (!re->ob) { free(re); return NULL; } - outbuf_software_qtopia_set_have_backbuf(re->ob, 0); - re->tb = tilebuf_new(w, h); + evas_qtopia_outbuf_software_qtopia_set_have_backbuf(re->ob, 0); + re->tb = evas_common_tilebuf_new(w, h); if (!re->tb) { - outbuf_software_qtopia_free(re->ob); + evas_qtopia_outbuf_software_qtopia_free(re->ob); free(re); return NULL; } /* in preliminary tests 16x16 gave highest framerates */ - tilebuf_set_tile_size(re->tb, 16, 16); + evas_common_tilebuf_set_tile_size(re->tb, 16, 16); return re; } @@ -254,9 +254,9 @@ evas_engine_software_qtopia_output_free(void *data) Render_Engine *re; re = (Render_Engine *)data; - outbuf_software_qtopia_free(re->ob); - tilebuf_free(re->tb); - if (re->rects) tilebuf_free_render_rects(re->rects); + evas_qtopia_outbuf_software_qtopia_free(re->ob); + evas_common_tilebuf_free(re->tb); + if (re->rects) evas_common_tilebuf_free_render_rects(re->rects); free(re); } @@ -266,14 +266,14 @@ evas_engine_software_qtopia_output_resize(void *data, int w, int h) Render_Engine *re; re = (Render_Engine *)data; - outbuf_software_qtopia_reconfigure(re->ob, w, h, - outbuf_software_qtopia_get_rot(re->ob), + evas_qtopia_outbuf_software_qtopia_reconfigure(re->ob, w, h, + evas_qtopia_outbuf_software_qtopia_get_rot(re->ob), OUTBUF_DEPTH_INHERIT); - outbuf_software_qtopia_set_have_backbuf(re->ob, 0); - tilebuf_free(re->tb); - re->tb = tilebuf_new(w, h); + evas_qtopia_outbuf_software_qtopia_set_have_backbuf(re->ob, 0); + evas_common_tilebuf_free(re->tb); + re->tb = evas_common_tilebuf_new(w, h); if (re->tb) - tilebuf_set_tile_size(re->tb, 16, 16); + evas_common_tilebuf_set_tile_size(re->tb, 16, 16); } static void @@ -282,7 +282,7 @@ evas_engine_software_qtopia_output_tile_size_set(void *data, int w, int h) Render_Engine *re; re = (Render_Engine *)data; - tilebuf_set_tile_size(re->tb, w, h); + evas_common_tilebuf_set_tile_size(re->tb, w, h); } static void @@ -291,7 +291,7 @@ evas_engine_software_qtopia_output_redraws_rect_add(void *data, int x, int y, in Render_Engine *re; re = (Render_Engine *)data; - tilebuf_add_redraw(re->tb, x, y, w, h); + evas_common_tilebuf_add_redraw(re->tb, x, y, w, h); } static void @@ -300,7 +300,7 @@ evas_engine_software_qtopia_output_redraws_rect_del(void *data, int x, int y, in Render_Engine *re; re = (Render_Engine *)data; - tilebuf_del_redraw(re->tb, x, y, w, h); + evas_common_tilebuf_del_redraw(re->tb, x, y, w, h); } static void @@ -309,7 +309,7 @@ evas_engine_software_qtopia_output_redraws_clear(void *data) Render_Engine *re; re = (Render_Engine *)data; - tilebuf_clear(re->tb); + evas_common_tilebuf_clear(re->tb); } static void * @@ -328,7 +328,7 @@ evas_engine_software_qtopia_output_redraws_next_update_get(void *data, int *x, i } if (!re->rects) { - re->rects = tilebuf_get_render_rects(re->tb); + re->rects = evas_common_tilebuf_get_render_rects(re->tb); re->cur_rect = (Evas_Object_List *)re->rects; } if (!re->cur_rect) return NULL; @@ -337,12 +337,12 @@ evas_engine_software_qtopia_output_redraws_next_update_get(void *data, int *x, i re->cur_rect = re->cur_rect->next; if (!re->cur_rect) { - tilebuf_free_render_rects(re->rects); + evas_common_tilebuf_free_render_rects(re->rects); re->rects = NULL; re->end = 1; } - surface = outbuf_software_qtopia_new_region_for_update(re->ob, + surface = evas_qtopia_outbuf_software_qtopia_new_region_for_update(re->ob, ux, uy, uw, uh, cx, cy, cw, ch); *x = ux; *y = uy; *w = uw; *h = uh; @@ -356,9 +356,9 @@ evas_engine_software_qtopia_output_redraws_next_update_push(void *data, void *su Evas_Engine_Info_Software_Qtopia *info; re = (Render_Engine *)data; - outbuf_software_qtopia_push_updated_region(re->ob, surface, x, y, w, h); - outbuf_software_qtopia_free_region_for_update(re->ob, surface); - cpu_end_opt(); + evas_qtopia_outbuf_software_qtopia_push_updated_region(re->ob, surface, x, y, w, h); + evas_qtopia_outbuf_software_qtopia_free_region_for_update(re->ob, surface); + evas_common_cpu_end_opt(); } static void @@ -375,7 +375,7 @@ evas_engine_software_qtopia_context_new(void *data) Render_Engine *re; re = (Render_Engine *)data; - return draw_context_new(); + return evas_common_draw_context_new(); } static void @@ -384,7 +384,7 @@ evas_engine_software_qtopia_context_free(void *data, void *context) Render_Engine *re; re = (Render_Engine *)data; - draw_context_free(context); + evas_common_draw_context_free(context); } static void @@ -393,7 +393,7 @@ evas_engine_software_qtopia_context_clip_set(void *data, void *context, int x, i Render_Engine *re; re = (Render_Engine *)data; - draw_context_set_clip(context, x, y, w, h); + evas_common_draw_context_set_clip(context, x, y, w, h); } static void @@ -402,7 +402,7 @@ evas_engine_software_qtopia_context_clip_clip(void *data, void *context, int x, Render_Engine *re; re = (Render_Engine *)data; - draw_context_clip_clip(context, x, y, w, h); + evas_common_draw_context_clip_clip(context, x, y, w, h); } static void @@ -411,7 +411,7 @@ evas_engine_software_qtopia_context_clip_unset(void *data, void *context) Render_Engine *re; re = (Render_Engine *)data; - draw_context_unset_clip(context); + evas_common_draw_context_unset_clip(context); } static int @@ -433,7 +433,7 @@ evas_engine_software_qtopia_context_color_set(void *data, void *context, int r, Render_Engine *re; re = (Render_Engine *)data; - draw_context_set_color(context, r, g, b, a); + evas_common_draw_context_set_color(context, r, g, b, a); } static int @@ -455,7 +455,7 @@ evas_engine_software_qtopia_context_multiplier_set(void *data, void *context, in Render_Engine *re; re = (Render_Engine *)data; - draw_context_set_multiplier(context, r, g, b, a); + evas_common_draw_context_set_multiplier(context, r, g, b, a); } static void @@ -464,7 +464,7 @@ evas_engine_software_qtopia_context_multiplier_unset(void *data, void *context) Render_Engine *re; re = (Render_Engine *)data; - draw_context_unset_multiplier(context); + evas_common_draw_context_unset_multiplier(context); } static int @@ -486,7 +486,7 @@ evas_engine_software_qtopia_context_cutout_add(void *data, void *context, int x, Render_Engine *re; re = (Render_Engine *)data; - draw_context_add_cutout(context, x, y, w, h); + evas_common_draw_context_add_cutout(context, x, y, w, h); } static void @@ -495,7 +495,7 @@ evas_engine_software_qtopia_context_cutout_clear(void *data, void *context) Render_Engine *re; re = (Render_Engine *)data; - draw_context_clear_cutouts(context); + evas_common_draw_context_clear_cutouts(context); } @@ -509,8 +509,8 @@ evas_engine_software_qtopia_rectangle_draw(void *data, void *context, void *surf Render_Engine *re; re = (Render_Engine *)data; - rectangle_draw(surface, context, x, y, w, h); - cpu_end_opt(); + evas_common_rectangle_draw(surface, context, x, y, w, h); + evas_common_cpu_end_opt(); } static void @@ -519,8 +519,8 @@ evas_engine_software_qtopia_line_draw(void *data, void *context, void *surface, Render_Engine *re; re = (Render_Engine *)data; - line_draw(surface, context, x1, y1, x2, y2); - cpu_end_opt(); + evas_common_line_draw(surface, context, x1, y1, x2, y2); + evas_common_cpu_end_opt(); } static void * @@ -529,7 +529,7 @@ evas_engine_software_qtopia_polygon_point_add(void *data, void *context, void *p Render_Engine *re; re = (Render_Engine *)data; - return polygon_point_add(polygon, x, y); + return evas_common_polygon_point_add(polygon, x, y); context = NULL; } @@ -539,7 +539,7 @@ evas_engine_software_qtopia_polygon_points_clear(void *data, void *context, void Render_Engine *re; re = (Render_Engine *)data; - return polygon_points_clear(polygon); + return evas_common_polygon_points_clear(polygon); context = NULL; } @@ -549,8 +549,8 @@ evas_engine_software_qtopia_polygon_draw(void *data, void *context, void *surfac Render_Engine *re; re = (Render_Engine *)data; - polygon_draw(surface, context, polygon); - cpu_end_opt(); + evas_common_polygon_draw(surface, context, polygon); + evas_common_cpu_end_opt(); } static void * @@ -560,8 +560,8 @@ evas_engine_software_qtopia_gradient_color_add(void *data, void *context, void * re = (Render_Engine *)data; if (!gradient) - gradient = gradient_new(); - gradient_color_add(gradient, r, g, b, a, distance); + gradient = evas_common_gradient_new(); + evas_common_gradient_color_add(gradient, r, g, b, a, distance); return gradient; context = NULL; } @@ -572,7 +572,7 @@ evas_engine_software_qtopia_gradient_colors_clear(void *data, void *context, voi Render_Engine *re; re = (Render_Engine *)data; - if (gradient) gradient_free(gradient); + if (gradient) evas_common_gradient_free(gradient); return NULL; context = NULL; } @@ -583,8 +583,8 @@ evas_engine_software_qtopia_gradient_draw(void *data, void *context, void *surfa Render_Engine *re; re = (Render_Engine *)data; - gradient_draw(surface, context, x, y, w, h, gradient, angle); - cpu_end_opt(); + evas_common_gradient_draw(surface, context, x, y, w, h, gradient, angle); + evas_common_cpu_end_opt(); } static void * @@ -594,7 +594,7 @@ evas_engine_software_qtopia_image_load(void *data, char *file, char *key, int *e re = (Render_Engine *)data; *error = 0; - return load_image_from_file(file, key); + return evas_common_load_image_from_file(file, key); } static void * @@ -604,11 +604,11 @@ evas_engine_software_qtopia_image_new_from_data(void *data, int w, int h, DATA32 RGBA_Image *im; re = (Render_Engine *)data; - im = image_new(); - im->image = image_surface_new(); + im = evas_common_image_new(); + im->image = evas_common_image_surface_new(); if (!im->image) { - image_free(im); + evas_common_image_free(im); return NULL; } im->image->w = w; @@ -625,7 +625,7 @@ evas_engine_software_qtopia_image_new_from_copied_data(void *data, int w, int h, RGBA_Image *im; re = (Render_Engine *)data; - im = image_create(w, h); + im = evas_common_image_create(w, h); if (!im) return NULL; if (image_data) memcpy(im->image->data, image_data, w * h * sizeof(DATA32)); @@ -638,7 +638,7 @@ evas_engine_software_qtopia_image_free(void *data, void *image) Render_Engine *re; re = (Render_Engine *)data; - image_unref(image); + evas_common_image_unref(image); } static void @@ -661,17 +661,17 @@ evas_engine_software_qtopia_image_size_set(void *data, void *image, int w, int h re = (Render_Engine *)data; im_old = image; - im = image_create(w, h); + im = evas_common_image_create(w, h); if (!im) return im_old; if (im_old) { - load_image_data_from_file(im_old); + evas_common_load_image_data_from_file(im_old); if (im_old->image->data) { - blit_rectangle(im_old, im, 0, 0, w, h, 0, 0); - cpu_end_opt(); + evas_common_blit_rectangle(im_old, im, 0, 0, w, h, 0, 0); + evas_common_cpu_end_opt(); } - image_unref(im_old); + evas_common_image_unref(im_old); } return im; } @@ -682,7 +682,7 @@ evas_engine_software_qtopia_image_dirty_region(void *data, void *image, int x, i Render_Engine *re; re = (Render_Engine *)data; - image_dirty(image); + evas_common_image_dirty(image); return image; x = 0; y = 0; @@ -698,22 +698,22 @@ evas_engine_software_qtopia_image_data_get(void *data, void *image, int to_write re = (Render_Engine *)data; im = image; - load_image_data_from_file(im); + evas_common_load_image_data_from_file(im); if (to_write) { if (im->references > 1) { RGBA_Image *im_new; - im_new = image_create(im->image->w, im->image->h); + im_new = evas_common_image_create(im->image->w, im->image->h); if (!im_new) return im; - blit_rectangle(im, im_new, 0, 0, im->image->w, im->image->h, 0, 0); - cpu_end_opt(); - image_unref(im); + evas_common_blit_rectangle(im, im_new, 0, 0, im->image->w, im->image->h, 0, 0); + evas_common_cpu_end_opt(); + evas_common_image_unref(im); im = im_new; } else - image_dirty(im); + evas_common_image_dirty(im); } *image_data = im->image->data; return im; @@ -733,10 +733,10 @@ evas_engine_software_qtopia_image_data_put(void *data, void *image, DATA32 *imag w = im->image->w; h = im->image->h; - image_unref(im); + evas_common_image_unref(im); return evas_engine_software_qtopia_image_new_from_data(data, w, h, image_data); } - image_dirty(im); + evas_common_image_dirty(im); return im; } @@ -752,16 +752,16 @@ evas_engine_software_qtopia_image_alpha_set(void *data, void *image, int has_alp { RGBA_Image *im_new; - im_new = image_create(im->image->w, im->image->h); + im_new = evas_common_image_create(im->image->w, im->image->h); if (!im_new) return im; - load_image_data_from_file(im); - blit_rectangle(im, im_new, 0, 0, im->image->w, im->image->h, 0, 0); - cpu_end_opt(); - image_unref(im); + evas_common_load_image_data_from_file(im); + evas_common_blit_rectangle(im, im_new, 0, 0, im->image->w, im->image->h, 0, 0); + evas_common_cpu_end_opt(); + evas_common_image_unref(im); im = im_new; } else - image_dirty(im); + evas_common_image_dirty(im); if (has_alpha) im->flags |= RGBA_IMAGE_HAS_ALPHA; else @@ -788,16 +788,16 @@ evas_engine_software_qtopia_image_draw(void *data, void *context, void *surface, Render_Engine *re; re = (Render_Engine *)data; - load_image_data_from_file(image); + evas_common_load_image_data_from_file(image); if (smooth) - scale_rgba_in_to_out_clip_smooth(image, surface, context, + evas_common_scale_rgba_in_to_out_clip_smooth(image, surface, context, src_x, src_y, src_w, src_h, dst_x, dst_y, dst_w, dst_h); else - scale_rgba_in_to_out_clip_sample(image, surface, context, + evas_common_scale_rgba_in_to_out_clip_sample(image, surface, context, src_x, src_y, src_w, src_h, dst_x, dst_y, dst_w, dst_h); - cpu_end_opt(); + evas_common_cpu_end_opt(); } static char * @@ -831,9 +831,9 @@ evas_engine_software_qtopia_image_cache_flush(void *data) int tmp_size; re = (Render_Engine *)data; - tmp_size = image_get_cache(); - image_set_cache(0); - image_set_cache(tmp_size); + tmp_size = evas_common_image_get_cache(); + evas_common_image_set_cache(0); + evas_common_image_set_cache(tmp_size); } static void @@ -842,7 +842,7 @@ evas_engine_software_qtopia_image_cache_set(void *data, int bytes) Render_Engine *re; re = (Render_Engine *)data; - image_set_cache(bytes); + evas_common_image_set_cache(bytes); } static int @@ -851,7 +851,7 @@ evas_engine_software_qtopia_image_cache_get(void *data) Render_Engine *re; re = (Render_Engine *)data; - return image_get_cache(); + return evas_common_image_get_cache(); } static void * @@ -860,7 +860,7 @@ evas_engine_software_qtopia_font_load(void *data, char *name, int size) Render_Engine *re; re = (Render_Engine *)data; - return font_load(name, size); + return evas_common_font_load(name, size); } static void @@ -869,7 +869,7 @@ evas_engine_software_qtopia_font_free(void *data, void *font) Render_Engine *re; re = (Render_Engine *)data; - font_free(font); + evas_common_font_free(font); } static int @@ -878,7 +878,7 @@ evas_engine_software_qtopia_font_ascent_get(void *data, void *font) Render_Engine *re; re = (Render_Engine *)data; - return font_ascent_get(font); + return evas_common_font_ascent_get(font); } static int @@ -887,7 +887,7 @@ evas_engine_software_qtopia_font_descent_get(void *data, void *font) Render_Engine *re; re = (Render_Engine *)data; - return font_descent_get(font); + return evas_common_font_descent_get(font); } static int @@ -896,7 +896,7 @@ evas_engine_software_qtopia_font_max_ascent_get(void *data, void *font) Render_Engine *re; re = (Render_Engine *)data; - return font_max_ascent_get(font); + return evas_common_font_max_ascent_get(font); } static int @@ -905,7 +905,7 @@ evas_engine_software_qtopia_font_max_descent_get(void *data, void *font) Render_Engine *re; re = (Render_Engine *)data; - return font_max_descent_get(font); + return evas_common_font_max_descent_get(font); } static void @@ -914,7 +914,7 @@ evas_engine_software_qtopia_font_string_size_get(void *data, void *font, char *t Render_Engine *re; re = (Render_Engine *)data; - font_query_size(font, text, w, h); + evas_common_font_query_size(font, text, w, h); } static int @@ -923,7 +923,7 @@ evas_engine_software_qtopia_font_inset_get(void *data, void *font, char *text) Render_Engine *re; re = (Render_Engine *)data; - return font_query_inset(font, text); + return evas_common_font_query_inset(font, text); } static int @@ -933,7 +933,7 @@ evas_engine_software_qtopia_font_h_advance_get(void *data, void *font, char *tex int h, v; re = (Render_Engine *)data; - font_query_advance(font, text, &h, &v); + evas_common_font_query_advance(font, text, &h, &v); return h; } @@ -944,7 +944,7 @@ evas_engine_software_qtopia_font_v_advance_get(void *data, void *font, char *tex int h, v; re = (Render_Engine *)data; - font_query_advance(font, text, &h, &v); + evas_common_font_query_advance(font, text, &h, &v); return v; } @@ -954,7 +954,7 @@ evas_engine_software_qtopia_font_char_coords_get(void *data, void *font, char *t Render_Engine *re; re = (Render_Engine *)data; - return font_query_char_coords(font, text, pos, cx, cy, cw, ch); + return evas_common_font_query_char_coords(font, text, pos, cx, cy, cw, ch); } static int @@ -963,7 +963,7 @@ evas_engine_software_qtopia_font_char_at_coords_get(void *data, void *font, char Render_Engine *re; re = (Render_Engine *)data; - return font_query_text_at_pos(font, text, x, y, cx, cy, cw, ch); + return evas_common_font_query_text_at_pos(font, text, x, y, cx, cy, cw, ch); } static void @@ -973,20 +973,20 @@ evas_engine_software_qtopia_font_draw(void *data, void *context, void *surface, re = (Render_Engine *)data; if ((w == ow) && (h == oh)) - font_draw(surface, context, font, x, y, text); + evas_common_font_draw(surface, context, font, x, y, text); else { /* create output surface size ow x oh and scale to w x h */ RGBA_Draw_Context *dc, *dc_in; dc_in = context; - dc = draw_context_new(); + dc = evas_common_draw_context_new(); if (dc) { RGBA_Image *im; dc->col.col = dc_in->col.col; - im = image_create(ow, oh); + im = evas_common_image_create(ow, oh); if (im) { int max_ascent; @@ -996,20 +996,20 @@ evas_engine_software_qtopia_font_draw(void *data, void *context, void *surface, j = ow * oh; for (i = 0; i < j; i++) im->image->data[i] = (dc->col.col & 0xffffff); - max_ascent = font_max_ascent_get(font); + max_ascent = evas_common_font_max_ascent_get(font); - font_draw(im, dc, font, 0, max_ascent, text); - cpu_end_opt(); - scale_rgba_in_to_out_clip_smooth(im, surface, context, + evas_common_font_draw(im, dc, font, 0, max_ascent, text); + evas_common_cpu_end_opt(); + evas_common_scale_rgba_in_to_out_clip_smooth(im, surface, context, 0, 0, ow, oh, x, y - ((max_ascent * h) / oh), w, h); - image_free(im); + evas_common_image_free(im); } - draw_context_free(dc); + evas_common_draw_context_free(dc); } } - cpu_end_opt(); + evas_common_cpu_end_opt(); } static void @@ -1018,7 +1018,7 @@ evas_engine_software_qtopia_font_cache_flush(void *data) Render_Engine *re; re = (Render_Engine *)data; - font_flush(); + evas_common_font_flush(); } static void @@ -1027,7 +1027,7 @@ evas_engine_software_qtopia_font_cache_set(void *data, int bytes) Render_Engine *re; re = (Render_Engine *)data; - font_cache_set(bytes); + evas_common_font_cache_set(bytes); } static int @@ -1036,5 +1036,5 @@ evas_engine_software_qtopia_font_cache_get(void *data) Render_Engine *re; re = (Render_Engine *)data; - return font_cache_get(); + return evas_common_font_cache_get(); } diff --git a/legacy/evas/src/lib/engines/software_qtopia/evas_engine.h b/legacy/evas/src/lib/engines/software_qtopia/evas_engine.h index b29dd9292f..488b150011 100644 --- a/legacy/evas/src/lib/engines/software_qtopia/evas_engine.h +++ b/legacy/evas/src/lib/engines/software_qtopia/evas_engine.h @@ -75,23 +75,23 @@ extern "C" { /****/ void x_software_qtopia_init (void); -void outbuf_software_qtopia_init (void); -void outbuf_software_qtopia_free (Outbuf *buf); +void evas_qtopia_outbuf_software_qtopia_init (void); +void evas_qtopia_outbuf_software_qtopia_free (Outbuf *buf); -Outbuf *outbuf_software_qtopia_setup_q (int w, int h, int rot, Outbuf_Depth depth, void *target); +Outbuf *evas_qtopia_outbuf_software_qtopia_setup_q (int w, int h, int rot, Outbuf_Depth depth, void *target); -void outbuf_software_qtopia_blit (Outbuf *buf, int src_x, int src_y, int w, int h, int dst_x, int dst_y); -void outbuf_software_qtopia_update (Outbuf *buf, int x, int y, int w, int h); -RGBA_Image *outbuf_software_qtopia_new_region_for_update (Outbuf *buf, int x, int y, int w, int h, int *cx, int *cy, int *cw, int *ch); -void outbuf_software_qtopia_free_region_for_update (Outbuf *buf, RGBA_Image *update); -void outbuf_software_qtopia_push_updated_region (Outbuf *buf, RGBA_Image *update, int x, int y, int w, int h); -void outbuf_software_qtopia_reconfigure (Outbuf *buf, int w, int h, int rot, Outbuf_Depth depth); -int outbuf_software_qtopia_get_width (Outbuf *buf); -int outbuf_software_qtopia_get_height (Outbuf *buf); -Outbuf_Depth outbuf_software_qtopia_get_depth (Outbuf *buf); -int outbuf_software_qtopia_get_rot (Outbuf *buf); -int outbuf_software_qtopia_get_have_backbuf (Outbuf *buf); -void outbuf_software_qtopia_set_have_backbuf (Outbuf *buf, int have_backbuf); +void evas_qtopia_outbuf_software_qtopia_blit (Outbuf *buf, int src_x, int src_y, int w, int h, int dst_x, int dst_y); +void evas_qtopia_outbuf_software_qtopia_update (Outbuf *buf, int x, int y, int w, int h); +RGBA_Image *evas_qtopia_outbuf_software_qtopia_new_region_for_update (Outbuf *buf, int x, int y, int w, int h, int *cx, int *cy, int *cw, int *ch); +void evas_qtopia_outbuf_software_qtopia_free_region_for_update (Outbuf *buf, RGBA_Image *update); +void evas_qtopia_outbuf_software_qtopia_push_updated_region (Outbuf *buf, RGBA_Image *update, int x, int y, int w, int h); +void evas_qtopia_outbuf_software_qtopia_reconfigure (Outbuf *buf, int w, int h, int rot, Outbuf_Depth depth); +int evas_qtopia_outbuf_software_qtopia_get_width (Outbuf *buf); +int evas_qtopia_outbuf_software_qtopia_get_height (Outbuf *buf); +Outbuf_Depth evas_qtopia_outbuf_software_qtopia_get_depth (Outbuf *buf); +int evas_qtopia_outbuf_software_qtopia_get_rot (Outbuf *buf); +int evas_qtopia_outbuf_software_qtopia_get_have_backbuf (Outbuf *buf); +void evas_qtopia_outbuf_software_qtopia_set_have_backbuf (Outbuf *buf, int have_backbuf); QT_Direct *evas_qt_main_direct_start (void *target); void evas_qt_main_direct_stop (QT_Direct *d); diff --git a/legacy/evas/src/lib/engines/software_qtopia/evas_outbuf.c b/legacy/evas/src/lib/engines/software_qtopia/evas_outbuf.c index d1401428c0..ccbe31b3a8 100644 --- a/legacy/evas/src/lib/engines/software_qtopia/evas_outbuf.c +++ b/legacy/evas/src/lib/engines/software_qtopia/evas_outbuf.c @@ -7,18 +7,18 @@ #include void -outbuf_software_qtopia_init(void) +evas_qtopia_outbuf_software_qtopia_init(void) { } void -outbuf_software_qtopia_free(Outbuf *buf) +evas_qtopia_outbuf_software_qtopia_free(Outbuf *buf) { free(buf); } Outbuf * -outbuf_software_qtopia_setup_q(int w, int h, int rot, Outbuf_Depth depth, QWidget *target) +evas_qtopia_outbuf_software_qtopia_setup_q(int w, int h, int rot, Outbuf_Depth depth, QWidget *target) { Outbuf *buf; @@ -49,33 +49,33 @@ outbuf_software_qtopia_setup_q(int w, int h, int rot, Outbuf_Depth depth, QWidge } void -outbuf_software_qtopia_blit(Outbuf *buf, int src_x, int src_y, int w, int h, int dst_x, int dst_y) +evas_qtopia_outbuf_software_qtopia_blit(Outbuf *buf, int src_x, int src_y, int w, int h, int dst_x, int dst_y) { } void -outbuf_software_qtopia_update(Outbuf *buf, int x, int y, int w, int h) +evas_qtopia_outbuf_software_qtopia_update(Outbuf *buf, int x, int y, int w, int h) { } RGBA_Image * -outbuf_software_qtopia_new_region_for_update(Outbuf *buf, int x, int y, int w, int h, int *cx, int *cy, int *cw, int *ch) +evas_qtopia_outbuf_software_qtopia_new_region_for_update(Outbuf *buf, int x, int y, int w, int h, int *cx, int *cy, int *cw, int *ch) { RGBA_Image *im; *cx = 0; *cy = 0; *cw = w; *ch = h; - im = image_create(w, h); + im = evas_common_image_create(w, h); return im; } void -outbuf_software_qtopia_free_region_for_update(Outbuf *buf, RGBA_Image *update) +evas_qtopia_outbuf_software_qtopia_free_region_for_update(Outbuf *buf, RGBA_Image *update) { - image_free(update); + evas_common_image_free(update); } void -outbuf_software_qtopia_push_updated_region(Outbuf *buf, RGBA_Image *update, int x, int y, int w, int h) +evas_qtopia_outbuf_software_qtopia_push_updated_region(Outbuf *buf, RGBA_Image *update, int x, int y, int w, int h) { Gfx_Func_Convert conv_func; DATA8 *data; @@ -122,7 +122,7 @@ outbuf_software_qtopia_push_updated_region(Outbuf *buf, RGBA_Image *update, int ((d->location.y * d->fb.width * fb_bytes) + (d->location.x * fb_bytes)); data = fb_mem + (fb_bytes * (x + (y * d->fb.width))); - conv_func = convert_func_get(data, w, h, d->fb.bpp, + conv_func = evas_common_convert_func_get(data, w, h, d->fb.bpp, d->fb.mask.r, d->fb.mask.g, d->fb.mask.b, PAL_MODE_NONE, buf->rot); } @@ -133,7 +133,7 @@ outbuf_software_qtopia_push_updated_region(Outbuf *buf, RGBA_Image *update, int ((d->location.x * d->fb.width) + (d->fb.width - d->location.y - d->location.h))); data = fb_mem + (fb_bytes * (buf->h - y - h + (x * d->fb.width))); - conv_func = convert_func_get(data, h, w, d->fb.bpp, + conv_func = evas_common_convert_func_get(data, h, w, d->fb.bpp, d->fb.mask.r, d->fb.mask.g, d->fb.mask.b, PAL_MODE_NONE, buf->rot); } @@ -144,7 +144,7 @@ outbuf_software_qtopia_push_updated_region(Outbuf *buf, RGBA_Image *update, int ((d->location.y * d->fb.width * fb_bytes) + (d->location.x * fb_bytes)); data = fb_mem + (fb_bytes * (y + ((buf->w - x - w) * d->fb.width))); - conv_func = convert_func_get(data, h, w, d->fb.bpp, + conv_func = evas_common_convert_func_get(data, h, w, d->fb.bpp, d->fb.mask.r, d->fb.mask.g, d->fb.mask.b, PAL_MODE_NONE, buf->rot); } @@ -192,7 +192,7 @@ outbuf_software_qtopia_push_updated_region(Outbuf *buf, RGBA_Image *update, int } void -outbuf_software_qtopia_reconfigure(Outbuf *buf, int w, int h, int rot, Outbuf_Depth depth) +evas_qtopia_outbuf_software_qtopia_reconfigure(Outbuf *buf, int w, int h, int rot, Outbuf_Depth depth) { if ((w == buf->w) && (h == buf->h) && (rot == buf->rot) && (depth == buf->depth)) @@ -203,36 +203,36 @@ outbuf_software_qtopia_reconfigure(Outbuf *buf, int w, int h, int rot, Outbuf_De } int -outbuf_software_qtopia_get_width(Outbuf *buf) +evas_qtopia_outbuf_software_qtopia_get_width(Outbuf *buf) { return buf->w; } int -outbuf_software_qtopia_get_height(Outbuf *buf) +evas_qtopia_outbuf_software_qtopia_get_height(Outbuf *buf) { return buf->h; } Outbuf_Depth -outbuf_software_qtopia_get_depth(Outbuf *buf) +evas_qtopia_outbuf_software_qtopia_get_depth(Outbuf *buf) { return buf->depth; } int -outbuf_software_qtopia_get_rot(Outbuf *buf) +evas_qtopia_outbuf_software_qtopia_get_rot(Outbuf *buf) { return buf->rot; } int -outbuf_software_qtopia_get_have_backbuf(Outbuf *buf) +evas_qtopia_outbuf_software_qtopia_get_have_backbuf(Outbuf *buf) { return 0; } void -outbuf_software_qtopia_set_have_backbuf(Outbuf *buf, int have_backbuf) +evas_qtopia_outbuf_software_qtopia_set_have_backbuf(Outbuf *buf, int have_backbuf) { } diff --git a/legacy/evas/src/lib/engines/software_x11/evas_engine.c b/legacy/evas/src/lib/engines/software_x11/evas_engine.c index 0e6b5e8f78..423f4f1a77 100644 --- a/legacy/evas/src/lib/engines/software_x11/evas_engine.c +++ b/legacy/evas/src/lib/engines/software_x11/evas_engine.c @@ -237,8 +237,8 @@ evas_engine_software_x11_setup(Evas *e, void *in) e->engine.func->context_new(e->engine.data.output); re = e->engine.data.output; - outbuf_software_x11_drawable_set(re->ob, info->info.drawable); - outbuf_software_x11_mask_set(re->ob, info->info.mask); + evas_software_x11_outbuf_software_x11_drawable_set(re->ob, info->info.drawable); + evas_software_x11_outbuf_software_x11_mask_set(re->ob, info->info.mask); } static void * @@ -249,44 +249,44 @@ evas_engine_software_x11_output_setup(int w, int h, int rot, Display *disp, Draw re = calloc(1, sizeof(Render_Engine)); /* if we haven't initialized - init (automatic abort if already done) */ - cpu_init(); + evas_common_cpu_init(); - blend_init(); - image_init(); - convert_init(); - scale_init(); - rectangle_init(); - gradient_init(); - polygon_init(); - line_init(); - font_init(); - draw_init(); - tilebuf_init(); + evas_common_blend_init(); + evas_common_image_init(); + evas_common_convert_init(); + evas_common_scale_init(); + evas_common_rectangle_init(); + evas_common_gradient_init(); + evas_common_polygon_init(); + evas_common_line_init(); + evas_common_font_init(); + evas_common_draw_init(); + evas_common_tilebuf_init(); - x_software_x11_init(); + evas_software_x11_x_software_x11_init(); x_software_x11_color_init(); - outbuf_software_x11_init(); + evas_software_x11_outbuf_software_x11_init(); /* get any stored performance metrics from device (xserver) */ - perf = outbuf_software_x11_perf_restore_x(disp, draw, vis, cmap, depth); - re->ob = outbuf_software_x11_setup_x(w, h, rot, OUTBUF_DEPTH_INHERIT, disp, draw, vis, cmap, depth, perf, grayscale, max_colors, mask, shape_dither); + perf = evas_software_x11_outbuf_software_x11_perf_restore_x(disp, draw, vis, cmap, depth); + re->ob = evas_software_x11_outbuf_software_x11_setup_x(w, h, rot, OUTBUF_DEPTH_INHERIT, disp, draw, vis, cmap, depth, perf, grayscale, max_colors, mask, shape_dither); if (!re->ob) { - outbuf_software_x11_perf_free(perf); + evas_software_x11_outbuf_software_x11_perf_free(perf); free(re); return NULL; } - outbuf_software_x11_debug_set(re->ob, debug); - outbuf_software_x11_set_have_backbuf(re->ob, 0); - re->tb = tilebuf_new(w, h); + evas_software_x11_outbuf_software_x11_debug_set(re->ob, debug); + evas_software_x11_outbuf_software_x11_set_have_backbuf(re->ob, 0); + re->tb = evas_common_tilebuf_new(w, h); if (!re->tb) { - outbuf_software_x11_free(re->ob); + evas_software_x11_outbuf_software_x11_free(re->ob); free(re); return NULL; } /* in preliminary tests 16x16 gave highest framerates */ - tilebuf_set_tile_size(re->tb, 16, 16); + evas_common_tilebuf_set_tile_size(re->tb, 16, 16); return re; } @@ -296,9 +296,9 @@ evas_engine_software_x11_output_free(void *data) Render_Engine *re; re = (Render_Engine *)data; - outbuf_software_x11_free(re->ob); - tilebuf_free(re->tb); - if (re->rects) tilebuf_free_render_rects(re->rects); + evas_software_x11_outbuf_software_x11_free(re->ob); + evas_common_tilebuf_free(re->tb); + if (re->rects) evas_common_tilebuf_free_render_rects(re->rects); free(re); } @@ -308,14 +308,14 @@ evas_engine_software_x11_output_resize(void *data, int w, int h) Render_Engine *re; re = (Render_Engine *)data; - outbuf_software_x11_reconfigure(re->ob, w, h, - outbuf_software_x11_get_rot(re->ob), + evas_software_x11_outbuf_software_x11_reconfigure(re->ob, w, h, + evas_software_x11_outbuf_software_x11_get_rot(re->ob), OUTBUF_DEPTH_INHERIT); - outbuf_software_x11_set_have_backbuf(re->ob, 0); - tilebuf_free(re->tb); - re->tb = tilebuf_new(w, h); + evas_software_x11_outbuf_software_x11_set_have_backbuf(re->ob, 0); + evas_common_tilebuf_free(re->tb); + re->tb = evas_common_tilebuf_new(w, h); if (re->tb) - tilebuf_set_tile_size(re->tb, 16, 16); + evas_common_tilebuf_set_tile_size(re->tb, 16, 16); } static void @@ -324,7 +324,7 @@ evas_engine_software_x11_output_tile_size_set(void *data, int w, int h) Render_Engine *re; re = (Render_Engine *)data; - tilebuf_set_tile_size(re->tb, w, h); + evas_common_tilebuf_set_tile_size(re->tb, w, h); } static void @@ -333,7 +333,7 @@ evas_engine_software_x11_output_redraws_rect_add(void *data, int x, int y, int w Render_Engine *re; re = (Render_Engine *)data; - tilebuf_add_redraw(re->tb, x, y, w, h); + evas_common_tilebuf_add_redraw(re->tb, x, y, w, h); } static void @@ -342,7 +342,7 @@ evas_engine_software_x11_output_redraws_rect_del(void *data, int x, int y, int w Render_Engine *re; re = (Render_Engine *)data; - tilebuf_del_redraw(re->tb, x, y, w, h); + evas_common_tilebuf_del_redraw(re->tb, x, y, w, h); } static void @@ -351,7 +351,7 @@ evas_engine_software_x11_output_redraws_clear(void *data) Render_Engine *re; re = (Render_Engine *)data; - tilebuf_clear(re->tb); + evas_common_tilebuf_clear(re->tb); } static void * @@ -370,7 +370,7 @@ evas_engine_software_x11_output_redraws_next_update_get(void *data, int *x, int } if (!re->rects) { - re->rects = tilebuf_get_render_rects(re->tb); + re->rects = evas_common_tilebuf_get_render_rects(re->tb); re->cur_rect = (Evas_Object_List *)re->rects; } if (!re->cur_rect) return NULL; @@ -379,12 +379,12 @@ evas_engine_software_x11_output_redraws_next_update_get(void *data, int *x, int re->cur_rect = re->cur_rect->next; if (!re->cur_rect) { - tilebuf_free_render_rects(re->rects); + evas_common_tilebuf_free_render_rects(re->rects); re->rects = NULL; re->end = 1; } - surface = outbuf_software_x11_new_region_for_update(re->ob, + surface = evas_software_x11_outbuf_software_x11_new_region_for_update(re->ob, ux, uy, uw, uh, cx, cy, cw, ch); *x = ux; *y = uy; *w = uw; *h = uh; @@ -398,9 +398,9 @@ evas_engine_software_x11_output_redraws_next_update_push(void *data, void *surfa Evas_Engine_Info_Software_X11 *info; re = (Render_Engine *)data; - outbuf_software_x11_push_updated_region(re->ob, surface, x, y, w, h); - outbuf_software_x11_free_region_for_update(re->ob, surface); - cpu_end_opt(); + evas_software_x11_outbuf_software_x11_push_updated_region(re->ob, surface, x, y, w, h); + evas_software_x11_outbuf_software_x11_free_region_for_update(re->ob, surface); + evas_common_cpu_end_opt(); } static void @@ -418,7 +418,7 @@ evas_engine_software_x11_context_new(void *data) Render_Engine *re; re = (Render_Engine *)data; - return draw_context_new(); + return evas_common_draw_context_new(); } static void @@ -427,7 +427,7 @@ evas_engine_software_x11_context_free(void *data, void *context) Render_Engine *re; re = (Render_Engine *)data; - draw_context_free(context); + evas_common_draw_context_free(context); } static void @@ -436,7 +436,7 @@ evas_engine_software_x11_context_clip_set(void *data, void *context, int x, int Render_Engine *re; re = (Render_Engine *)data; - draw_context_set_clip(context, x, y, w, h); + evas_common_draw_context_set_clip(context, x, y, w, h); } static void @@ -445,7 +445,7 @@ evas_engine_software_x11_context_clip_clip(void *data, void *context, int x, int Render_Engine *re; re = (Render_Engine *)data; - draw_context_clip_clip(context, x, y, w, h); + evas_common_draw_context_clip_clip(context, x, y, w, h); } static void @@ -454,7 +454,7 @@ evas_engine_software_x11_context_clip_unset(void *data, void *context) Render_Engine *re; re = (Render_Engine *)data; - draw_context_unset_clip(context); + evas_common_draw_context_unset_clip(context); } static int @@ -476,7 +476,7 @@ evas_engine_software_x11_context_color_set(void *data, void *context, int r, int Render_Engine *re; re = (Render_Engine *)data; - draw_context_set_color(context, r, g, b, a); + evas_common_draw_context_set_color(context, r, g, b, a); } static int @@ -498,7 +498,7 @@ evas_engine_software_x11_context_multiplier_set(void *data, void *context, int r Render_Engine *re; re = (Render_Engine *)data; - draw_context_set_multiplier(context, r, g, b, a); + evas_common_draw_context_set_multiplier(context, r, g, b, a); } static void @@ -507,7 +507,7 @@ evas_engine_software_x11_context_multiplier_unset(void *data, void *context) Render_Engine *re; re = (Render_Engine *)data; - draw_context_unset_multiplier(context); + evas_common_draw_context_unset_multiplier(context); } static int @@ -529,7 +529,7 @@ evas_engine_software_x11_context_cutout_add(void *data, void *context, int x, in Render_Engine *re; re = (Render_Engine *)data; - draw_context_add_cutout(context, x, y, w, h); + evas_common_draw_context_add_cutout(context, x, y, w, h); } static void @@ -538,7 +538,7 @@ evas_engine_software_x11_context_cutout_clear(void *data, void *context) Render_Engine *re; re = (Render_Engine *)data; - draw_context_clear_cutouts(context); + evas_common_draw_context_clear_cutouts(context); } @@ -552,8 +552,8 @@ evas_engine_software_x11_rectangle_draw(void *data, void *context, void *surface Render_Engine *re; re = (Render_Engine *)data; - rectangle_draw(surface, context, x, y, w, h); - cpu_end_opt(); + evas_common_rectangle_draw(surface, context, x, y, w, h); + evas_common_cpu_end_opt(); } static void @@ -562,8 +562,8 @@ evas_engine_software_x11_line_draw(void *data, void *context, void *surface, int Render_Engine *re; re = (Render_Engine *)data; - line_draw(surface, context, x1, y1, x2, y2); - cpu_end_opt(); + evas_common_line_draw(surface, context, x1, y1, x2, y2); + evas_common_cpu_end_opt(); } static void * @@ -572,7 +572,7 @@ evas_engine_software_x11_polygon_point_add(void *data, void *context, void *poly Render_Engine *re; re = (Render_Engine *)data; - return polygon_point_add(polygon, x, y); + return evas_common_polygon_point_add(polygon, x, y); context = NULL; } @@ -582,7 +582,7 @@ evas_engine_software_x11_polygon_points_clear(void *data, void *context, void *p Render_Engine *re; re = (Render_Engine *)data; - return polygon_points_clear(polygon); + return evas_common_polygon_points_clear(polygon); context = NULL; } @@ -592,8 +592,8 @@ evas_engine_software_x11_polygon_draw(void *data, void *context, void *surface, Render_Engine *re; re = (Render_Engine *)data; - polygon_draw(surface, context, polygon); - cpu_end_opt(); + evas_common_polygon_draw(surface, context, polygon); + evas_common_cpu_end_opt(); } static void * @@ -603,8 +603,8 @@ evas_engine_software_x11_gradient_color_add(void *data, void *context, void *gra re = (Render_Engine *)data; if (!gradient) - gradient = gradient_new(); - gradient_color_add(gradient, r, g, b, a, distance); + gradient = evas_common_gradient_new(); + evas_common_gradient_color_add(gradient, r, g, b, a, distance); return gradient; context = NULL; } @@ -615,7 +615,7 @@ evas_engine_software_x11_gradient_colors_clear(void *data, void *context, void * Render_Engine *re; re = (Render_Engine *)data; - if (gradient) gradient_free(gradient); + if (gradient) evas_common_gradient_free(gradient); return NULL; context = NULL; } @@ -626,8 +626,8 @@ evas_engine_software_x11_gradient_draw(void *data, void *context, void *surface, Render_Engine *re; re = (Render_Engine *)data; - gradient_draw(surface, context, x, y, w, h, gradient, angle); - cpu_end_opt(); + evas_common_gradient_draw(surface, context, x, y, w, h, gradient, angle); + evas_common_cpu_end_opt(); } static void * @@ -637,7 +637,7 @@ evas_engine_software_x11_image_load(void *data, char *file, char *key, int *erro re = (Render_Engine *)data; *error = 0; - return load_image_from_file(file, key); + return evas_common_load_image_from_file(file, key); } static void * @@ -647,11 +647,11 @@ evas_engine_software_x11_image_new_from_data(void *data, int w, int h, DATA32 *i RGBA_Image *im; re = (Render_Engine *)data; - im = image_new(); - im->image = image_surface_new(); + im = evas_common_image_new(); + im->image = evas_common_image_surface_new(); if (!im->image) { - image_free(im); + evas_common_image_free(im); return NULL; } im->image->w = w; @@ -668,7 +668,7 @@ evas_engine_software_x11_image_new_from_copied_data(void *data, int w, int h, DA RGBA_Image *im; re = (Render_Engine *)data; - im = image_create(w, h); + im = evas_common_image_create(w, h); if (!im) return NULL; if (image_data) memcpy(im->image->data, image_data, w * h * sizeof(DATA32)); @@ -681,7 +681,7 @@ evas_engine_software_x11_image_free(void *data, void *image) Render_Engine *re; re = (Render_Engine *)data; - image_unref(image); + evas_common_image_unref(image); } static void @@ -704,17 +704,17 @@ evas_engine_software_x11_image_size_set(void *data, void *image, int w, int h) re = (Render_Engine *)data; im_old = image; - im = image_create(w, h); + im = evas_common_image_create(w, h); if (!im) return im_old; if (im_old) { - load_image_data_from_file(im_old); + evas_common_load_image_data_from_file(im_old); if (im_old->image->data) { - blit_rectangle(im_old, im, 0, 0, w, h, 0, 0); - cpu_end_opt(); + evas_common_blit_rectangle(im_old, im, 0, 0, w, h, 0, 0); + evas_common_cpu_end_opt(); } - image_unref(im_old); + evas_common_image_unref(im_old); } return im; } @@ -725,7 +725,7 @@ evas_engine_software_x11_image_dirty_region(void *data, void *image, int x, int Render_Engine *re; re = (Render_Engine *)data; - image_dirty(image); + evas_common_image_dirty(image); return image; x = 0; y = 0; @@ -741,22 +741,22 @@ evas_engine_software_x11_image_data_get(void *data, void *image, int to_write, D re = (Render_Engine *)data; im = image; - load_image_data_from_file(im); + evas_common_load_image_data_from_file(im); if (to_write) { if (im->references > 1) { RGBA_Image *im_new; - im_new = image_create(im->image->w, im->image->h); + im_new = evas_common_image_create(im->image->w, im->image->h); if (!im_new) return im; - blit_rectangle(im, im_new, 0, 0, im->image->w, im->image->h, 0, 0); - cpu_end_opt(); - image_unref(im); + evas_common_blit_rectangle(im, im_new, 0, 0, im->image->w, im->image->h, 0, 0); + evas_common_cpu_end_opt(); + evas_common_image_unref(im); im = im_new; } else - image_dirty(im); + evas_common_image_dirty(im); } *image_data = im->image->data; return im; @@ -776,10 +776,10 @@ evas_engine_software_x11_image_data_put(void *data, void *image, DATA32 *image_d w = im->image->w; h = im->image->h; - image_unref(im); + evas_common_image_unref(im); return evas_engine_software_x11_image_new_from_data(data, w, h, image_data); } - image_dirty(im); + evas_common_image_dirty(im); return im; } @@ -795,16 +795,16 @@ evas_engine_software_x11_image_alpha_set(void *data, void *image, int has_alpha) { RGBA_Image *im_new; - im_new = image_create(im->image->w, im->image->h); + im_new = evas_common_image_create(im->image->w, im->image->h); if (!im_new) return im; - load_image_data_from_file(im); - blit_rectangle(im, im_new, 0, 0, im->image->w, im->image->h, 0, 0); - cpu_end_opt(); - image_unref(im); + evas_common_load_image_data_from_file(im); + evas_common_blit_rectangle(im, im_new, 0, 0, im->image->w, im->image->h, 0, 0); + evas_common_cpu_end_opt(); + evas_common_image_unref(im); im = im_new; } else - image_dirty(im); + evas_common_image_dirty(im); if (has_alpha) im->flags |= RGBA_IMAGE_HAS_ALPHA; else @@ -831,16 +831,16 @@ evas_engine_software_x11_image_draw(void *data, void *context, void *surface, vo Render_Engine *re; re = (Render_Engine *)data; - load_image_data_from_file(image); + evas_common_load_image_data_from_file(image); if (smooth) - scale_rgba_in_to_out_clip_smooth(image, surface, context, + evas_common_scale_rgba_in_to_out_clip_smooth(image, surface, context, src_x, src_y, src_w, src_h, dst_x, dst_y, dst_w, dst_h); else - scale_rgba_in_to_out_clip_sample(image, surface, context, + evas_common_scale_rgba_in_to_out_clip_sample(image, surface, context, src_x, src_y, src_w, src_h, dst_x, dst_y, dst_w, dst_h); - cpu_end_opt(); + evas_common_cpu_end_opt(); } static char * @@ -874,9 +874,9 @@ evas_engine_software_x11_image_cache_flush(void *data) int tmp_size; re = (Render_Engine *)data; - tmp_size = image_get_cache(); - image_set_cache(0); - image_set_cache(tmp_size); + tmp_size = evas_common_image_get_cache(); + evas_common_image_set_cache(0); + evas_common_image_set_cache(tmp_size); } static void @@ -885,7 +885,7 @@ evas_engine_software_x11_image_cache_set(void *data, int bytes) Render_Engine *re; re = (Render_Engine *)data; - image_set_cache(bytes); + evas_common_image_set_cache(bytes); } static int @@ -894,7 +894,7 @@ evas_engine_software_x11_image_cache_get(void *data) Render_Engine *re; re = (Render_Engine *)data; - return image_get_cache(); + return evas_common_image_get_cache(); } static void * @@ -903,7 +903,7 @@ evas_engine_software_x11_font_load(void *data, char *name, int size) Render_Engine *re; re = (Render_Engine *)data; - return font_load(name, size); + return evas_common_font_load(name, size); } static void @@ -912,7 +912,7 @@ evas_engine_software_x11_font_free(void *data, void *font) Render_Engine *re; re = (Render_Engine *)data; - font_free(font); + evas_common_font_free(font); } static int @@ -921,7 +921,7 @@ evas_engine_software_x11_font_ascent_get(void *data, void *font) Render_Engine *re; re = (Render_Engine *)data; - return font_ascent_get(font); + return evas_common_font_ascent_get(font); } static int @@ -930,7 +930,7 @@ evas_engine_software_x11_font_descent_get(void *data, void *font) Render_Engine *re; re = (Render_Engine *)data; - return font_descent_get(font); + return evas_common_font_descent_get(font); } static int @@ -939,7 +939,7 @@ evas_engine_software_x11_font_max_ascent_get(void *data, void *font) Render_Engine *re; re = (Render_Engine *)data; - return font_max_ascent_get(font); + return evas_common_font_max_ascent_get(font); } static int @@ -948,7 +948,7 @@ evas_engine_software_x11_font_max_descent_get(void *data, void *font) Render_Engine *re; re = (Render_Engine *)data; - return font_max_descent_get(font); + return evas_common_font_max_descent_get(font); } static void @@ -957,7 +957,7 @@ evas_engine_software_x11_font_string_size_get(void *data, void *font, char *text Render_Engine *re; re = (Render_Engine *)data; - font_query_size(font, text, w, h); + evas_common_font_query_size(font, text, w, h); } static int @@ -966,7 +966,7 @@ evas_engine_software_x11_font_inset_get(void *data, void *font, char *text) Render_Engine *re; re = (Render_Engine *)data; - return font_query_inset(font, text); + return evas_common_font_query_inset(font, text); } static int @@ -976,7 +976,7 @@ evas_engine_software_x11_font_h_advance_get(void *data, void *font, char *text) int h, v; re = (Render_Engine *)data; - font_query_advance(font, text, &h, &v); + evas_common_font_query_advance(font, text, &h, &v); return h; } @@ -987,7 +987,7 @@ evas_engine_software_x11_font_v_advance_get(void *data, void *font, char *text) int h, v; re = (Render_Engine *)data; - font_query_advance(font, text, &h, &v); + evas_common_font_query_advance(font, text, &h, &v); return v; } @@ -997,7 +997,7 @@ evas_engine_software_x11_font_char_coords_get(void *data, void *font, char *text Render_Engine *re; re = (Render_Engine *)data; - return font_query_char_coords(font, text, pos, cx, cy, cw, ch); + return evas_common_font_query_char_coords(font, text, pos, cx, cy, cw, ch); } static int @@ -1006,7 +1006,7 @@ evas_engine_software_x11_font_char_at_coords_get(void *data, void *font, char *t Render_Engine *re; re = (Render_Engine *)data; - return font_query_text_at_pos(font, text, x, y, cx, cy, cw, ch); + return evas_common_font_query_text_at_pos(font, text, x, y, cx, cy, cw, ch); } static void @@ -1016,20 +1016,20 @@ evas_engine_software_x11_font_draw(void *data, void *context, void *surface, voi re = (Render_Engine *)data; if ((w == ow) && (h == oh)) - font_draw(surface, context, font, x, y, text); + evas_common_font_draw(surface, context, font, x, y, text); else { /* create output surface size ow x oh and scale to w x h */ RGBA_Draw_Context *dc, *dc_in; dc_in = context; - dc = draw_context_new(); + dc = evas_common_draw_context_new(); if (dc) { RGBA_Image *im; dc->col.col = dc_in->col.col; - im = image_create(ow, oh); + im = evas_common_image_create(ow, oh); if (im) { int max_ascent; @@ -1039,20 +1039,20 @@ evas_engine_software_x11_font_draw(void *data, void *context, void *surface, voi j = ow * oh; for (i = 0; i < j; i++) im->image->data[i] = (dc->col.col & 0xffffff); - max_ascent = font_max_ascent_get(font); + max_ascent = evas_common_font_max_ascent_get(font); - font_draw(im, dc, font, 0, max_ascent, text); - cpu_end_opt(); - scale_rgba_in_to_out_clip_smooth(im, surface, context, + evas_common_font_draw(im, dc, font, 0, max_ascent, text); + evas_common_cpu_end_opt(); + evas_common_scale_rgba_in_to_out_clip_smooth(im, surface, context, 0, 0, ow, oh, x, y - ((max_ascent * h) / oh), w, h); - image_free(im); + evas_common_image_free(im); } - draw_context_free(dc); + evas_common_draw_context_free(dc); } } - cpu_end_opt(); + evas_common_cpu_end_opt(); } static void @@ -1061,7 +1061,7 @@ evas_engine_software_x11_font_cache_flush(void *data) Render_Engine *re; re = (Render_Engine *)data; - font_flush(); + evas_common_font_flush(); } static void @@ -1070,7 +1070,7 @@ evas_engine_software_x11_font_cache_set(void *data, int bytes) Render_Engine *re; re = (Render_Engine *)data; - font_cache_set(bytes); + evas_common_font_cache_set(bytes); } static int @@ -1079,7 +1079,7 @@ evas_engine_software_x11_font_cache_get(void *data) Render_Engine *re; re = (Render_Engine *)data; - return font_cache_get(); + return evas_common_font_cache_get(); } @@ -1116,43 +1116,43 @@ evas_engine_software_x11_best_depth_get(Display *disp, int screen) static Evas_Performance * evas_engine_software_x11_output_perf_new(Evas *e, Display *disp, Visual *vis, Colormap cmap, Drawable draw, int depth) { - return outbuf_software_x11_perf_new_x(disp, draw, vis, cmap, depth); + return evas_software_x11_outbuf_software_x11_perf_new_x(disp, draw, vis, cmap, depth); e = NULL; } static Evas_Performance * evas_engine_software_x11_output_perf_test(Evas *e, Display *disp, Visual *vis, Colormap cmap, Drawable draw, int depth) { - return outbuf_software_x11_perf_x(disp, draw, vis, cmap, depth); + return evas_software_x11_outbuf_software_x11_perf_x(disp, draw, vis, cmap, depth); e = NULL; } static char * evas_engine_software_x11_output_perf_data(Evas_Performance *perf) { - return outbuf_software_x11_perf_serialize_x(perf); + return evas_software_x11_outbuf_software_x11_perf_serialize_x(perf); } static char * evas_engine_software_x11_output_perf_key(Evas_Performance *perf) { - return outbuf_software_x11_perf_serialize_info_x(perf); + return evas_software_x11_outbuf_software_x11_perf_serialize_info_x(perf); } static void evas_engine_software_x11_output_perf_free(Evas_Performance *perf) { - outbuf_software_x11_perf_free(perf); + evas_software_x11_outbuf_software_x11_perf_free(perf); } static void evas_engine_software_x11_output_perf_build(Evas_Performance *perf, const char *data) { - outbuf_software_x11_perf_deserialize_x(perf, data); + evas_software_x11_outbuf_software_x11_perf_deserialize_x(perf, data); } static void evas_engine_software_x11_output_perf_device_store(Evas_Performance *perf) { - outbuf_software_x11_perf_store_x(perf); + evas_software_x11_outbuf_software_x11_perf_store_x(perf); } diff --git a/legacy/evas/src/lib/engines/software_x11/evas_engine.h b/legacy/evas/src/lib/engines/software_x11/evas_engine.h index 88cc1b87cc..3f5998346e 100644 --- a/legacy/evas/src/lib/engines/software_x11/evas_engine.h +++ b/legacy/evas/src/lib/engines/software_x11/evas_engine.h @@ -84,51 +84,51 @@ struct _Outbuf_Perf }; /****/ -void x_software_x11_init (void); +void evas_software_x11_x_software_x11_init (void); -void x_software_x11_write_mask_line (X_Output_Buffer *xob, DATA32 *src, int w, int y); -int x_software_x11_can_do_shm (Display *d); -X_Output_Buffer *x_software_x11_output_buffer_new (Display *d, Visual *v, int depth, int w, int h, int try_shm, void *data); -void x_software_x11_output_buffer_free (X_Output_Buffer *xob); -void x_software_x11_output_buffer_paste (X_Output_Buffer *xob, Drawable d, GC gc, int x, int y); -DATA8 *x_software_x11_output_buffer_data (X_Output_Buffer *xob, int *bytes_per_line_ret); -int x_software_x11_output_buffer_depth (X_Output_Buffer *xob); -int x_software_x11_output_buffer_byte_order(X_Output_Buffer *xob); +void evas_software_x11_x_software_x11_write_mask_line (X_Output_Buffer *xob, DATA32 *src, int w, int y); +int evas_software_x11_x_software_x11_can_do_shm (Display *d); +X_Output_Buffer *evas_software_x11_x_software_x11_output_buffer_new (Display *d, Visual *v, int depth, int w, int h, int try_shm, void *data); +void evas_software_x11_x_software_x11_output_buffer_free (X_Output_Buffer *xob); +void evas_software_x11_x_software_x11_output_buffer_paste (X_Output_Buffer *xob, Drawable d, GC gc, int x, int y); +DATA8 *evas_software_x11_x_software_x11_output_buffer_data (X_Output_Buffer *xob, int *bytes_per_line_ret); +int evas_software_x11_x_software_x11_output_buffer_depth (X_Output_Buffer *xob); +int evas_software_x11_x_software_x11_output_buffer_byte_order(X_Output_Buffer *xob); void x_software_x11_color_init (void); -Convert_Pal *x_software_x11_color_allocate (Display *disp, Colormap cmap, Visual *vis, Convert_Pal_Mode colors); -void x_software_x11_color_deallocate (Display *disp, Colormap cmap, Visual *vis, Convert_Pal *pal); +Convert_Pal *evas_software_x11_x_software_x11_color_allocate (Display *disp, Colormap cmap, Visual *vis, Convert_Pal_Mode colors); +void evas_software_x11_x_software_x11_color_deallocate (Display *disp, Colormap cmap, Visual *vis, Convert_Pal *pal); -void outbuf_software_x11_init (void); -void outbuf_software_x11_free (Outbuf *buf); +void evas_software_x11_outbuf_software_x11_init (void); +void evas_software_x11_outbuf_software_x11_free (Outbuf *buf); -Outbuf *outbuf_software_x11_setup_x (int w, int h, int rot, Outbuf_Depth depth, Display *disp, Drawable draw, Visual *vis, Colormap cmap, int x_depth, Outbuf_Perf *perf, int grayscale, int max_colors, Pixmap mask, int shape_dither); +Outbuf *evas_software_x11_outbuf_software_x11_setup_x (int w, int h, int rot, Outbuf_Depth depth, Display *disp, Drawable draw, Visual *vis, Colormap cmap, int x_depth, Outbuf_Perf *perf, int grayscale, int max_colors, Pixmap mask, int shape_dither); -char *outbuf_software_x11_perf_serialize_x (Outbuf_Perf *perf); -void outbuf_software_x11_perf_deserialize_x (Outbuf_Perf *perf, const char *data); -Outbuf_Perf *outbuf_software_x11_perf_new_x (Display *disp, Window draw, Visual *vis, Colormap cmap, int x_depth); -char *outbuf_software_x11_perf_serialize_info_x (Outbuf_Perf *perf); -void outbuf_software_x11_perf_store_x (Outbuf_Perf *perf); -Outbuf_Perf *outbuf_software_x11_perf_restore_x (Display *disp, Window draw, Visual *vis, Colormap cmap, int x_depth); -void outbuf_software_x11_perf_free (Outbuf_Perf *perf); -Outbuf_Perf *outbuf_software_x11_perf_x (Display *disp, Window draw, Visual *vis, Colormap cmap, int x_depth); +char *evas_software_x11_outbuf_software_x11_perf_serialize_x (Outbuf_Perf *perf); +void evas_software_x11_outbuf_software_x11_perf_deserialize_x (Outbuf_Perf *perf, const char *data); +Outbuf_Perf *evas_software_x11_outbuf_software_x11_perf_new_x (Display *disp, Window draw, Visual *vis, Colormap cmap, int x_depth); +char *evas_software_x11_outbuf_software_x11_perf_serialize_info_x (Outbuf_Perf *perf); +void evas_software_x11_outbuf_software_x11_perf_store_x (Outbuf_Perf *perf); +Outbuf_Perf *evas_software_x11_outbuf_software_x11_perf_restore_x (Display *disp, Window draw, Visual *vis, Colormap cmap, int x_depth); +void evas_software_x11_outbuf_software_x11_perf_free (Outbuf_Perf *perf); +Outbuf_Perf *evas_software_x11_outbuf_software_x11_perf_x (Display *disp, Window draw, Visual *vis, Colormap cmap, int x_depth); -void outbuf_software_x11_blit (Outbuf *buf, int src_x, int src_y, int w, int h, int dst_x, int dst_y); -void outbuf_software_x11_update (Outbuf *buf, int x, int y, int w, int h); -RGBA_Image *outbuf_software_x11_new_region_for_update (Outbuf *buf, int x, int y, int w, int h, int *cx, int *cy, int *cw, int *ch); -void outbuf_software_x11_free_region_for_update (Outbuf *buf, RGBA_Image *update); -void outbuf_software_x11_push_updated_region (Outbuf *buf, RGBA_Image *update, int x, int y, int w, int h); -void outbuf_software_x11_reconfigure (Outbuf *buf, int w, int h, int rot, Outbuf_Depth depth); -int outbuf_software_x11_get_width (Outbuf *buf); -int outbuf_software_x11_get_height (Outbuf *buf); -Outbuf_Depth outbuf_software_x11_get_depth (Outbuf *buf); -int outbuf_software_x11_get_rot (Outbuf *buf); -int outbuf_software_x11_get_have_backbuf (Outbuf *buf); -void outbuf_software_x11_set_have_backbuf (Outbuf *buf, int have_backbuf); -void outbuf_software_x11_drawable_set (Outbuf *buf, Drawable draw); -void outbuf_software_x11_mask_set (Outbuf *buf, Pixmap mask); +void evas_software_x11_outbuf_software_x11_blit (Outbuf *buf, int src_x, int src_y, int w, int h, int dst_x, int dst_y); +void evas_software_x11_outbuf_software_x11_update (Outbuf *buf, int x, int y, int w, int h); +RGBA_Image *evas_software_x11_outbuf_software_x11_new_region_for_update (Outbuf *buf, int x, int y, int w, int h, int *cx, int *cy, int *cw, int *ch); +void evas_software_x11_outbuf_software_x11_free_region_for_update (Outbuf *buf, RGBA_Image *update); +void evas_software_x11_outbuf_software_x11_push_updated_region (Outbuf *buf, RGBA_Image *update, int x, int y, int w, int h); +void evas_software_x11_outbuf_software_x11_reconfigure (Outbuf *buf, int w, int h, int rot, Outbuf_Depth depth); +int evas_software_x11_outbuf_software_x11_get_width (Outbuf *buf); +int evas_software_x11_outbuf_software_x11_get_height (Outbuf *buf); +Outbuf_Depth evas_software_x11_outbuf_software_x11_get_depth (Outbuf *buf); +int evas_software_x11_outbuf_software_x11_get_rot (Outbuf *buf); +int evas_software_x11_outbuf_software_x11_get_have_backbuf (Outbuf *buf); +void evas_software_x11_outbuf_software_x11_set_have_backbuf (Outbuf *buf, int have_backbuf); +void evas_software_x11_outbuf_software_x11_drawable_set (Outbuf *buf, Drawable draw); +void evas_software_x11_outbuf_software_x11_mask_set (Outbuf *buf, Pixmap mask); -void outbuf_software_x11_debug_set (Outbuf *buf, int debug); -void outbuf_software_x11_debug_show (Outbuf *buf, Drawable draw, int x, int y, int w, int h); +void evas_software_x11_outbuf_software_x11_debug_set (Outbuf *buf, int debug); +void evas_software_x11_outbuf_software_x11_debug_show (Outbuf *buf, Drawable draw, int x, int y, int w, int h); #endif diff --git a/legacy/evas/src/lib/engines/software_x11/evas_outbuf.c b/legacy/evas/src/lib/engines/software_x11/evas_outbuf.c index ed910e7ec5..c5d37020db 100644 --- a/legacy/evas/src/lib/engines/software_x11/evas_outbuf.c +++ b/legacy/evas/src/lib/engines/software_x11/evas_outbuf.c @@ -3,11 +3,11 @@ #include #include -static double outbuf_software_x11_get_time(void); +static double evas_software_x11_outbuf_software_x11_get_time(void); /* used for performance tester code */ static double -outbuf_software_x11_get_time(void) +evas_software_x11_outbuf_software_x11_get_time(void) { struct timeval timev; @@ -16,27 +16,27 @@ outbuf_software_x11_get_time(void) } void -outbuf_software_x11_init(void) +evas_software_x11_outbuf_software_x11_init(void) { } void -outbuf_software_x11_free(Outbuf * buf) +evas_software_x11_outbuf_software_x11_free(Outbuf * buf) { XFreeGC(buf->priv.x.disp, buf->priv.x.gc); if (buf->priv.x.gcm) XFreeGC(buf->priv.x.disp, buf->priv.x.gcm); if (buf->priv.pal) - x_software_x11_color_deallocate(buf->priv.x.disp, buf->priv.x.cmap, + evas_software_x11_x_software_x11_color_deallocate(buf->priv.x.disp, buf->priv.x.cmap, buf->priv.x.vis, buf->priv.pal); if (buf->priv.back_buf) - image_free(buf->priv.back_buf); - outbuf_software_x11_perf_free(buf->perf); + evas_common_image_free(buf->priv.back_buf); + evas_software_x11_outbuf_software_x11_perf_free(buf->perf); free(buf); } Outbuf * -outbuf_software_x11_setup_x(int w, int h, int rot, Outbuf_Depth depth, +evas_software_x11_outbuf_software_x11_setup_x(int w, int h, int rot, Outbuf_Depth depth, Display * disp, Drawable draw, Visual * vis, Colormap cmap, int x_depth, Outbuf_Perf * perf, int grayscale, int max_colors, Pixmap mask, @@ -67,8 +67,8 @@ outbuf_software_x11_setup_x(int w, int h, int rot, Outbuf_Depth depth, Gfx_Func_Convert conv_func; X_Output_Buffer *xob; - buf->priv.x.shm = x_software_x11_can_do_shm(buf->priv.x.disp); - xob = x_software_x11_output_buffer_new(buf->priv.x.disp, + buf->priv.x.shm = evas_software_x11_x_software_x11_can_do_shm(buf->priv.x.disp); + xob = evas_software_x11_x_software_x11_output_buffer_new(buf->priv.x.disp, buf->priv.x.vis, buf->priv.x.depth, 1, 1, buf->priv.x.shm, NULL); @@ -77,10 +77,10 @@ outbuf_software_x11_setup_x(int w, int h, int rot, Outbuf_Depth depth, if (xob) { #ifdef WORDS_BIGENDIAN - if (x_software_x11_output_buffer_byte_order(xob) == LSBFirst) + if (evas_software_x11_x_software_x11_output_buffer_byte_order(xob) == LSBFirst) buf->priv.x.swap = 1; #else - if (x_software_x11_output_buffer_byte_order(xob) == MSBFirst) + if (evas_software_x11_x_software_x11_output_buffer_byte_order(xob) == MSBFirst) buf->priv.x.swap = 1; #endif if ((vis->class == TrueColor) || (vis->class == DirectColor)) @@ -137,7 +137,7 @@ outbuf_software_x11_setup_x(int w, int h, int rot, Outbuf_Depth depth, else pm = PAL_MODE_MONO; } - buf->priv.pal = x_software_x11_color_allocate(disp, cmap, vis, + buf->priv.pal = evas_software_x11_x_software_x11_color_allocate(disp, cmap, vis, PAL_MODE_RGB666); if (!buf->priv.pal) { @@ -148,24 +148,24 @@ outbuf_software_x11_setup_x(int w, int h, int rot, Outbuf_Depth depth, if (buf->priv.pal) { if (buf->rot == 0) - conv_func = convert_func_get(0, buf->w, buf->h, - x_software_x11_output_buffer_depth + conv_func = evas_common_convert_func_get(0, buf->w, buf->h, + evas_software_x11_x_software_x11_output_buffer_depth (xob), buf->priv.mask.r, buf->priv.mask.g, buf->priv.mask.b, buf->priv.pal->colors, buf->rot); else if (buf->rot == 270) - conv_func = convert_func_get(0, buf->h, buf->w, - x_software_x11_output_buffer_depth + conv_func = evas_common_convert_func_get(0, buf->h, buf->w, + evas_software_x11_x_software_x11_output_buffer_depth (xob), buf->priv.mask.r, buf->priv.mask.g, buf->priv.mask.b, buf->priv.pal->colors, buf->rot); else if (buf->rot == 90) - conv_func = convert_func_get(0, buf->h, buf->w, - x_software_x11_output_buffer_depth + conv_func = evas_common_convert_func_get(0, buf->h, buf->w, + evas_software_x11_x_software_x11_output_buffer_depth (xob), buf->priv.mask.r, buf->priv.mask.g, buf->priv.mask.b, @@ -175,28 +175,28 @@ outbuf_software_x11_setup_x(int w, int h, int rot, Outbuf_Depth depth, else { if (buf->rot == 0) - conv_func = convert_func_get(0, buf->w, buf->h, - x_software_x11_output_buffer_depth + conv_func = evas_common_convert_func_get(0, buf->w, buf->h, + evas_software_x11_x_software_x11_output_buffer_depth (xob), buf->priv.mask.r, buf->priv.mask.g, buf->priv.mask.b, PAL_MODE_NONE, buf->rot); else if (buf->rot == 270) - conv_func = convert_func_get(0, buf->h, buf->w, - x_software_x11_output_buffer_depth + conv_func = evas_common_convert_func_get(0, buf->h, buf->w, + evas_software_x11_x_software_x11_output_buffer_depth (xob), buf->priv.mask.r, buf->priv.mask.g, buf->priv.mask.b, PAL_MODE_NONE, buf->rot); else if (buf->rot == 90) - conv_func = convert_func_get(0, buf->h, buf->w, - x_software_x11_output_buffer_depth + conv_func = evas_common_convert_func_get(0, buf->h, buf->w, + evas_software_x11_x_software_x11_output_buffer_depth (xob), buf->priv.mask.r, buf->priv.mask.g, buf->priv.mask.b, PAL_MODE_NONE, buf->rot); } - x_software_x11_output_buffer_free(xob); + evas_software_x11_x_software_x11_output_buffer_free(xob); if (!conv_func) { printf(".[ Evas Error ].\n" @@ -212,14 +212,14 @@ outbuf_software_x11_setup_x(int w, int h, int rot, Outbuf_Depth depth, buf->priv.mask.b, buf->priv.pal->colors); } } - buf->priv.x.shm = x_software_x11_can_do_shm(buf->priv.x.disp); - outbuf_software_x11_drawable_set(buf, draw); - outbuf_software_x11_mask_set(buf, mask); + buf->priv.x.shm = evas_software_x11_x_software_x11_can_do_shm(buf->priv.x.disp); + evas_software_x11_outbuf_software_x11_drawable_set(buf, draw); + evas_software_x11_outbuf_software_x11_mask_set(buf, mask); } #if 0 if (buf->priv.x.depth < 24) - buf->priv.back_buf = image_create(buf->w, buf->h); + buf->priv.back_buf = evas_common_image_create(buf->w, buf->h); #endif buf->perf = perf; @@ -228,7 +228,7 @@ outbuf_software_x11_setup_x(int w, int h, int rot, Outbuf_Depth depth, } char * -outbuf_software_x11_perf_serialize_x(Outbuf_Perf * perf) +evas_software_x11_outbuf_software_x11_perf_serialize_x(Outbuf_Perf * perf) { /* take performance results and turn it inot a munged string that can be */ /* written out somewhere by a program */ @@ -239,7 +239,7 @@ outbuf_software_x11_perf_serialize_x(Outbuf_Perf * perf) } void -outbuf_software_x11_perf_deserialize_x(Outbuf_Perf * perf, const char *data) +evas_software_x11_outbuf_software_x11_perf_deserialize_x(Outbuf_Perf * perf, const char *data) { /* take a munged string that is the result of outbuf_perf_serialize_x() */ /* and turn it back into a structure and fill the provided perf struct */ @@ -257,7 +257,7 @@ outbuf_software_x11_perf_deserialize_x(Outbuf_Perf * perf, const char *data) } Outbuf_Perf * -outbuf_software_x11_perf_new_x(Display * disp, Window draw, Visual * vis, +evas_software_x11_outbuf_software_x11_perf_new_x(Display * disp, Window draw, Visual * vis, Colormap cmap, int x_depth) { /* create an "empty" perf struct with just the system & display info */ @@ -366,7 +366,7 @@ outbuf_software_x11_perf_new_x(Display * disp, Window draw, Visual * vis, } char * -outbuf_software_x11_perf_serialize_info_x(Outbuf_Perf * perf) +evas_software_x11_outbuf_software_x11_perf_serialize_info_x(Outbuf_Perf * perf) { /* get a seriazed string that is a unique identifier for your */ /* hardware/x/connection setup. */ @@ -396,7 +396,7 @@ outbuf_software_x11_perf_serialize_info_x(Outbuf_Perf * perf) } void -outbuf_software_x11_perf_store_x(Outbuf_Perf * perf) +evas_software_x11_outbuf_software_x11_perf_store_x(Outbuf_Perf * perf) { /* write performance results to x root property */ Atom type, format; @@ -404,7 +404,7 @@ outbuf_software_x11_perf_store_x(Outbuf_Perf * perf) type = XInternAtom(perf->x.disp, "__EVAS_PERF_ENGINE_SOFTWARE", False); format = XA_STRING; - str = outbuf_software_x11_perf_serialize_x(perf); + str = evas_software_x11_outbuf_software_x11_perf_serialize_x(perf); XChangeProperty(perf->x.disp, perf->x.root, type, format, 8, PropModeReplace, (unsigned char *)str, strlen(str)); XSync(perf->x.disp, False); @@ -412,7 +412,7 @@ outbuf_software_x11_perf_store_x(Outbuf_Perf * perf) } Outbuf_Perf * -outbuf_software_x11_perf_restore_x(Display * disp, Window draw, Visual * vis, +evas_software_x11_outbuf_software_x11_perf_restore_x(Display * disp, Window draw, Visual * vis, Colormap cmap, int x_depth) { /* read performance results from root window */ @@ -423,7 +423,7 @@ outbuf_software_x11_perf_restore_x(Display * disp, Window draw, Visual * vis, unsigned long bytes_after, num_ret; int format_ret; - perf = outbuf_software_x11_perf_new_x(disp, draw, vis, cmap, x_depth); + perf = evas_software_x11_outbuf_software_x11_perf_new_x(disp, draw, vis, cmap, x_depth); type = XInternAtom(disp, "__EVAS_PERF_ENGINE_SOFTWARE", False); format = XA_STRING; retval = NULL; @@ -441,7 +441,7 @@ outbuf_software_x11_perf_restore_x(Display * disp, Window draw, Visual * vis, s = malloc(num_ret + 1); strncpy(s, retval, num_ret); s[num_ret] = 0; - outbuf_software_x11_perf_deserialize_x(perf, s); + evas_software_x11_outbuf_software_x11_perf_deserialize_x(perf, s); free(s); out: XFree(retval); @@ -450,7 +450,7 @@ outbuf_software_x11_perf_restore_x(Display * disp, Window draw, Visual * vis, } void -outbuf_software_x11_perf_free(Outbuf_Perf * perf) +evas_software_x11_outbuf_software_x11_perf_free(Outbuf_Perf * perf) { /* free the perf struct */ free(perf->x.display); @@ -463,7 +463,7 @@ outbuf_software_x11_perf_free(Outbuf_Perf * perf) } Outbuf_Perf * -outbuf_software_x11_perf_x(Display * disp, Window draw, Visual * vis, +evas_software_x11_outbuf_software_x11_perf_x(Display * disp, Window draw, Visual * vis, Colormap cmap, int x_depth) { Outbuf_Perf *perf; @@ -472,7 +472,7 @@ outbuf_software_x11_perf_x(Display * disp, Window draw, Visual * vis, int w, h; int do_shm = 0; - perf = outbuf_software_x11_perf_new_x(disp, draw, vis, cmap, x_depth); + perf = evas_software_x11_outbuf_software_x11_perf_new_x(disp, draw, vis, cmap, x_depth); attr.backing_store = Always; attr.colormap = cmap; @@ -495,7 +495,7 @@ outbuf_software_x11_perf_x(Display * disp, Window draw, Visual * vis, XSync(disp, False); XMapRaised(disp, win); - do_shm = x_software_x11_can_do_shm(disp); + do_shm = evas_software_x11_x_software_x11_can_do_shm(disp); /* set it to something ridiculous to start */ perf->min_shm_image_pixel_count = w * w; @@ -523,36 +523,36 @@ outbuf_software_x11_perf_x(Display * disp, Window draw, Visual * vis, int loops; loops = (h * h * 5) / (i * i); - t0 = outbuf_software_x11_get_time(); + t0 = evas_software_x11_outbuf_software_x11_get_time(); for (l = 0; l < loops; l++) { - xob = x_software_x11_output_buffer_new(disp, vis, x_depth, + xob = evas_software_x11_x_software_x11_output_buffer_new(disp, vis, x_depth, i, i, do_shm, NULL); if (!xob) error = 1; else { - x_software_x11_output_buffer_paste(xob, win, gc, 0, 0); - x_software_x11_output_buffer_free(xob); + evas_software_x11_x_software_x11_output_buffer_paste(xob, win, gc, 0, 0); + evas_software_x11_x_software_x11_output_buffer_free(xob); } } XSync(disp, False); - t1 = outbuf_software_x11_get_time() - t0; - t0 = outbuf_software_x11_get_time(); + t1 = evas_software_x11_outbuf_software_x11_get_time() - t0; + t0 = evas_software_x11_outbuf_software_x11_get_time(); for (l = 0; l < loops; l++) { - xob = x_software_x11_output_buffer_new(disp, vis, x_depth, + xob = evas_software_x11_x_software_x11_output_buffer_new(disp, vis, x_depth, i, i, 0, NULL); if (!xob) error = 1; else { - x_software_x11_output_buffer_paste(xob, win, gc, 0, 0); - x_software_x11_output_buffer_free(xob); + evas_software_x11_x_software_x11_output_buffer_paste(xob, win, gc, 0, 0); + evas_software_x11_x_software_x11_output_buffer_free(xob); } } XSync(disp, False); - t2 = outbuf_software_x11_get_time() - t0; + t2 = evas_software_x11_outbuf_software_x11_get_time() - t0; if ((!chosen) && (!error)) { if ((t1 / t2) < 1.0) @@ -569,14 +569,14 @@ outbuf_software_x11_perf_x(Display * disp, Window draw, Visual * vis, } void -outbuf_software_x11_blit(Outbuf * buf, int src_x, int src_y, int w, int h, +evas_software_x11_outbuf_software_x11_blit(Outbuf * buf, int src_x, int src_y, int w, int h, int dst_x, int dst_y) { if (buf->priv.back_buf) { - blit_rectangle(buf->priv.back_buf, buf->priv.back_buf, + evas_common_blit_rectangle(buf->priv.back_buf, buf->priv.back_buf, src_x, src_y, w, h, dst_x, dst_y); - outbuf_software_x11_update(buf, dst_x, dst_y, w, h); + evas_software_x11_outbuf_software_x11_update(buf, dst_x, dst_y, w, h); } else { @@ -598,7 +598,7 @@ outbuf_software_x11_blit(Outbuf * buf, int src_x, int src_y, int w, int h, } void -outbuf_software_x11_update(Outbuf * buf, int x, int y, int w, int h) +evas_software_x11_outbuf_software_x11_update(Outbuf * buf, int x, int y, int w, int h) { Gfx_Func_Convert conv_func; DATA8 *data; @@ -621,40 +621,40 @@ outbuf_software_x11_update(Outbuf * buf, int x, int y, int w, int h) } xob = NULL; if (buf->rot == 0) - xob = x_software_x11_output_buffer_new(buf->priv.x.disp, buf->priv.x.vis, + xob = evas_software_x11_x_software_x11_output_buffer_new(buf->priv.x.disp, buf->priv.x.vis, buf->priv.x.depth, w, h, use_shm, NULL); else if (buf->rot == 270) - xob = x_software_x11_output_buffer_new(buf->priv.x.disp, buf->priv.x.vis, + xob = evas_software_x11_x_software_x11_output_buffer_new(buf->priv.x.disp, buf->priv.x.vis, buf->priv.x.depth, h, w, use_shm, NULL); else if (buf->rot == 90) - xob = x_software_x11_output_buffer_new(buf->priv.x.disp, buf->priv.x.vis, + xob = evas_software_x11_x_software_x11_output_buffer_new(buf->priv.x.disp, buf->priv.x.vis, buf->priv.x.depth, h, w, use_shm, NULL); if (!xob) return; - data = x_software_x11_output_buffer_data(xob, &bpl); + data = evas_software_x11_x_software_x11_output_buffer_data(xob, &bpl); conv_func = NULL; if (buf->priv.pal) { if (buf->rot == 0) - conv_func = convert_func_get(0, w, h, - x_software_x11_output_buffer_depth(xob), + conv_func = evas_common_convert_func_get(0, w, h, + evas_software_x11_x_software_x11_output_buffer_depth(xob), buf->priv.mask.r, buf->priv.mask.g, buf->priv.mask.b, buf->priv.pal->colors, buf->rot); else if (buf->rot == 270) - conv_func = convert_func_get(0, h, w, - x_software_x11_output_buffer_depth(xob), + conv_func = evas_common_convert_func_get(0, h, w, + evas_software_x11_x_software_x11_output_buffer_depth(xob), buf->priv.mask.r, buf->priv.mask.g, buf->priv.mask.b, buf->priv.pal->colors, buf->rot); else if (buf->rot == 90) - conv_func = convert_func_get(0, h, w, - x_software_x11_output_buffer_depth(xob), + conv_func = evas_common_convert_func_get(0, h, w, + evas_software_x11_x_software_x11_output_buffer_depth(xob), buf->priv.mask.r, buf->priv.mask.g, buf->priv.mask.b, @@ -663,22 +663,22 @@ outbuf_software_x11_update(Outbuf * buf, int x, int y, int w, int h) else { if (buf->rot == 0) - conv_func = convert_func_get(0, w, h, - x_software_x11_output_buffer_depth(xob), + conv_func = evas_common_convert_func_get(0, w, h, + evas_software_x11_x_software_x11_output_buffer_depth(xob), buf->priv.mask.r, buf->priv.mask.g, buf->priv.mask.b, PAL_MODE_NONE, buf->rot); else if (buf->rot == 270) - conv_func = convert_func_get(0, h, w, - x_software_x11_output_buffer_depth(xob), + conv_func = evas_common_convert_func_get(0, h, w, + evas_software_x11_x_software_x11_output_buffer_depth(xob), buf->priv.mask.r, buf->priv.mask.g, buf->priv.mask.b, PAL_MODE_NONE, buf->rot); else if (buf->rot == 90) - conv_func = convert_func_get(0, h, w, - x_software_x11_output_buffer_depth(xob), + conv_func = evas_common_convert_func_get(0, h, w, + evas_software_x11_x_software_x11_output_buffer_depth(xob), buf->priv.mask.r, buf->priv.mask.g, buf->priv.mask.b, @@ -696,12 +696,12 @@ outbuf_software_x11_update(Outbuf * buf, int x, int y, int w, int h) conv_func(src_data, data, buf->w - w, bpl / - ((x_software_x11_output_buffer_depth(xob) / 8)) - w, + ((evas_software_x11_x_software_x11_output_buffer_depth(xob) / 8)) - w, w, h, x, y, buf->priv.pal->lookup); if (buf->priv.debug) - outbuf_software_x11_debug_show(buf, buf->priv.x.win, x, y, + evas_software_x11_outbuf_software_x11_debug_show(buf, buf->priv.x.win, x, y, w, h); - x_software_x11_output_buffer_paste(xob, buf->priv.x.win, + evas_software_x11_x_software_x11_output_buffer_paste(xob, buf->priv.x.win, buf->priv.x.gc, x, y); } else if (buf->rot == 270) @@ -709,12 +709,12 @@ outbuf_software_x11_update(Outbuf * buf, int x, int y, int w, int h) conv_func(src_data, data, buf->w - w, bpl / - ((x_software_x11_output_buffer_depth(xob) / 8)) - h, + ((evas_software_x11_x_software_x11_output_buffer_depth(xob) / 8)) - h, h, w, x, y, buf->priv.pal->lookup); if (buf->priv.debug) - outbuf_software_x11_debug_show(buf, buf->priv.x.win, x, y, + evas_software_x11_outbuf_software_x11_debug_show(buf, buf->priv.x.win, x, y, w, h); - x_software_x11_output_buffer_paste(xob, buf->priv.x.win, + evas_software_x11_x_software_x11_output_buffer_paste(xob, buf->priv.x.win, buf->priv.x.gc, buf->h - y - h, x); } @@ -723,12 +723,12 @@ outbuf_software_x11_update(Outbuf * buf, int x, int y, int w, int h) conv_func(src_data, data, buf->w - w, bpl / - ((x_software_x11_output_buffer_depth(xob) / 8)) - h, + ((evas_software_x11_x_software_x11_output_buffer_depth(xob) / 8)) - h, h, w, x, y, buf->priv.pal->lookup); if (buf->priv.debug) - outbuf_software_x11_debug_show(buf, buf->priv.x.win, x, y, + evas_software_x11_outbuf_software_x11_debug_show(buf, buf->priv.x.win, x, y, w, h); - x_software_x11_output_buffer_paste(xob, buf->priv.x.win, + evas_software_x11_x_software_x11_output_buffer_paste(xob, buf->priv.x.win, buf->priv.x.gc, y, buf->w - x - w); } @@ -740,12 +740,12 @@ outbuf_software_x11_update(Outbuf * buf, int x, int y, int w, int h) conv_func(src_data, data, buf->w - w, bpl / - ((x_software_x11_output_buffer_depth(xob) / 8)) - w, + ((evas_software_x11_x_software_x11_output_buffer_depth(xob) / 8)) - w, w, h, x, y, NULL); if (buf->priv.debug) - outbuf_software_x11_debug_show(buf, buf->priv.x.win, x, y, + evas_software_x11_outbuf_software_x11_debug_show(buf, buf->priv.x.win, x, y, w, h); - x_software_x11_output_buffer_paste(xob, buf->priv.x.win, + evas_software_x11_x_software_x11_output_buffer_paste(xob, buf->priv.x.win, buf->priv.x.gc, x, y); } else if (buf->rot == 270) @@ -753,12 +753,12 @@ outbuf_software_x11_update(Outbuf * buf, int x, int y, int w, int h) conv_func(src_data, data, buf->w - w, bpl / - ((x_software_x11_output_buffer_depth(xob) / 8)) - h, + ((evas_software_x11_x_software_x11_output_buffer_depth(xob) / 8)) - h, h, w, x, y, NULL); if (buf->priv.debug) - outbuf_software_x11_debug_show(buf, buf->priv.x.win, x, y, + evas_software_x11_outbuf_software_x11_debug_show(buf, buf->priv.x.win, x, y, w, h); - x_software_x11_output_buffer_paste(xob, buf->priv.x.win, + evas_software_x11_x_software_x11_output_buffer_paste(xob, buf->priv.x.win, buf->priv.x.gc, buf->h - y - h, x); } @@ -767,12 +767,12 @@ outbuf_software_x11_update(Outbuf * buf, int x, int y, int w, int h) conv_func(src_data, data, buf->w - w, bpl / - ((x_software_x11_output_buffer_depth(xob) / 8)) - h, + ((evas_software_x11_x_software_x11_output_buffer_depth(xob) / 8)) - h, h, w, x, y, NULL); if (buf->priv.debug) - outbuf_software_x11_debug_show(buf, buf->priv.x.win, x, y, + evas_software_x11_outbuf_software_x11_debug_show(buf, buf->priv.x.win, x, y, w, h); - x_software_x11_output_buffer_paste(xob, buf->priv.x.win, + evas_software_x11_x_software_x11_output_buffer_paste(xob, buf->priv.x.win, buf->priv.x.gc, y, buf->w - x - w); } @@ -780,14 +780,14 @@ outbuf_software_x11_update(Outbuf * buf, int x, int y, int w, int h) } else { - x_software_x11_output_buffer_free(xob); + evas_software_x11_x_software_x11_output_buffer_free(xob); return; } - x_software_x11_output_buffer_free(xob); + evas_software_x11_x_software_x11_output_buffer_free(xob); } RGBA_Image * -outbuf_software_x11_new_region_for_update(Outbuf * buf, int x, int y, int w, +evas_software_x11_outbuf_software_x11_new_region_for_update(Outbuf * buf, int x, int y, int w, int h, int *cx, int *cy, int *cw, int *ch) { @@ -807,7 +807,7 @@ outbuf_software_x11_new_region_for_update(Outbuf * buf, int x, int y, int w, *cy = 0; *cw = w; *ch = h; - im = image_create(w, h); + im = evas_common_image_create(w, h); if (buf->priv.x.mask) { im->flags |= RGBA_IMAGE_HAS_ALPHA; @@ -819,21 +819,21 @@ outbuf_software_x11_new_region_for_update(Outbuf * buf, int x, int y, int w, } void -outbuf_software_x11_free_region_for_update(Outbuf * buf, RGBA_Image * update) +evas_software_x11_outbuf_software_x11_free_region_for_update(Outbuf * buf, RGBA_Image * update) { if (update != buf->priv.back_buf) - image_free(update); + evas_common_image_free(update); } void -outbuf_software_x11_push_updated_region(Outbuf * buf, RGBA_Image * update, +evas_software_x11_outbuf_software_x11_push_updated_region(Outbuf * buf, RGBA_Image * update, int x, int y, int w, int h) { if (buf->priv.back_buf) { if (update != buf->priv.back_buf) - blit_rectangle(update, buf->priv.back_buf, 0, 0, w, h, x, y); - outbuf_software_x11_update(buf, x, y, w, h); + evas_common_blit_rectangle(update, buf->priv.back_buf, 0, 0, w, h, x, y); + evas_software_x11_outbuf_software_x11_update(buf, x, y, w, h); } else { @@ -870,41 +870,41 @@ outbuf_software_x11_push_updated_region(Outbuf * buf, RGBA_Image * update, if (!direct_data) orig_data = NULL; if (buf->rot == 0) - xob = x_software_x11_output_buffer_new(buf->priv.x.disp, + xob = evas_software_x11_x_software_x11_output_buffer_new(buf->priv.x.disp, buf->priv.x.vis, buf->priv.x.depth, w, h, use_shm, orig_data); else if (buf->rot == 270) - xob = x_software_x11_output_buffer_new(buf->priv.x.disp, + xob = evas_software_x11_x_software_x11_output_buffer_new(buf->priv.x.disp, buf->priv.x.vis, buf->priv.x.depth, h, w, use_shm, orig_data); else if (buf->rot == 90) - xob = x_software_x11_output_buffer_new(buf->priv.x.disp, + xob = evas_software_x11_x_software_x11_output_buffer_new(buf->priv.x.disp, buf->priv.x.vis, buf->priv.x.depth, h, w, use_shm, orig_data); if (!xob) return; - data = x_software_x11_output_buffer_data(xob, &bpl); + data = evas_software_x11_x_software_x11_output_buffer_data(xob, &bpl); conv_func = NULL; if (buf->priv.pal) { if (buf->rot == 0) - conv_func = convert_func_get(0, w, h, - x_software_x11_output_buffer_depth + conv_func = evas_common_convert_func_get(0, w, h, + evas_software_x11_x_software_x11_output_buffer_depth (xob), buf->priv.mask.r, buf->priv.mask.g, buf->priv.mask.b, buf->priv.pal->colors, buf->rot); else if (buf->rot == 270) - conv_func = convert_func_get(0, h, w, - x_software_x11_output_buffer_depth + conv_func = evas_common_convert_func_get(0, h, w, + evas_software_x11_x_software_x11_output_buffer_depth (xob), buf->priv.mask.r, buf->priv.mask.g, buf->priv.mask.b, buf->priv.pal->colors, buf->rot); else if (buf->rot == 90) - conv_func = convert_func_get(0, h, w, - x_software_x11_output_buffer_depth + conv_func = evas_common_convert_func_get(0, h, w, + evas_software_x11_x_software_x11_output_buffer_depth (xob), buf->priv.mask.r, buf->priv.mask.g, buf->priv.mask.b, buf->priv.pal->colors, buf->rot); @@ -912,20 +912,20 @@ outbuf_software_x11_push_updated_region(Outbuf * buf, RGBA_Image * update, else { if (buf->rot == 0) - conv_func = convert_func_get(0, w, h, - x_software_x11_output_buffer_depth + conv_func = evas_common_convert_func_get(0, w, h, + evas_software_x11_x_software_x11_output_buffer_depth (xob), buf->priv.mask.r, buf->priv.mask.g, buf->priv.mask.b, PAL_MODE_NONE, buf->rot); else if (buf->rot == 270) - conv_func = convert_func_get(0, h, w, - x_software_x11_output_buffer_depth + conv_func = evas_common_convert_func_get(0, h, w, + evas_software_x11_x_software_x11_output_buffer_depth (xob), buf->priv.mask.r, buf->priv.mask.g, buf->priv.mask.b, PAL_MODE_NONE, buf->rot); else if (buf->rot == 90) - conv_func = convert_func_get(0, h, w, - x_software_x11_output_buffer_depth + conv_func = evas_common_convert_func_get(0, h, w, + evas_software_x11_x_software_x11_output_buffer_depth (xob), buf->priv.mask.r, buf->priv.mask.g, buf->priv.mask.b, PAL_MODE_NONE, buf->rot); @@ -938,15 +938,15 @@ outbuf_software_x11_push_updated_region(Outbuf * buf, RGBA_Image * update, if (buf->priv.x.mask) { if (buf->rot == 0) - mxob = x_software_x11_output_buffer_new(buf->priv.x.disp, + mxob = evas_software_x11_x_software_x11_output_buffer_new(buf->priv.x.disp, buf->priv.x.vis, 1, w, h, 0, NULL); else if (buf->rot == 270) - mxob = x_software_x11_output_buffer_new(buf->priv.x.disp, + mxob = evas_software_x11_x_software_x11_output_buffer_new(buf->priv.x.disp, buf->priv.x.vis, 1, h, w, 0, NULL); else if (buf->rot == 90) - mxob = x_software_x11_output_buffer_new(buf->priv.x.disp, + mxob = evas_software_x11_x_software_x11_output_buffer_new(buf->priv.x.disp, buf->priv.x.vis, 1, h, w, 0, NULL); } @@ -959,23 +959,23 @@ outbuf_software_x11_push_updated_region(Outbuf * buf, RGBA_Image * update, conv_func(src_data, data, 0, bpl / - ((x_software_x11_output_buffer_depth(xob) / + ((evas_software_x11_x_software_x11_output_buffer_depth(xob) / 8)) - w, w, h, x, y, buf->priv.pal->lookup); if (buf->priv.debug) - outbuf_software_x11_debug_show(buf, buf->priv.x.win, + evas_software_x11_outbuf_software_x11_debug_show(buf, buf->priv.x.win, x, y, w, h); - x_software_x11_output_buffer_paste(xob, buf->priv.x.win, + evas_software_x11_x_software_x11_output_buffer_paste(xob, buf->priv.x.win, buf->priv.x.gc, x, y); if (mxob) { int yy; for (yy = 0; yy < h; yy++) - x_software_x11_write_mask_line(mxob, + evas_software_x11_x_software_x11_write_mask_line(mxob, src_data + (yy * w), w, yy); - x_software_x11_output_buffer_paste(mxob, + evas_software_x11_x_software_x11_output_buffer_paste(mxob, buf->priv.x.mask, buf->priv.x.gcm, x, y); @@ -987,13 +987,13 @@ outbuf_software_x11_push_updated_region(Outbuf * buf, RGBA_Image * update, conv_func(src_data, data, 0, bpl / - ((x_software_x11_output_buffer_depth(xob) / + ((evas_software_x11_x_software_x11_output_buffer_depth(xob) / 8)) - h, h, w, x, y, buf->priv.pal->lookup); if (buf->priv.debug) - outbuf_software_x11_debug_show(buf, buf->priv.x.win, + evas_software_x11_outbuf_software_x11_debug_show(buf, buf->priv.x.win, x, y, w, h); - x_software_x11_output_buffer_paste(xob, buf->priv.x.win, + evas_software_x11_x_software_x11_output_buffer_paste(xob, buf->priv.x.win, buf->priv.x.gc, buf->h - y - h, x); if (mxob) @@ -1001,8 +1001,8 @@ outbuf_software_x11_push_updated_region(Outbuf * buf, RGBA_Image * update, int yy; /* for (yy = 0; yy < h; yy++)*/ -/* x_software_x11_write_mask_line(mxob, src_data + (yy * w), w, yy);*/ - x_software_x11_output_buffer_paste(mxob, +/* evas_software_x11_x_software_x11_write_mask_line(mxob, src_data + (yy * w), w, yy);*/ + evas_software_x11_x_software_x11_output_buffer_paste(mxob, buf->priv.x.mask, buf->priv.x.gcm, buf->h - y - h, @@ -1015,13 +1015,13 @@ outbuf_software_x11_push_updated_region(Outbuf * buf, RGBA_Image * update, conv_func(src_data, data, 0, bpl / - ((x_software_x11_output_buffer_depth(xob) / + ((evas_software_x11_x_software_x11_output_buffer_depth(xob) / 8)) - h, h, w, x, y, buf->priv.pal->lookup); if (buf->priv.debug) - outbuf_software_x11_debug_show(buf, buf->priv.x.win, + evas_software_x11_outbuf_software_x11_debug_show(buf, buf->priv.x.win, x, y, w, h); - x_software_x11_output_buffer_paste(xob, buf->priv.x.win, + evas_software_x11_x_software_x11_output_buffer_paste(xob, buf->priv.x.win, buf->priv.x.gc, y, buf->w - x - w); if (mxob) @@ -1029,8 +1029,8 @@ outbuf_software_x11_push_updated_region(Outbuf * buf, RGBA_Image * update, int yy; /* for (yy = 0; yy < h; yy++)*/ -/* x_software_x11_write_mask_line(mxob, src_data + (yy * w), w, yy);*/ - x_software_x11_output_buffer_paste(mxob, +/* evas_software_x11_x_software_x11_write_mask_line(mxob, src_data + (yy * w), w, yy);*/ + evas_software_x11_x_software_x11_output_buffer_paste(mxob, buf->priv.x.mask, buf->priv.x.gcm, y, @@ -1046,22 +1046,22 @@ outbuf_software_x11_push_updated_region(Outbuf * buf, RGBA_Image * update, conv_func(src_data, data, 0, bpl / - ((x_software_x11_output_buffer_depth(xob) / + ((evas_software_x11_x_software_x11_output_buffer_depth(xob) / 8)) - w, w, h, x, y, NULL); if (buf->priv.debug) - outbuf_software_x11_debug_show(buf, buf->priv.x.win, + evas_software_x11_outbuf_software_x11_debug_show(buf, buf->priv.x.win, x, y, w, h); - x_software_x11_output_buffer_paste(xob, buf->priv.x.win, + evas_software_x11_x_software_x11_output_buffer_paste(xob, buf->priv.x.win, buf->priv.x.gc, x, y); if (mxob) { int yy; for (yy = 0; yy < h; yy++) - x_software_x11_write_mask_line(mxob, + evas_software_x11_x_software_x11_write_mask_line(mxob, src_data + (yy * w), w, yy); - x_software_x11_output_buffer_paste(mxob, + evas_software_x11_x_software_x11_output_buffer_paste(mxob, buf->priv.x.mask, buf->priv.x.gcm, x, y); @@ -1073,12 +1073,12 @@ outbuf_software_x11_push_updated_region(Outbuf * buf, RGBA_Image * update, conv_func(src_data, data, 0, bpl / - ((x_software_x11_output_buffer_depth(xob) / + ((evas_software_x11_x_software_x11_output_buffer_depth(xob) / 8)) - h, h, w, x, y, NULL); if (buf->priv.debug) - outbuf_software_x11_debug_show(buf, buf->priv.x.win, + evas_software_x11_outbuf_software_x11_debug_show(buf, buf->priv.x.win, x, y, w, h); - x_software_x11_output_buffer_paste(xob, buf->priv.x.win, + evas_software_x11_x_software_x11_output_buffer_paste(xob, buf->priv.x.win, buf->priv.x.gc, buf->h - y - h, x); if (mxob) @@ -1086,8 +1086,8 @@ outbuf_software_x11_push_updated_region(Outbuf * buf, RGBA_Image * update, int yy; /* for (yy = 0; yy < h; yy++)*/ -/* x_software_x11_write_mask_line(mxob, src_data + (yy * w), w, yy);*/ - x_software_x11_output_buffer_paste(mxob, +/* evas_software_x11_x_software_x11_write_mask_line(mxob, src_data + (yy * w), w, yy);*/ + evas_software_x11_x_software_x11_output_buffer_paste(mxob, buf->priv.x.mask, buf->priv.x.gcm, buf->h - y - h, @@ -1100,12 +1100,12 @@ outbuf_software_x11_push_updated_region(Outbuf * buf, RGBA_Image * update, conv_func(src_data, data, 0, bpl / - ((x_software_x11_output_buffer_depth(xob) / + ((evas_software_x11_x_software_x11_output_buffer_depth(xob) / 8)) - h, h, w, x, y, NULL); if (buf->priv.debug) - outbuf_software_x11_debug_show(buf, buf->priv.x.win, + evas_software_x11_outbuf_software_x11_debug_show(buf, buf->priv.x.win, x, y, w, h); - x_software_x11_output_buffer_paste(xob, buf->priv.x.win, + evas_software_x11_x_software_x11_output_buffer_paste(xob, buf->priv.x.win, buf->priv.x.gc, y, buf->w - x - w); if (mxob) @@ -1113,8 +1113,8 @@ outbuf_software_x11_push_updated_region(Outbuf * buf, RGBA_Image * update, int yy; /* for (yy = 0; yy < h; yy++)*/ -/* x_software_x11_write_mask_line(mxob, src_data + (yy * w), w, yy);*/ - x_software_x11_output_buffer_paste(mxob, +/* evas_software_x11_x_software_x11_write_mask_line(mxob, src_data + (yy * w), w, yy);*/ + evas_software_x11_x_software_x11_output_buffer_paste(mxob, buf->priv.x.mask, buf->priv.x.gcm, y, @@ -1123,19 +1123,19 @@ outbuf_software_x11_push_updated_region(Outbuf * buf, RGBA_Image * update, } } if (mxob) - x_software_x11_output_buffer_free(mxob); + evas_software_x11_x_software_x11_output_buffer_free(mxob); } else { - x_software_x11_output_buffer_free(xob); + evas_software_x11_x_software_x11_output_buffer_free(xob); return; } - x_software_x11_output_buffer_free(xob); + evas_software_x11_x_software_x11_output_buffer_free(xob); } } void -outbuf_software_x11_reconfigure(Outbuf * buf, int w, int h, int rot, +evas_software_x11_outbuf_software_x11_reconfigure(Outbuf * buf, int w, int h, int rot, Outbuf_Depth depth) { if ((w == buf->w) && (h == buf->h) && @@ -1146,42 +1146,42 @@ outbuf_software_x11_reconfigure(Outbuf * buf, int w, int h, int rot, buf->rot = rot; if (buf->priv.back_buf) { - image_free(buf->priv.back_buf); + evas_common_image_free(buf->priv.back_buf); buf->priv.back_buf = NULL; } if (buf->priv.x.disp) { if (buf->priv.x.depth < 24) - buf->priv.back_buf = image_create(buf->w, buf->h); + buf->priv.back_buf = evas_common_image_create(buf->w, buf->h); } } int -outbuf_software_x11_get_width(Outbuf * buf) +evas_software_x11_outbuf_software_x11_get_width(Outbuf * buf) { return buf->w; } int -outbuf_software_x11_get_height(Outbuf * buf) +evas_software_x11_outbuf_software_x11_get_height(Outbuf * buf) { return buf->h; } Outbuf_Depth -outbuf_software_x11_get_depth(Outbuf * buf) +evas_software_x11_outbuf_software_x11_get_depth(Outbuf * buf) { return buf->depth; } int -outbuf_software_x11_get_rot(Outbuf * buf) +evas_software_x11_outbuf_software_x11_get_rot(Outbuf * buf) { return buf->rot; } int -outbuf_software_x11_get_have_backbuf(Outbuf * buf) +evas_software_x11_outbuf_software_x11_get_have_backbuf(Outbuf * buf) { if (buf->priv.back_buf) return 1; @@ -1189,13 +1189,13 @@ outbuf_software_x11_get_have_backbuf(Outbuf * buf) } void -outbuf_software_x11_set_have_backbuf(Outbuf * buf, int have_backbuf) +evas_software_x11_outbuf_software_x11_set_have_backbuf(Outbuf * buf, int have_backbuf) { if (buf->priv.back_buf) { if (have_backbuf) return; - image_free(buf->priv.back_buf); + evas_common_image_free(buf->priv.back_buf); buf->priv.back_buf = NULL; } else @@ -1205,13 +1205,13 @@ outbuf_software_x11_set_have_backbuf(Outbuf * buf, int have_backbuf) if (buf->priv.x.disp) { if (buf->priv.x.depth < 24) - buf->priv.back_buf = image_create(buf->w, buf->h); + buf->priv.back_buf = evas_common_image_create(buf->w, buf->h); } } } void -outbuf_software_x11_drawable_set(Outbuf * buf, Drawable draw) +evas_software_x11_outbuf_software_x11_drawable_set(Outbuf * buf, Drawable draw) { XGCValues gcv; @@ -1229,7 +1229,7 @@ outbuf_software_x11_drawable_set(Outbuf * buf, Drawable draw) } void -outbuf_software_x11_mask_set(Outbuf * buf, Pixmap mask) +evas_software_x11_outbuf_software_x11_mask_set(Outbuf * buf, Pixmap mask) { XGCValues gcv; @@ -1248,13 +1248,13 @@ outbuf_software_x11_mask_set(Outbuf * buf, Pixmap mask) } void -outbuf_software_x11_debug_set(Outbuf * buf, int debug) +evas_software_x11_outbuf_software_x11_debug_set(Outbuf * buf, int debug) { buf->priv.debug = debug; } void -outbuf_software_x11_debug_show(Outbuf * buf, Drawable draw, int x, int y, int w, +evas_software_x11_outbuf_software_x11_debug_show(Outbuf * buf, Drawable draw, int x, int y, int w, int h) { int i; diff --git a/legacy/evas/src/lib/engines/software_x11/evas_x_buffer.c b/legacy/evas/src/lib/engines/software_x11/evas_x_buffer.c index 77494d265a..66b498588d 100644 --- a/legacy/evas/src/lib/engines/software_x11/evas_x_buffer.c +++ b/legacy/evas/src/lib/engines/software_x11/evas_x_buffer.c @@ -18,7 +18,7 @@ struct _X_Output_Buffer static int _x_err = 0; void -x_software_x11_write_mask_line(X_Output_Buffer *xob, DATA32 *src, int w, int y) +evas_software_x11_x_software_x11_write_mask_line(X_Output_Buffer *xob, DATA32 *src, int w, int y) { int x; @@ -29,19 +29,19 @@ x_software_x11_write_mask_line(X_Output_Buffer *xob, DATA32 *src, int w, int y) } int -x_software_x11_can_do_shm(Display *d) +evas_software_x11_x_software_x11_can_do_shm(Display *d) { if (XShmQueryExtension(d)) { X_Output_Buffer *xob; - xob = x_software_x11_output_buffer_new(d, + xob = evas_software_x11_x_software_x11_output_buffer_new(d, DefaultVisual(d, DefaultScreen(d)), DefaultDepth(d, DefaultScreen(d)), 16, 16, 2, NULL); if (!xob) return 0; - x_software_x11_output_buffer_free(xob); + evas_software_x11_x_software_x11_output_buffer_free(xob); return 1; } return 0; @@ -57,7 +57,7 @@ x_software_x11_output_tmp_x_err(Display * d, XErrorEvent * ev) } X_Output_Buffer * -x_software_x11_output_buffer_new(Display *d, Visual *v, int depth, int w, int h, int try_shm, void *data) +evas_software_x11_x_software_x11_output_buffer_new(Display *d, Visual *v, int depth, int w, int h, int try_shm, void *data) { X_Output_Buffer *xob; @@ -137,7 +137,7 @@ x_software_x11_output_buffer_new(Display *d, Visual *v, int depth, int w, int h, } void -x_software_x11_output_buffer_free(X_Output_Buffer *xob) +evas_software_x11_x_software_x11_output_buffer_free(X_Output_Buffer *xob) { if (xob->shm_info) { @@ -157,7 +157,7 @@ x_software_x11_output_buffer_free(X_Output_Buffer *xob) } void -x_software_x11_output_buffer_paste(X_Output_Buffer *xob, Drawable d, GC gc, int x, int y) +evas_software_x11_x_software_x11_output_buffer_paste(X_Output_Buffer *xob, Drawable d, GC gc, int x, int y) { if (xob->shm_info) { @@ -171,20 +171,20 @@ x_software_x11_output_buffer_paste(X_Output_Buffer *xob, Drawable d, GC gc, int } DATA8 * -x_software_x11_output_buffer_data(X_Output_Buffer *xob, int *bytes_per_line_ret) +evas_software_x11_x_software_x11_output_buffer_data(X_Output_Buffer *xob, int *bytes_per_line_ret) { if (bytes_per_line_ret) *bytes_per_line_ret = xob->xim->bytes_per_line; return xob->xim->data; } int -x_software_x11_output_buffer_depth(X_Output_Buffer *xob) +evas_software_x11_x_software_x11_output_buffer_depth(X_Output_Buffer *xob) { return xob->xim->bits_per_pixel; } int -x_software_x11_output_buffer_byte_order(X_Output_Buffer *xob) +evas_software_x11_x_software_x11_output_buffer_byte_order(X_Output_Buffer *xob) { return xob->xim->byte_order; } diff --git a/legacy/evas/src/lib/engines/software_x11/evas_x_color.c b/legacy/evas/src/lib/engines/software_x11/evas_x_color.c index 6d41104ec1..f21be189d8 100644 --- a/legacy/evas/src/lib/engines/software_x11/evas_x_color.c +++ b/legacy/evas/src/lib/engines/software_x11/evas_x_color.c @@ -262,7 +262,7 @@ x_software_x11_color_init(void) } Convert_Pal * -x_software_x11_color_allocate(Display *disp, Colormap cmap, Visual *vis, Convert_Pal_Mode colors) +evas_software_x11_x_software_x11_color_allocate(Display *disp, Colormap cmap, Visual *vis, Convert_Pal_Mode colors) { Convert_Pal_Priv *palpriv; Convert_Pal *pal; @@ -316,7 +316,7 @@ x_software_x11_color_allocate(Display *disp, Colormap cmap, Visual *vis, Convert } void -x_software_x11_color_deallocate(Display *disp, Colormap cmap, Visual *vis, +evas_software_x11_x_software_x11_color_deallocate(Display *disp, Colormap cmap, Visual *vis, Convert_Pal *pal) { unsigned long pixels[256]; diff --git a/legacy/evas/src/lib/engines/software_x11/evas_x_main.c b/legacy/evas/src/lib/engines/software_x11/evas_x_main.c index 7162f7037d..15c47f03ac 100644 --- a/legacy/evas/src/lib/engines/software_x11/evas_x_main.c +++ b/legacy/evas/src/lib/engines/software_x11/evas_x_main.c @@ -5,6 +5,6 @@ #include void -x_software_x11_init(void) +evas_software_x11_x_software_x11_init(void) { } diff --git a/legacy/evas/src/lib/include/evas_common.h b/legacy/evas/src/lib/include/evas_common.h index 83aa1ff95a..958b9f3420 100644 --- a/legacy/evas/src/lib/include/evas_common.h +++ b/legacy/evas/src/lib/include/evas_common.h @@ -560,268 +560,268 @@ void *evas_object_list_remove (void *in_list, void *in_item); void *evas_object_list_find (void *in_list, void *in_item); /****/ -void cpu_init (void); +void evas_common_cpu_init (void); -int cpu_have_cpuid (void); -void cpu_can_do (int *mmx, int *sse, int *sse2); -void cpu_end_opt (void); +int evas_common_cpu_have_cpuid (void); +void evas_common_cpu_can_do (int *mmx, int *sse, int *sse2); +void evas_common_cpu_end_opt (void); /****/ -void blend_init (void); +void evas_common_blend_init (void); -void blend_pixels_rgba_to_rgb_c (DATA32 *src, DATA32 *dst, int len); -void blend_pixels_rgba_to_rgb_mmx (DATA32 *src, DATA32 *dst, int len); -void blend_pixels_rgba_to_rgba_c (DATA32 *src, DATA32 *dst, int len); +void evas_common_blend_pixels_rgba_to_rgb_c (DATA32 *src, DATA32 *dst, int len); +void evas_common_blend_pixels_rgba_to_rgb_mmx (DATA32 *src, DATA32 *dst, int len); +void evas_common_blend_pixels_rgba_to_rgba_c (DATA32 *src, DATA32 *dst, int len); -void copy_pixels_rgba_to_rgba_c (DATA32 *src, DATA32 *dst, int len); -void copy_pixels_rgba_to_rgba_mmx (DATA32 *src, DATA32 *dst, int len); -void copy_pixels_rgba_to_rgba_sse/*NB*/ (DATA32 *src, DATA32 *dst, int len); -void copy_pixels_rgb_to_rgba_c (DATA32 *src, DATA32 *dst, int len); +void evas_common_copy_pixels_rgba_to_rgba_c (DATA32 *src, DATA32 *dst, int len); +void evas_common_copy_pixels_rgba_to_rgba_mmx (DATA32 *src, DATA32 *dst, int len); +void evas_common_copy_pixels_rgba_to_rgba_sse/*NB*/ (DATA32 *src, DATA32 *dst, int len); +void evas_common_copy_pixels_rgb_to_rgba_c (DATA32 *src, DATA32 *dst, int len); -void copy_pixels_rev_rgba_to_rgba_c (DATA32 *src, DATA32 *dst, int len); -void copy_pixels_rev_rgba_to_rgba_mmx (DATA32 *src, DATA32 *dst, int len); -void copy_pixels_rev_rgba_to_rgba_sse/*NB*/ (DATA32 *src, DATA32 *dst, int len); -void copy_pixels_rev_rgb_to_rgba_c (DATA32 *src, DATA32 *dst, int len); +void evas_common_copy_pixels_rev_rgba_to_rgba_c (DATA32 *src, DATA32 *dst, int len); +void evas_common_copy_pixels_rev_rgba_to_rgba_mmx (DATA32 *src, DATA32 *dst, int len); +void evas_common_copy_pixels_rev_rgba_to_rgba_sse/*NB*/ (DATA32 *src, DATA32 *dst, int len); +void evas_common_copy_pixels_rev_rgb_to_rgba_c (DATA32 *src, DATA32 *dst, int len); -void blend_color_rgba_to_rgb_c (DATA32 src, DATA32 *dst, int len); -void blend_color_rgba_to_rgb_mmx (DATA32 src, DATA32 *dst, int len); -void blend_color_rgba_to_rgba_c (DATA32 src, DATA32 *dst, int len); +void evas_common_blend_color_rgba_to_rgb_c (DATA32 src, DATA32 *dst, int len); +void evas_common_blend_color_rgba_to_rgb_mmx (DATA32 src, DATA32 *dst, int len); +void evas_common_blend_color_rgba_to_rgba_c (DATA32 src, DATA32 *dst, int len); -void copy_color_rgba_to_rgba_c (DATA32 src, DATA32 *dst, int len); -void copy_color_rgba_to_rgba_mmx (DATA32 src, DATA32 *dst, int len); -void copy_color_rgba_to_rgba_sse/*NB*/ (DATA32 src, DATA32 *dst, int len); -void copy_color_rgb_to_rgba_c (DATA32 src, DATA32 *dst, int len); +void evas_common_copy_color_rgba_to_rgba_c (DATA32 src, DATA32 *dst, int len); +void evas_common_copy_color_rgba_to_rgba_mmx (DATA32 src, DATA32 *dst, int len); +void evas_common_copy_color_rgba_to_rgba_sse/*NB*/ (DATA32 src, DATA32 *dst, int len); +void evas_common_copy_color_rgb_to_rgba_c (DATA32 src, DATA32 *dst, int len); -void blend_pixels_cmod_rgba_to_rgb_c (DATA32 *src, DATA32 *dst, int len, DATA8 *rmod, DATA8 *gmod, DATA8 *bmod, DATA8 *amod); -void blend_pixels_cmod_rgba_to_rgba_c (DATA32 *src, DATA32 *dst, int len, DATA8 *rmod, DATA8 *gmod, DATA8 *bmod, DATA8 *amod); +void evas_common_blend_pixels_cmod_rgba_to_rgb_c (DATA32 *src, DATA32 *dst, int len, DATA8 *rmod, DATA8 *gmod, DATA8 *bmod, DATA8 *amod); +void evas_common_blend_pixels_cmod_rgba_to_rgba_c (DATA32 *src, DATA32 *dst, int len, DATA8 *rmod, DATA8 *gmod, DATA8 *bmod, DATA8 *amod); -void copy_pixels_cmod_rgba_to_rgba_c (DATA32 *src, DATA32 *dst, int len, DATA8 *rmod, DATA8 *gmod, DATA8 *bmod, DATA8 *amod); -void copy_pixels_cmod_rgb_to_rgba_c (DATA32 *src, DATA32 *dst, int len, DATA8 *rmod, DATA8 *gmod, DATA8 *bmod, DATA8 *amod); +void evas_common_copy_pixels_cmod_rgba_to_rgba_c (DATA32 *src, DATA32 *dst, int len, DATA8 *rmod, DATA8 *gmod, DATA8 *bmod, DATA8 *amod); +void evas_common_copy_pixels_cmod_rgb_to_rgba_c (DATA32 *src, DATA32 *dst, int len, DATA8 *rmod, DATA8 *gmod, DATA8 *bmod, DATA8 *amod); -void blend_pixels_mul_color_rgba_to_rgb_c (DATA32 *src, DATA32 *dst, int len, DATA32 mul_color); -void blend_pixels_mul_color_rgba_to_rgb_mmx (DATA32 *src, DATA32 *dst, int len, DATA32 mul_color); -void blend_pixels_mul_color_rgba_to_rgba_c (DATA32 *src, DATA32 *dst, int len, DATA32 mul_color); +void evas_common_blend_pixels_mul_color_rgba_to_rgb_c (DATA32 *src, DATA32 *dst, int len, DATA32 mul_color); +void evas_common_blend_pixels_mul_color_rgba_to_rgb_mmx (DATA32 *src, DATA32 *dst, int len, DATA32 mul_color); +void evas_common_blend_pixels_mul_color_rgba_to_rgba_c (DATA32 *src, DATA32 *dst, int len, DATA32 mul_color); -void blend_alpha_color_rgba_to_rgb_c (DATA8 *src, DATA32 *dst, int len, DATA32 col); -void blend_alpha_color_rgba_to_rgb_mmx (DATA8 *src, DATA32 *dst, int len, DATA32 col); -void blend_alpha_color_rgba_to_rgba_c (DATA8 *src, DATA32 *dst, int len, DATA32 col); +void evas_common_blend_alpha_color_rgba_to_rgb_c (DATA8 *src, DATA32 *dst, int len, DATA32 col); +void evas_common_blend_alpha_color_rgba_to_rgb_mmx (DATA8 *src, DATA32 *dst, int len, DATA32 col); +void evas_common_blend_alpha_color_rgba_to_rgba_c (DATA8 *src, DATA32 *dst, int len, DATA32 col); /****/ -void convert_init (void); -Gfx_Func_Convert convert_func_get (DATA8 *dest, int w, int h, int depth, DATA32 rmask, DATA32 gmask, DATA32 bmask, Convert_Pal_Mode pal_mode, int rotation); +void evas_common_convert_init (void); +Gfx_Func_Convert evas_common_convert_func_get (DATA8 *dest, int w, int h, int depth, DATA32 rmask, DATA32 gmask, DATA32 bmask, Convert_Pal_Mode pal_mode, int rotation); -void convert_rgba2_to_16bpp_rgb_565_dith (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal); -void convert_rgba_to_16bpp_rgb_565_dith (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal); -void convert_rgba2_to_16bpp_rgb_444_dith (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal); -void convert_rgba_to_16bpp_rgb_444_dith (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal); -void convert_rgba2_to_16bpp_rgb_454645_dith (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal); -void convert_rgba_to_16bpp_rgb_454645_dith (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal); -void convert_rgba2_to_16bpp_rgb_555_dith (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal); -void convert_rgba_to_16bpp_rgb_555_dith (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal); +void evas_common_convert_rgba2_to_16bpp_rgb_565_dith (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal); +void evas_common_convert_rgba_to_16bpp_rgb_565_dith (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal); +void evas_common_convert_rgba2_to_16bpp_rgb_444_dith (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal); +void evas_common_convert_rgba_to_16bpp_rgb_444_dith (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal); +void evas_common_convert_rgba2_to_16bpp_rgb_454645_dith (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal); +void evas_common_convert_rgba_to_16bpp_rgb_454645_dith (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal); +void evas_common_convert_rgba2_to_16bpp_rgb_555_dith (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal); +void evas_common_convert_rgba_to_16bpp_rgb_555_dith (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal); -void convert_rgba2_to_16bpp_rgb_565_dith_rot_270 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal); -void convert_rgba_to_16bpp_rgb_565_dith_rot_270 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal); -void convert_rgba2_to_16bpp_rgb_444_dith_rot_270 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal); -void convert_rgba_to_16bpp_rgb_444_dith_rot_270 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal); -void convert_rgba2_to_16bpp_rgb_454645_dith_rot_270 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal); -void convert_rgba_to_16bpp_rgb_454645_dith_rot_270 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal); -void convert_rgba2_to_16bpp_rgb_555_dith_rot_270 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal); -void convert_rgba_to_16bpp_rgb_555_dith_rot_270 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal); +void evas_common_convert_rgba2_to_16bpp_rgb_565_dith_rot_270 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal); +void evas_common_convert_rgba_to_16bpp_rgb_565_dith_rot_270 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal); +void evas_common_convert_rgba2_to_16bpp_rgb_444_dith_rot_270 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal); +void evas_common_convert_rgba_to_16bpp_rgb_444_dith_rot_270 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal); +void evas_common_convert_rgba2_to_16bpp_rgb_454645_dith_rot_270 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal); +void evas_common_convert_rgba_to_16bpp_rgb_454645_dith_rot_270 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal); +void evas_common_convert_rgba2_to_16bpp_rgb_555_dith_rot_270 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal); +void evas_common_convert_rgba_to_16bpp_rgb_555_dith_rot_270 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal); -void convert_rgba2_to_16bpp_rgb_565_dith_rot_90 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal); -void convert_rgba_to_16bpp_rgb_565_dith_rot_90 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal); -void convert_rgba2_to_16bpp_rgb_444_dith_rot_90 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal); -void convert_rgba_to_16bpp_rgb_444_dith_rot_90 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal); -void convert_rgba2_to_16bpp_rgb_454645_dith_rot_90 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal); -void convert_rgba_to_16bpp_rgb_454645_dith_rot_90 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal); -void convert_rgba2_to_16bpp_rgb_555_dith_rot_90 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal); -void convert_rgba_to_16bpp_rgb_555_dith_rot_90 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal); +void evas_common_convert_rgba2_to_16bpp_rgb_565_dith_rot_90 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal); +void evas_common_convert_rgba_to_16bpp_rgb_565_dith_rot_90 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal); +void evas_common_convert_rgba2_to_16bpp_rgb_444_dith_rot_90 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal); +void evas_common_convert_rgba_to_16bpp_rgb_444_dith_rot_90 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal); +void evas_common_convert_rgba2_to_16bpp_rgb_454645_dith_rot_90 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal); +void evas_common_convert_rgba_to_16bpp_rgb_454645_dith_rot_90 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal); +void evas_common_convert_rgba2_to_16bpp_rgb_555_dith_rot_90 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal); +void evas_common_convert_rgba_to_16bpp_rgb_555_dith_rot_90 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal); -void convert_rgba_to_24bpp_rgb_888 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal); -void convert_rgba_to_24bpp_bgr_888 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal); +void evas_common_convert_rgba_to_24bpp_rgb_888 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal); +void evas_common_convert_rgba_to_24bpp_bgr_888 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal); -void convert_rgba_to_32bpp_rgb_8888 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal); -void convert_rgba_to_32bpp_rgb_8888_rot_270 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal); -void convert_rgba_to_32bpp_rgb_8888_rot_90 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal); -void convert_rgba_to_32bpp_rgbx_8888 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal); -void convert_rgba_to_32bpp_rgbx_8888_rot_270 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal); -void convert_rgba_to_32bpp_rgbx_8888_rot_90 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal); -void convert_rgba_to_32bpp_bgr_8888 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal); -void convert_rgba_to_32bpp_bgr_8888_rot_270 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal); -void convert_rgba_to_32bpp_bgr_8888_rot_90 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal); -void convert_rgba_to_32bpp_bgrx_8888 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal); -void convert_rgba_to_32bpp_bgrx_8888_rot_270 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal); -void convert_rgba_to_32bpp_bgrx_8888_rot_90 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal); +void evas_common_convert_rgba_to_32bpp_rgb_8888 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal); +void evas_common_convert_rgba_to_32bpp_rgb_8888_rot_270 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal); +void evas_common_convert_rgba_to_32bpp_rgb_8888_rot_90 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal); +void evas_common_convert_rgba_to_32bpp_rgbx_8888 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal); +void evas_common_convert_rgba_to_32bpp_rgbx_8888_rot_270 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal); +void evas_common_convert_rgba_to_32bpp_rgbx_8888_rot_90 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal); +void evas_common_convert_rgba_to_32bpp_bgr_8888 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal); +void evas_common_convert_rgba_to_32bpp_bgr_8888_rot_270 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal); +void evas_common_convert_rgba_to_32bpp_bgr_8888_rot_90 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal); +void evas_common_convert_rgba_to_32bpp_bgrx_8888 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal); +void evas_common_convert_rgba_to_32bpp_bgrx_8888_rot_270 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal); +void evas_common_convert_rgba_to_32bpp_bgrx_8888_rot_90 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal); -void convert_rgba_to_8bpp_rgb_332_dith (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal); -void convert_rgba_to_8bpp_rgb_666_dith (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal); -void convert_rgba_to_8bpp_rgb_232_dith (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal); -void convert_rgba_to_8bpp_rgb_222_dith (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal); -void convert_rgba_to_8bpp_rgb_221_dith (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal); -void convert_rgba_to_8bpp_rgb_121_dith (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal); -void convert_rgba_to_8bpp_rgb_111_dith (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal); -void convert_rgba_to_8bpp_gry_256_dith (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal); -void convert_rgba_to_8bpp_gry_64_dith (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal); -void convert_rgba_to_8bpp_gry_16_dith (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal); -void convert_rgba_to_8bpp_gry_4_dith (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal); -void convert_rgba_to_8bpp_gry_1_dith (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal); +void evas_common_convert_rgba_to_8bpp_rgb_332_dith (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal); +void evas_common_convert_rgba_to_8bpp_rgb_666_dith (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal); +void evas_common_convert_rgba_to_8bpp_rgb_232_dith (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal); +void evas_common_convert_rgba_to_8bpp_rgb_222_dith (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal); +void evas_common_convert_rgba_to_8bpp_rgb_221_dith (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal); +void evas_common_convert_rgba_to_8bpp_rgb_121_dith (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal); +void evas_common_convert_rgba_to_8bpp_rgb_111_dith (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal); +void evas_common_convert_rgba_to_8bpp_gry_256_dith (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal); +void evas_common_convert_rgba_to_8bpp_gry_64_dith (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal); +void evas_common_convert_rgba_to_8bpp_gry_16_dith (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal); +void evas_common_convert_rgba_to_8bpp_gry_4_dith (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal); +void evas_common_convert_rgba_to_8bpp_gry_1_dith (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal); -void convert_rgba_to_4bpp_gry_4_dith (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal); -void convert_rgba_to_4bpp_gry_1_dith (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal); +void evas_common_convert_rgba_to_4bpp_gry_4_dith (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal); +void evas_common_convert_rgba_to_4bpp_gry_1_dith (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal); -void convert_rgba_to_1bpp_gry_1_dith (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal); +void evas_common_convert_rgba_to_1bpp_gry_1_dith (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal); /****/ -void scale_init (void); +void evas_common_scale_init (void); -void scale_rgba_mipmap_down_2x2_c (DATA32 *src, DATA32 *dst, int src_w, int src_h); -void scale_rgba_mipmap_down_2x1_c (DATA32 *src, DATA32 *dst, int src_w, int src_h); -void scale_rgba_mipmap_down_1x2_c (DATA32 *src, DATA32 *dst, int src_w, int src_h); -void scale_rgb_mipmap_down_2x2_c (DATA32 *src, DATA32 *dst, int src_w, int src_h); -void scale_rgb_mipmap_down_2x1_c (DATA32 *src, DATA32 *dst, int src_w, int src_h); -void scale_rgb_mipmap_down_1x2_c (DATA32 *src, DATA32 *dst, int src_w, int src_h); +void evas_common_scale_rgba_mipmap_down_2x2_c (DATA32 *src, DATA32 *dst, int src_w, int src_h); +void evas_common_scale_rgba_mipmap_down_2x1_c (DATA32 *src, DATA32 *dst, int src_w, int src_h); +void evas_common_scale_rgba_mipmap_down_1x2_c (DATA32 *src, DATA32 *dst, int src_w, int src_h); +void evas_common_scale_rgb_mipmap_down_2x2_c (DATA32 *src, DATA32 *dst, int src_w, int src_h); +void evas_common_scale_rgb_mipmap_down_2x1_c (DATA32 *src, DATA32 *dst, int src_w, int src_h); +void evas_common_scale_rgb_mipmap_down_1x2_c (DATA32 *src, DATA32 *dst, int src_w, int src_h); -void scale_rgba_mipmap_down_2x2_mmx (DATA32 *src, DATA32 *dst, int src_w, int src_h); -void scale_rgba_mipmap_down_2x1_mmx (DATA32 *src, DATA32 *dst, int src_w, int src_h); -void scale_rgba_mipmap_down_1x2_mmx (DATA32 *src, DATA32 *dst, int src_w, int src_h); +void evas_common_scale_rgba_mipmap_down_2x2_mmx (DATA32 *src, DATA32 *dst, int src_w, int src_h); +void evas_common_scale_rgba_mipmap_down_2x1_mmx (DATA32 *src, DATA32 *dst, int src_w, int src_h); +void evas_common_scale_rgba_mipmap_down_1x2_mmx (DATA32 *src, DATA32 *dst, int src_w, int src_h); -void scale_rgba_gen_mipmap_table (RGBA_Image *src); -void scale_rgba_gen_mipmap_level (RGBA_Image *src, int l); -int scale_rgba_get_mipmap_surfaces (RGBA_Image *src, int src_region_w, int src_region_h, int dst_region_w, int dst_region_h, RGBA_Surface **srf1, RGBA_Surface **srf2); -RGBA_Surface *scale_rgba_get_mipmap_surface (RGBA_Image *src, int src_region_w, int src_region_h, int dst_region_w, int dst_region_h); +void evas_common_scale_rgba_gen_mipmap_table (RGBA_Image *src); +void evas_common_scale_rgba_gen_mipmap_level (RGBA_Image *src, int l); +int evas_common_scale_rgba_get_mipmap_surfaces (RGBA_Image *src, int src_region_w, int src_region_h, int dst_region_w, int dst_region_h, RGBA_Surface **srf1, RGBA_Surface **srf2); +RGBA_Surface *evas_common_scale_rgba_get_mipmap_surface (RGBA_Image *src, int src_region_w, int src_region_h, int dst_region_w, int dst_region_h); -void scale_rgba_in_to_out_clip_smooth_mmx (RGBA_Image *src, RGBA_Image *dst, RGBA_Draw_Context *dc, int src_region_x, int src_region_y, int src_region_w, int src_region_h, int dst_region_x, int dst_region_y, int dst_region_w, int dst_region_h); -void scale_rgba_in_to_out_clip_smooth_c (RGBA_Image *src, RGBA_Image *dst, RGBA_Draw_Context *dc, int src_region_x, int src_region_y, int src_region_w, int src_region_h, int dst_region_x, int dst_region_y, int dst_region_w, int dst_region_h); +void evas_common_scale_rgba_in_to_out_clip_smooth_mmx (RGBA_Image *src, RGBA_Image *dst, RGBA_Draw_Context *dc, int src_region_x, int src_region_y, int src_region_w, int src_region_h, int dst_region_x, int dst_region_y, int dst_region_w, int dst_region_h); +void evas_common_scale_rgba_in_to_out_clip_smooth_c (RGBA_Image *src, RGBA_Image *dst, RGBA_Draw_Context *dc, int src_region_x, int src_region_y, int src_region_w, int src_region_h, int dst_region_x, int dst_region_y, int dst_region_w, int dst_region_h); -void scale_rgba_in_to_out_clip_smooth (RGBA_Image *src, RGBA_Image *dst, RGBA_Draw_Context *dc, int src_region_x, int src_region_y, int src_region_w, int src_region_h, int dst_region_x, int dst_region_y, int dst_region_w, int dst_region_h); -void scale_rgba_in_to_out_clip_sample (RGBA_Image *src, RGBA_Image *dst, RGBA_Draw_Context *dc, int src_region_x, int src_region_y, int src_region_w, int src_region_h, int dst_region_x, int dst_region_y, int dst_region_w, int dst_region_h); +void evas_common_scale_rgba_in_to_out_clip_smooth (RGBA_Image *src, RGBA_Image *dst, RGBA_Draw_Context *dc, int src_region_x, int src_region_y, int src_region_w, int src_region_h, int dst_region_x, int dst_region_y, int dst_region_w, int dst_region_h); +void evas_common_scale_rgba_in_to_out_clip_sample (RGBA_Image *src, RGBA_Image *dst, RGBA_Draw_Context *dc, int src_region_x, int src_region_y, int src_region_w, int src_region_h, int dst_region_x, int dst_region_y, int dst_region_w, int dst_region_h); /****/ -void image_init (void); +void evas_common_image_init (void); -RGBA_Surface *image_surface_new (void); -void image_surface_free (RGBA_Surface *is); -void image_surface_alloc (RGBA_Surface *is); -void image_surface_dealloc (RGBA_Surface *is); +RGBA_Surface *evas_common_image_surface_new (void); +void evas_common_image_surface_free (RGBA_Surface *is); +void evas_common_image_surface_alloc (RGBA_Surface *is); +void evas_common_image_surface_dealloc (RGBA_Surface *is); -RGBA_Image *image_create (int w, int h); -RGBA_Image *image_new (void); -void image_free (RGBA_Image *im); -void image_ref (RGBA_Image *im); -void image_unref (RGBA_Image *im); -void image_cache (RGBA_Image *im); -void image_uncache (RGBA_Image *im); -void image_flush_cache (void); -void image_set_cache (int size); -int image_get_cache (void); -void image_store (RGBA_Image *im); -void image_unstore (RGBA_Image *im); -RGBA_Image *image_find (const char *filename, const char *key, DATA64 timestamp); -int image_ram_usage (RGBA_Image *im); -void image_dirty (RGBA_Image *im); +RGBA_Image *evas_common_image_create (int w, int h); +RGBA_Image *evas_common_image_new (void); +void evas_common_image_free (RGBA_Image *im); +void evas_common_image_ref (RGBA_Image *im); +void evas_common_image_unref (RGBA_Image *im); +void evas_common_image_cache (RGBA_Image *im); +void evas_common_image_uncache (RGBA_Image *im); +void evas_common_image_flush_cache (void); +void evas_common_image_set_cache (int size); +int evas_common_image_get_cache (void); +void evas_common_image_store (RGBA_Image *im); +void evas_common_image_unstore (RGBA_Image *im); +RGBA_Image *evas_common_image_find (const char *filename, const char *key, DATA64 timestamp); +int evas_common_image_ram_usage (RGBA_Image *im); +void evas_common_image_dirty (RGBA_Image *im); -RGBA_Image *load_image_from_file (const char *file, const char *key); -void load_image_data_from_file(RGBA_Image *im); +RGBA_Image *evas_common_load_image_from_file (const char *file, const char *key); +void evas_common_load_image_data_from_file(RGBA_Image *im); /****/ -void rectangle_init (void); +void evas_common_rectangle_init (void); -void rectangle_draw (RGBA_Image *dst, RGBA_Draw_Context *dc, int x, int y, int w, int h); +void evas_common_rectangle_draw (RGBA_Image *dst, RGBA_Draw_Context *dc, int x, int y, int w, int h); /****/ -void gradient_init (void); +void evas_common_gradient_init (void); -RGBA_Gradient *gradient_new (void); -void gradient_free (RGBA_Gradient *gr); -void gradient_colors_clear (RGBA_Gradient *gr); -void gradient_color_add (RGBA_Gradient *gr, int r, int g, int b, int a, int dist); -void gradient_draw (RGBA_Image *dst, RGBA_Draw_Context *dc, int x, int y, int w, int h, RGBA_Gradient *gr, double angle); -DATA32 *gradient_map (RGBA_Gradient *gr, RGBA_Draw_Context *dc, int len); +RGBA_Gradient *evas_common_gradient_new (void); +void evas_common_gradient_free (RGBA_Gradient *gr); +void evas_common_gradient_colors_clear (RGBA_Gradient *gr); +void evas_common_gradient_color_add (RGBA_Gradient *gr, int r, int g, int b, int a, int dist); +void evas_common_gradient_draw (RGBA_Image *dst, RGBA_Draw_Context *dc, int x, int y, int w, int h, RGBA_Gradient *gr, double angle); +DATA32 *evas_common_gradient_map (RGBA_Gradient *gr, RGBA_Draw_Context *dc, int len); /****/ -void line_init (void); +void evas_common_line_init (void); -void line_draw (RGBA_Image *dst, RGBA_Draw_Context *dc, int x1, int y1, int x2, int y2); +void evas_common_line_draw (RGBA_Image *dst, RGBA_Draw_Context *dc, int x1, int y1, int x2, int y2); /****/ -void polygon_init (void); +void evas_common_polygon_init (void); -RGBA_Polygon_Point *polygon_point_add (RGBA_Polygon_Point *points, int x, int y); -RGBA_Polygon_Point *polygon_points_clear (RGBA_Polygon_Point *points); -void polygon_draw (RGBA_Image *dst, RGBA_Draw_Context *dc, RGBA_Polygon_Point *points); +RGBA_Polygon_Point *evas_common_polygon_point_add (RGBA_Polygon_Point *points, int x, int y); +RGBA_Polygon_Point *evas_common_polygon_points_clear (RGBA_Polygon_Point *points); +void evas_common_polygon_draw (RGBA_Image *dst, RGBA_Draw_Context *dc, RGBA_Polygon_Point *points); /****/ -void blit_init (void); +void evas_common_blit_init (void); -void blit_rectangle (RGBA_Image *src, RGBA_Image *dst, int src_x, int src_y, int w, int h, int dst_x, int dst_y); +void evas_common_blit_rectangle (RGBA_Image *src, RGBA_Image *dst, int src_x, int src_y, int w, int h, int dst_x, int dst_y); /****/ /****/ -void font_init (void); +void evas_common_font_init (void); -RGBA_Font *font_load (const char *name, int size); -void font_free (RGBA_Font *fn); -void font_modify_cache_by (RGBA_Font *fn, int dir); -int font_cache_get (void); -void font_cache_set (int size); -void font_flush (void); -void font_flush_last (void); -RGBA_Font *font_find (const char *name, int size); -void font_draw (RGBA_Image *dst, RGBA_Draw_Context *dc, RGBA_Font *fn, int x, int y, const char *text); -RGBA_Font_Glyph *font_cache_glyph_get (RGBA_Font *fn, FT_UInt index); -int font_ascent_get (RGBA_Font *fn); -int font_descent_get (RGBA_Font *fn); -int font_max_ascent_get (RGBA_Font *fn); -int font_max_descent_get (RGBA_Font *fn); -int font_get_line_advance (RGBA_Font *fn); -void font_query_size (RGBA_Font *fn, const char *text, int *w, int *h); -int font_query_inset (RGBA_Font *fn, const char *text); -void font_query_advance (RGBA_Font *fn, const char *text, int *h_adv, int *v_adv); -int font_query_char_coords (RGBA_Font *fn, const char *text, int pos, int *cx, int *cy, int *cw, int *ch); -int font_query_text_at_pos (RGBA_Font *fn, const char *text, int x, int y, int *cx, int *cy, int *cw, int *ch); -int font_utf8_get_next (unsigned char *buf, int *iindex); +RGBA_Font *evas_common_font_load (const char *name, int size); +void evas_common_font_free (RGBA_Font *fn); +void evas_common_font_modify_cache_by (RGBA_Font *fn, int dir); +int evas_common_font_cache_get (void); +void evas_common_font_cache_set (int size); +void evas_common_font_flush (void); +void evas_common_font_flush_last (void); +RGBA_Font *evas_common_font_find (const char *name, int size); +void evas_common_font_draw (RGBA_Image *dst, RGBA_Draw_Context *dc, RGBA_Font *fn, int x, int y, const char *text); +RGBA_Font_Glyph *evas_common_font_cache_glyph_get (RGBA_Font *fn, FT_UInt index); +int evas_common_font_ascent_get (RGBA_Font *fn); +int evas_common_font_descent_get (RGBA_Font *fn); +int evas_common_font_max_ascent_get (RGBA_Font *fn); +int evas_common_font_max_descent_get (RGBA_Font *fn); +int evas_common_font_get_line_advance (RGBA_Font *fn); +void evas_common_font_query_size (RGBA_Font *fn, const char *text, int *w, int *h); +int evas_common_font_query_inset (RGBA_Font *fn, const char *text); +void evas_common_font_query_advance (RGBA_Font *fn, const char *text, int *h_adv, int *v_adv); +int evas_common_font_query_char_coords (RGBA_Font *fn, const char *text, int pos, int *cx, int *cy, int *cw, int *ch); +int evas_common_font_query_text_at_pos (RGBA_Font *fn, const char *text, int x, int y, int *cx, int *cy, int *cw, int *ch); +int evas_common_font_utf8_get_next (unsigned char *buf, int *iindex); /****/ -void tilebuf_init (void); +void evas_common_tilebuf_init (void); -Tilebuf *tilebuf_new (int w, int h); -void tilebuf_free (Tilebuf *tb); -void tilebuf_set_tile_size (Tilebuf *tb, int tw, int th); -void tilebuf_get_tile_size (Tilebuf *tb, int *tw, int *th); -int tilebuf_add_redraw (Tilebuf *tb, int x, int y, int w, int h); -int tilebuf_del_redraw (Tilebuf *tb, int x, int y, int w, int h); -int tilebuf_add_motion_vector (Tilebuf *tb, int x, int y, int w, int h, int dx, int dy, int alpha); -void tilebuf_clear (Tilebuf *tb); -Tilebuf_Rect *tilebuf_get_render_rects (Tilebuf *tb); -void tilebuf_free_render_rects (Tilebuf_Rect *rects); +Tilebuf *evas_common_tilebuf_new (int w, int h); +void evas_common_tilebuf_free (Tilebuf *tb); +void evas_common_tilebuf_set_tile_size (Tilebuf *tb, int tw, int th); +void evas_common_tilebuf_get_tile_size (Tilebuf *tb, int *tw, int *th); +int evas_common_tilebuf_add_redraw (Tilebuf *tb, int x, int y, int w, int h); +int evas_common_tilebuf_del_redraw (Tilebuf *tb, int x, int y, int w, int h); +int evas_common_tilebuf_add_motion_vector (Tilebuf *tb, int x, int y, int w, int h, int dx, int dy, int alpha); +void evas_common_tilebuf_clear (Tilebuf *tb); +Tilebuf_Rect *evas_common_tilebuf_get_render_rects (Tilebuf *tb); +void evas_common_tilebuf_free_render_rects (Tilebuf_Rect *rects); /****/ -void draw_init (void); +void evas_common_draw_init (void); -RGBA_Draw_Context *draw_context_new (void); -void draw_context_free (RGBA_Draw_Context *dc); -void draw_context_clip_clip (RGBA_Draw_Context *dc, int x, int y, int w, int h); -void draw_context_set_clip (RGBA_Draw_Context *dc, int x, int y, int w, int h); -void draw_context_unset_clip (RGBA_Draw_Context *dc); -void draw_context_set_color (RGBA_Draw_Context *dc, int r, int g, int b, int a); -void draw_context_set_multiplier (RGBA_Draw_Context *dc, int r, int g, int b, int a); -void draw_context_unset_multiplier (RGBA_Draw_Context *dc); -void draw_context_set_modifiers (RGBA_Draw_Context *dc, DATA8 *rmod, DATA8 *gmod, DATA8 *bmod, DATA8 *amod); -void draw_context_ununset_modifiers (RGBA_Draw_Context *dc); -void draw_context_add_cutout (RGBA_Draw_Context *dc, int x, int y, int w, int h); -void draw_context_clear_cutouts (RGBA_Draw_Context *dc); -Cutout_Rect *draw_context_apply_cutouts (RGBA_Draw_Context *dc); -void draw_context_apply_free_cutouts(Cutout_Rect *rects); -Cutout_Rect *draw_context_cutouts_split (Cutout_Rect *in, Cutout_Rect *split); -Cutout_Rect *draw_context_cutout_split (Cutout_Rect *in, Cutout_Rect *split); +RGBA_Draw_Context *evas_common_draw_context_new (void); +void evas_common_draw_context_free (RGBA_Draw_Context *dc); +void evas_common_draw_context_clip_clip (RGBA_Draw_Context *dc, int x, int y, int w, int h); +void evas_common_draw_context_set_clip (RGBA_Draw_Context *dc, int x, int y, int w, int h); +void evas_common_draw_context_unset_clip (RGBA_Draw_Context *dc); +void evas_common_draw_context_set_color (RGBA_Draw_Context *dc, int r, int g, int b, int a); +void evas_common_draw_context_set_multiplier (RGBA_Draw_Context *dc, int r, int g, int b, int a); +void evas_common_draw_context_unset_multiplier (RGBA_Draw_Context *dc); +void evas_common_draw_context_set_modifiers (RGBA_Draw_Context *dc, DATA8 *rmod, DATA8 *gmod, DATA8 *bmod, DATA8 *amod); +void evas_common_draw_context_ununset_modifiers (RGBA_Draw_Context *dc); +void evas_common_draw_context_add_cutout (RGBA_Draw_Context *dc, int x, int y, int w, int h); +void evas_common_draw_context_clear_cutouts (RGBA_Draw_Context *dc); +Cutout_Rect *evas_common_draw_context_apply_cutouts (RGBA_Draw_Context *dc); +void evas_common_draw_context_apply_free_cutouts(Cutout_Rect *rects); +Cutout_Rect *evas_common_draw_context_cutouts_split (Cutout_Rect *in, Cutout_Rect *split); +Cutout_Rect *evas_common_draw_context_cutout_split (Cutout_Rect *in, Cutout_Rect *split); -Gfx_Func_Blend_Src_Dst draw_func_blend_get (RGBA_Image *src, RGBA_Image *dst, int pixels); -Gfx_Func_Blend_Color_Dst draw_func_blend_color_get (DATA32 src, RGBA_Image *dst, int pixels); -Gfx_Func_Blend_Src_Cmod_Dst draw_func_blend_cmod_get (RGBA_Image *src, RGBA_Image *dst, int pixels); -Gfx_Func_Blend_Src_Mul_Dst draw_func_blend_mul_get (RGBA_Image *src, DATA32 col, RGBA_Image *dst, int pixels); -Gfx_Func_Blend_Src_Alpha_Mul_Dst draw_func_blend_alpha_get (RGBA_Image *dst); -Gfx_Func_Blend_Src_Dst draw_func_copy_get (int pixels, int reverse); +Gfx_Func_Blend_Src_Dst evas_common_draw_func_blend_get (RGBA_Image *src, RGBA_Image *dst, int pixels); +Gfx_Func_Blend_Color_Dst evas_common_draw_func_blend_color_get (DATA32 src, RGBA_Image *dst, int pixels); +Gfx_Func_Blend_Src_Cmod_Dst evas_common_draw_func_blend_cmod_get (RGBA_Image *src, RGBA_Image *dst, int pixels); +Gfx_Func_Blend_Src_Mul_Dst evas_common_draw_func_blend_mul_get (RGBA_Image *src, DATA32 col, RGBA_Image *dst, int pixels); +Gfx_Func_Blend_Src_Alpha_Mul_Dst evas_common_draw_func_blend_alpha_get (RGBA_Image *dst); +Gfx_Func_Blend_Src_Dst evas_common_draw_func_copy_get (int pixels, int reverse); /*****************************************************************************/