summaryrefslogtreecommitdiff
path: root/legacy/evas/src/modules/engines/gl_sdl/evas_engine.c
diff options
context:
space:
mode:
authorVincent Torri <vincent.torri@gmail.com>2012-11-04 11:51:42 +0000
committerVincent Torri <vincent.torri@gmail.com>2012-11-04 11:51:42 +0000
commitc15e9c6575c3b5f39ded167dda5259de3de96151 (patch)
tree5115d7ae3620af24c2bc094cd062575af7adeda9 /legacy/evas/src/modules/engines/gl_sdl/evas_engine.c
parenta5ac6a987caec5a7f7596a25d0a065b9cc94c50c (diff)
merge: and now Evas
I've tested make -j 3 install and it works nicely I've tested expedite with software and opengl xlib, and it works. Not tested other engines, so please report any problems (engines or other) on the ML. TODO: examples and tests, I'll add them later ISSUE: Eina_Unicode size check. It indirectly depends on eina_config.h, which is created at the end of the configure script. So its size is always 0. I don't know how that size is used, so I can't do a lot, for now. SVN revision: 78895
Diffstat (limited to '')
-rw-r--r--src/modules/evas/engines/gl_sdl/evas_engine.c (renamed from legacy/evas/src/modules/engines/gl_sdl/evas_engine.c)38
1 files changed, 19 insertions, 19 deletions
diff --git a/legacy/evas/src/modules/engines/gl_sdl/evas_engine.c b/src/modules/evas/engines/gl_sdl/evas_engine.c
index 06cf555340..f49fcb8d8d 100644
--- a/legacy/evas/src/modules/engines/gl_sdl/evas_engine.c
+++ b/src/modules/evas/engines/gl_sdl/evas_engine.c
@@ -20,7 +20,7 @@ eng_info(Evas *e)
20} 20}
21 21
22static void 22static void
23eng_info_free(Evas *e __UNUSED__, void *info) 23eng_info_free(Evas *e EINA_UNUSED, void *info)
24{ 24{
25 Evas_Engine_Info_GL_SDL *in; 25 Evas_Engine_Info_GL_SDL *in;
26 in = (Evas_Engine_Info_GL_SDL *)info; 26 in = (Evas_Engine_Info_GL_SDL *)info;
@@ -105,7 +105,7 @@ eng_output_resize(void *data, int w, int h)
105} 105}
106 106
107static void 107static void
108eng_output_tile_size_set(void *data, int w __UNUSED__, int h __UNUSED__) 108eng_output_tile_size_set(void *data, int w EINA_UNUSED, int h EINA_UNUSED)
109{ 109{
110// Render_Engine *re; 110// Render_Engine *re;
111// 111//
@@ -145,7 +145,7 @@ eng_output_redraws_rect_add(void *data, int x, int y, int w, int h)
145} 145}
146 146
147static void 147static void
148eng_output_redraws_rect_del(void *data, int x __UNUSED__, int y __UNUSED__, int w __UNUSED__, int h __UNUSED__) 148eng_output_redraws_rect_del(void *data, int x EINA_UNUSED, int y EINA_UNUSED, int w EINA_UNUSED, int h EINA_UNUSED)
149{ 149{
150// Render_Engine *re; 150// Render_Engine *re;
151// 151//
@@ -222,7 +222,7 @@ eng_output_redraws_next_update_get(void *data, int *x, int *y, int *w, int *h, i
222} 222}
223 223
224static void 224static void
225eng_output_redraws_next_update_push(void *data, void *surface __UNUSED__, int x __UNUSED__, int y __UNUSED__, int w __UNUSED__, int h __UNUSED__) 225eng_output_redraws_next_update_push(void *data, void *surface EINA_UNUSED, int x EINA_UNUSED, int y EINA_UNUSED, int w EINA_UNUSED, int h EINA_UNUSED)
226{ 226{
227 Render_Engine *re; 227 Render_Engine *re;
228 228
@@ -318,7 +318,7 @@ eng_line_draw(void *data, void *context, void *surface, int x1, int y1, int x2,
318} 318}
319 319
320static void * 320static void *
321eng_polygon_point_add(void *data, void *context __UNUSED__, void *polygon, int x, int y) 321eng_polygon_point_add(void *data, void *context EINA_UNUSED, void *polygon, int x, int y)
322{ 322{
323 Render_Engine *re; 323 Render_Engine *re;
324 324
@@ -327,7 +327,7 @@ eng_polygon_point_add(void *data, void *context __UNUSED__, void *polygon, int x
327} 327}
328 328
329static void * 329static void *
330eng_polygon_points_clear(void *data, void *context __UNUSED__, void *polygon) 330eng_polygon_points_clear(void *data, void *context EINA_UNUSED, void *polygon)
331{ 331{
332 Render_Engine *re; 332 Render_Engine *re;
333 333
@@ -408,7 +408,7 @@ eng_image_alpha_set(void *data, void *image, int has_alpha)
408} 408}
409 409
410static void * 410static void *
411eng_image_border_set(void *data, void *image, int l __UNUSED__, int r __UNUSED__, int t __UNUSED__, int b __UNUSED__) 411eng_image_border_set(void *data, void *image, int l EINA_UNUSED, int r EINA_UNUSED, int t EINA_UNUSED, int b EINA_UNUSED)
412{ 412{
413// Render_Engine *re; 413// Render_Engine *re;
414// 414//
@@ -417,7 +417,7 @@ eng_image_border_set(void *data, void *image, int l __UNUSED__, int r __UNUSED__
417} 417}
418 418
419static void 419static void
420eng_image_border_get(void *data, void *image __UNUSED__, int *l __UNUSED__, int *r __UNUSED__, int *t __UNUSED__, int *b __UNUSED__) 420eng_image_border_get(void *data, void *image EINA_UNUSED, int *l EINA_UNUSED, int *r EINA_UNUSED, int *t EINA_UNUSED, int *b EINA_UNUSED)
421{ 421{
422// Render_Engine *re; 422// Render_Engine *re;
423// 423//
@@ -425,7 +425,7 @@ eng_image_border_get(void *data, void *image __UNUSED__, int *l __UNUSED__, int
425} 425}
426 426
427static char * 427static char *
428eng_image_comment_get(void *data, void *image, char *key __UNUSED__) 428eng_image_comment_get(void *data, void *image, char *key EINA_UNUSED)
429{ 429{
430// Render_Engine *re; 430// Render_Engine *re;
431 Evas_GL_Image *im; 431 Evas_GL_Image *im;
@@ -779,7 +779,7 @@ eng_image_data_put(void *data, void *image, DATA32 *image_data)
779} 779}
780 780
781static void 781static void
782eng_image_data_preload_request(void *data __UNUSED__, void *image, const void *target) 782eng_image_data_preload_request(void *data EINA_UNUSED, void *image, const void *target)
783{ 783{
784 Evas_GL_Image *gim = image; 784 Evas_GL_Image *gim = image;
785 RGBA_Image *im; 785 RGBA_Image *im;
@@ -792,7 +792,7 @@ eng_image_data_preload_request(void *data __UNUSED__, void *image, const void *t
792} 792}
793 793
794static void 794static void
795eng_image_data_preload_cancel(void *data __UNUSED__, void *image, const void *target) 795eng_image_data_preload_cancel(void *data EINA_UNUSED, void *image, const void *target)
796{ 796{
797 Evas_GL_Image *gim = image; 797 Evas_GL_Image *gim = image;
798 RGBA_Image *im; 798 RGBA_Image *im;
@@ -820,13 +820,13 @@ eng_image_draw(void *data, void *context, void *surface, void *image, int src_x,
820} 820}
821 821
822static void 822static void
823eng_image_scale_hint_set(void *data __UNUSED__, void *image, int hint) 823eng_image_scale_hint_set(void *data EINA_UNUSED, void *image, int hint)
824{ 824{
825 if (image) evas_gl_common_image_scale_hint_set(image, hint); 825 if (image) evas_gl_common_image_scale_hint_set(image, hint);
826} 826}
827 827
828static void 828static void
829eng_image_map_draw(void *data __UNUSED__, void *context, void *surface, void *image, RGBA_Map *m, int smooth, int level) 829eng_image_map_draw(void *data EINA_UNUSED, void *context, void *surface, void *image, RGBA_Map *m, int smooth, int level)
830{ 830{
831 Evas_GL_Image *gim = image; 831 Evas_GL_Image *gim = image;
832 Render_Engine *re; 832 Render_Engine *re;
@@ -875,7 +875,7 @@ eng_image_map_draw(void *data __UNUSED__, void *context, void *surface, void *im
875} 875}
876 876
877static void * 877static void *
878eng_image_map_surface_new(void *data __UNUSED__, int w, int h, int alpha) 878eng_image_map_surface_new(void *data EINA_UNUSED, int w, int h, int alpha)
879{ 879{
880 Render_Engine *re; 880 Render_Engine *re;
881 881
@@ -884,13 +884,13 @@ eng_image_map_surface_new(void *data __UNUSED__, int w, int h, int alpha)
884} 884}
885 885
886static void 886static void
887eng_image_map_surface_free(void *data __UNUSED__, void *surface) 887eng_image_map_surface_free(void *data EINA_UNUSED, void *surface)
888{ 888{
889 evas_gl_common_image_free(surface); 889 evas_gl_common_image_free(surface);
890} 890}
891 891
892static int 892static int
893eng_image_scale_hint_get(void *data __UNUSED__, void *image) 893eng_image_scale_hint_get(void *data EINA_UNUSED, void *image)
894{ 894{
895 Evas_GL_Image *gim = image; 895 Evas_GL_Image *gim = image;
896 if (!gim) return EVAS_IMAGE_SCALE_HINT_NONE; 896 if (!gim) return EVAS_IMAGE_SCALE_HINT_NONE;
@@ -898,7 +898,7 @@ eng_image_scale_hint_get(void *data __UNUSED__, void *image)
898} 898}
899 899
900static void 900static void
901eng_font_draw(void *data, void *context, void *surface, Evas_Font_Set *font, int x, int y, int w __UNUSED__, int h __UNUSED__, int ow __UNUSED__, int oh __UNUSED__, Evas_Text_Props *intl_props) 901eng_font_draw(void *data, void *context, void *surface, Evas_Font_Set *font, int x, int y, int w EINA_UNUSED, int h EINA_UNUSED, int ow EINA_UNUSED, int oh EINA_UNUSED, Evas_Text_Props *intl_props)
902{ 902{
903 Render_Engine *re; 903 Render_Engine *re;
904 904
@@ -929,14 +929,14 @@ eng_font_draw(void *data, void *context, void *surface, Evas_Font_Set *font, int
929} 929}
930 930
931static Eina_Bool 931static Eina_Bool
932eng_canvas_alpha_get(void *data __UNUSED__, void *info __UNUSED__) 932eng_canvas_alpha_get(void *data EINA_UNUSED, void *info EINA_UNUSED)
933{ 933{
934 // FIXME: support ARGB gl targets!!! 934 // FIXME: support ARGB gl targets!!!
935 return EINA_FALSE; 935 return EINA_FALSE;
936} 936}
937 937
938static int 938static int
939eng_image_load_error_get(void *data __UNUSED__, void *image) 939eng_image_load_error_get(void *data EINA_UNUSED, void *image)
940{ 940{
941 Evas_GL_Image *im; 941 Evas_GL_Image *im;
942 942