summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCedric BAIL <cedric.bail@free.fr>2012-02-23 16:25:07 +0000
committerCedric BAIL <cedric.bail@free.fr>2012-02-23 16:25:07 +0000
commit0dbc99f33adde4c8fbf43635552c3f6891fd62e2 (patch)
treedb7abd3ffb32d1429fc22133d0d3b0699408d6d6
parent4ecc9ffa63e9978caeb1f676b3a51f9ce386c113 (diff)
evas: remove software SDL engine, use buffer engine directly.
NOTE: I would like to do the same with software SDL 16bits engine. But as we don't have a buffer_16 backend, I am likely to just remove it and use buffer conversion code to match a 16bits target. This will come with a performance impact, that will make it useless. So I am just tempted to completly remove it. SVN revision: 68352
Diffstat (limited to '')
-rw-r--r--legacy/evas/ChangeLog4
-rw-r--r--legacy/evas/Makefile.am3
-rw-r--r--legacy/evas/NEWS4
-rw-r--r--legacy/evas/configure.ac7
-rw-r--r--legacy/evas/m4/evas_check_engine.m437
-rw-r--r--legacy/evas/src/lib/Makefile.am8
-rw-r--r--legacy/evas/src/lib/file/evas_module.c4
-rw-r--r--legacy/evas/src/modules/engines/Makefile.am3
-rw-r--r--legacy/evas/src/modules/engines/software_16_sdl/Makefile.am4
-rw-r--r--legacy/evas/src/modules/engines/software_sdl/Evas_Engine_SDL.h27
-rw-r--r--legacy/evas/src/modules/engines/software_sdl/Makefile.am43
-rw-r--r--legacy/evas/src/modules/engines/software_sdl/evas_engine.c1218
-rw-r--r--legacy/evas/src/modules/engines/software_sdl/evas_engine.h72
13 files changed, 15 insertions, 1419 deletions
diff --git a/legacy/evas/ChangeLog b/legacy/evas/ChangeLog
index 8f789a5eaa..e0396b9b48 100644
--- a/legacy/evas/ChangeLog
+++ b/legacy/evas/ChangeLog
@@ -671,3 +671,7 @@
671 671
672 * Fix rouding of update regions for image objects when scaled 672 * Fix rouding of update regions for image objects when scaled
673 (leaves trails without this). 673 (leaves trails without this).
674
6752012-02-23 Cedric Bail
676
677 * Remove Software SDL engine.
diff --git a/legacy/evas/Makefile.am b/legacy/evas/Makefile.am
index 843c06d354..ee73e82c2b 100644
--- a/legacy/evas/Makefile.am
+++ b/legacy/evas/Makefile.am
@@ -43,7 +43,6 @@ evas-software-ddraw.pc.in \
43evas-software-16-ddraw.pc.in \ 43evas-software-16-ddraw.pc.in \
44evas-direct3d.pc.in \ 44evas-direct3d.pc.in \
45evas-software-16-wince.pc.in \ 45evas-software-16-wince.pc.in \
46evas-software-sdl.pc.in \
47evas-psl1ght.pc.in \ 46evas-psl1ght.pc.in \
48evas-wayland-shm.pc.in \ 47evas-wayland-shm.pc.in \
49evas-wayland-egl.pc.in \ 48evas-wayland-egl.pc.in \
@@ -121,7 +120,7 @@ if BUILD_ENGINE_SOFTWARE_16_WINCE
121pkgconfig_DATA += evas-software-16-wince.pc 120pkgconfig_DATA += evas-software-16-wince.pc
122endif 121endif
123 122
124if BUILD_ENGINE_SOFTWARE_SDL 123if BUILD_ENGINE_SOFTWARE_16_SDL
125pkgconfig_DATA += evas-software-sdl.pc 124pkgconfig_DATA += evas-software-sdl.pc
126endif 125endif
127 126
diff --git a/legacy/evas/NEWS b/legacy/evas/NEWS
index 1dd6ad60ca..3b19c664b8 100644
--- a/legacy/evas/NEWS
+++ b/legacy/evas/NEWS
@@ -14,6 +14,10 @@ Improvements:
14 14
15 * Use Eina_File mmap infrastructure for bmp, ico, pmaps, psd, wbmp and xpm file access. 15 * Use Eina_File mmap infrastructure for bmp, ico, pmaps, psd, wbmp and xpm file access.
16 16
17Removal:
18
19 * Software_SDL engine is gone, use buffer engine directly.
20
17Evas 1.1.0 21Evas 1.1.0
18 22
19Changes since Evas 1.0.0: 23Changes since Evas 1.0.0:
diff --git a/legacy/evas/configure.ac b/legacy/evas/configure.ac
index 9ef2d51c13..0a97d3a036 100644
--- a/legacy/evas/configure.ac
+++ b/legacy/evas/configure.ac
@@ -98,7 +98,6 @@ want_evas_engine_software_xlib="no"
98want_evas_engine_software_xcb="no" 98want_evas_engine_software_xcb="no"
99want_evas_engine_software_gdi="no" 99want_evas_engine_software_gdi="no"
100want_evas_engine_software_ddraw="no" 100want_evas_engine_software_ddraw="no"
101want_evas_engine_software_sdl="no"
102want_evas_engine_software_8_x11="no" 101want_evas_engine_software_8_x11="no"
103want_evas_engine_software_16_x11="no" 102want_evas_engine_software_16_x11="no"
104want_evas_engine_software_16_ddraw="no" 103want_evas_engine_software_16_ddraw="no"
@@ -734,8 +733,6 @@ EVAS_CHECK_ENGINE([software-ddraw], [${want_evas_engine_software_ddraw}], [no],
734 733
735EVAS_CHECK_ENGINE([direct3d], [${want_evas_engine_direct3d}], [no], [Direct3D]) 734EVAS_CHECK_ENGINE([direct3d], [${want_evas_engine_direct3d}], [no], [Direct3D])
736 735
737EVAS_CHECK_ENGINE([software-sdl], [${want_evas_engine_software_sdl}], [no], [Software SDL])
738
739EVAS_CHECK_ENGINE([psl1ght], [${want_evas_engine_psl1ght}], [no], [PSL1GHT]) 736EVAS_CHECK_ENGINE([psl1ght], [${want_evas_engine_psl1ght}], [no], [PSL1GHT])
740 737
741EVAS_CHECK_ENGINE([gl-sdl], [${want_evas_engine_gl_sdl}], [no], [OpenGL SDL]) 738EVAS_CHECK_ENGINE([gl-sdl], [${want_evas_engine_gl_sdl}], [no], [OpenGL SDL])
@@ -1918,7 +1915,6 @@ src/modules/engines/gl_x11/Makefile
1918src/modules/engines/gl_sdl/Makefile 1915src/modules/engines/gl_sdl/Makefile
1919src/modules/engines/gl_cocoa/Makefile 1916src/modules/engines/gl_cocoa/Makefile
1920src/modules/engines/psl1ght/Makefile 1917src/modules/engines/psl1ght/Makefile
1921src/modules/engines/software_sdl/Makefile
1922src/modules/engines/software_8/Makefile 1918src/modules/engines/software_8/Makefile
1923src/modules/engines/software_8_x11/Makefile 1919src/modules/engines/software_8_x11/Makefile
1924src/modules/engines/software_16/Makefile 1920src/modules/engines/software_16/Makefile
@@ -2005,8 +2001,7 @@ fi
2005echo " Software GDI...............: $have_evas_engine_software_gdi" 2001echo " Software GDI...............: $have_evas_engine_software_gdi"
2006echo " Software DirectDraw........: $have_evas_engine_software_ddraw" 2002echo " Software DirectDraw........: $have_evas_engine_software_ddraw"
2007echo " Direct3d...................: $have_evas_engine_direct3d" 2003echo " Direct3d...................: $have_evas_engine_direct3d"
2008echo " Software SDL...............: $have_evas_engine_software_sdl (primitive: $sdl_primitive)" 2004echo " OpenGL SDL.................: $have_evas_engine_gl_sdl $ECHO_C"
2009echo $ECHO_N " OpenGL SDL.................: $have_evas_engine_gl_sdl $ECHO_C"
2010if test "x$have_evas_engine_gl_sdl" = "xyes"; then 2005if test "x$have_evas_engine_gl_sdl" = "xyes"; then
2011 echo "(GLES: $gl_flavor_gles) (SGX: $gles_variety_sgx) (s3c6410: $gles_variety_s3c6410)" 2006 echo "(GLES: $gl_flavor_gles) (SGX: $gles_variety_sgx) (s3c6410: $gles_variety_s3c6410)"
2012else 2007else
diff --git a/legacy/evas/m4/evas_check_engine.m4 b/legacy/evas/m4/evas_check_engine.m4
index 30ccd5b4ef..06feef04fe 100644
--- a/legacy/evas/m4/evas_check_engine.m4
+++ b/legacy/evas/m4/evas_check_engine.m4
@@ -495,43 +495,6 @@ fi
495 495
496]) 496])
497 497
498
499dnl use: EVAS_CHECK_ENGINE_DEP_SOFTWARE_SDL(engine, simple, want_static[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
500
501AC_DEFUN([EVAS_CHECK_ENGINE_DEP_SOFTWARE_SDL],
502[
503
504requirement=""
505have_dep="no"
506evas_engine_[]$1[]_cflags=""
507evas_engine_[]$1[]_libs=""
508
509PKG_CHECK_MODULES([SDL],
510 [sdl >= 1.2.0],
511 [
512 have_dep="yes"
513 requirement="sdl"
514 evas_engine_[]$1[]_cflags="${SDL_CFLAGS}"
515 evas_engine_[]$1[]_libs="${SDL_LIBS}"
516 ]
517)
518
519AC_SUBST([evas_engine_$1_cflags])
520AC_SUBST([evas_engine_$1_libs])
521
522if test "x$3" = "xstatic" ; then
523 requirement_evas="${requirement} ${requirement_evas}"
524fi
525
526if test "x${have_dep}" = "xyes" ; then
527 m4_default([$4], [:])
528else
529 m4_default([$5], [:])
530fi
531
532])
533
534
535dnl use: EVAS_CHECK_ENGINE_DEP_SOFTWARE_16_SDL(engine, simple, want_static[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]]) 498dnl use: EVAS_CHECK_ENGINE_DEP_SOFTWARE_16_SDL(engine, simple, want_static[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
536 499
537AC_DEFUN([EVAS_CHECK_ENGINE_DEP_SOFTWARE_16_SDL], 500AC_DEFUN([EVAS_CHECK_ENGINE_DEP_SOFTWARE_16_SDL],
diff --git a/legacy/evas/src/lib/Makefile.am b/legacy/evas/src/lib/Makefile.am
index f1be8dac21..1240b2bf59 100644
--- a/legacy/evas/src/lib/Makefile.am
+++ b/legacy/evas/src/lib/Makefile.am
@@ -76,13 +76,11 @@ SUBDIRS += ../modules/engines/software_8_x11/
76EVAS_STATIC_MODULE += ../modules/engines/software_8_x11/libevas_engine_software_8_x11.la 76EVAS_STATIC_MODULE += ../modules/engines/software_8_x11/libevas_engine_software_8_x11.la
77EVAS_STATIC_LIBADD += @evas_engine_software_8_x11_libs@ 77EVAS_STATIC_LIBADD += @evas_engine_software_8_x11_libs@
78endif 78endif
79if EVAS_STATIC_BUILD_SOFTWARE_SDL 79if EVAS_STATIC_BUILD_SOFTWARE_16_SDL
80SUBDIRS += \ 80SUBDIRS += \
81 ../modules/engines/software_16_sdl/ \ 81 ../modules/engines/software_16_sdl/
82 ../modules/engines/software_sdl/
83EVAS_STATIC_MODULE += \ 82EVAS_STATIC_MODULE += \
84 ../modules/engines/software_16_sdl/libevas_engine_software_16_sdl.la \ 83 ../modules/engines/software_16_sdl/libevas_engine_software_16_sdl.la
85 ../modules/engines/software_sdl/libevas_engine_software_sdl.la
86EVAS_STATIC_LIBADD += @SDL_LIBS@ 84EVAS_STATIC_LIBADD += @SDL_LIBS@
87endif 85endif
88if EVAS_STATIC_BUILD_SOFTWARE_DDRAW 86if EVAS_STATIC_BUILD_SOFTWARE_DDRAW
diff --git a/legacy/evas/src/lib/file/evas_module.c b/legacy/evas/src/lib/file/evas_module.c
index 21d5cd0460..dc0d26b6b1 100644
--- a/legacy/evas/src/lib/file/evas_module.c
+++ b/legacy/evas/src/lib/file/evas_module.c
@@ -98,7 +98,6 @@ EVAS_EINA_STATIC_MODULE_DEFINE(engine, software_8_x11);
98EVAS_EINA_STATIC_MODULE_DEFINE(engine, software_ddraw); 98EVAS_EINA_STATIC_MODULE_DEFINE(engine, software_ddraw);
99EVAS_EINA_STATIC_MODULE_DEFINE(engine, software_gdi); 99EVAS_EINA_STATIC_MODULE_DEFINE(engine, software_gdi);
100EVAS_EINA_STATIC_MODULE_DEFINE(engine, software_generic); 100EVAS_EINA_STATIC_MODULE_DEFINE(engine, software_generic);
101EVAS_EINA_STATIC_MODULE_DEFINE(engine, software_sdl);
102EVAS_EINA_STATIC_MODULE_DEFINE(engine, software_x11); 101EVAS_EINA_STATIC_MODULE_DEFINE(engine, software_x11);
103EVAS_EINA_STATIC_MODULE_DEFINE(image_loader, bmp); 102EVAS_EINA_STATIC_MODULE_DEFINE(image_loader, bmp);
104EVAS_EINA_STATIC_MODULE_DEFINE(image_loader, edb); 103EVAS_EINA_STATIC_MODULE_DEFINE(image_loader, edb);
@@ -176,9 +175,6 @@ static const struct {
176#ifdef EVAS_STATIC_BUILD_SOFTWARE_GENERIC 175#ifdef EVAS_STATIC_BUILD_SOFTWARE_GENERIC
177 EVAS_EINA_STATIC_MODULE_USE(engine, software_generic), 176 EVAS_EINA_STATIC_MODULE_USE(engine, software_generic),
178#endif 177#endif
179#ifdef EVAS_STATIC_BUILD_SOFTWARE_SDL
180 EVAS_EINA_STATIC_MODULE_USE(engine, software_sdl),
181#endif
182#ifdef EVAS_STATIC_BUILD_SOFTWARE_X11 178#ifdef EVAS_STATIC_BUILD_SOFTWARE_X11
183 EVAS_EINA_STATIC_MODULE_USE(engine, software_x11), 179 EVAS_EINA_STATIC_MODULE_USE(engine, software_x11),
184#endif 180#endif
diff --git a/legacy/evas/src/modules/engines/Makefile.am b/legacy/evas/src/modules/engines/Makefile.am
index 42585cc050..e29fb98f5a 100644
--- a/legacy/evas/src/modules/engines/Makefile.am
+++ b/legacy/evas/src/modules/engines/Makefile.am
@@ -53,9 +53,6 @@ endif
53if !EVAS_STATIC_BUILD_SOFTWARE_16_X11 53if !EVAS_STATIC_BUILD_SOFTWARE_16_X11
54SUBDIRS += software_16_x11 54SUBDIRS += software_16_x11
55endif 55endif
56if !EVAS_STATIC_BUILD_SOFTWARE_SDL
57SUBDIRS += software_sdl
58endif
59if !EVAS_STATIC_BUILD_SOFTWARE_16_SDL 56if !EVAS_STATIC_BUILD_SOFTWARE_16_SDL
60SUBDIRS += software_16_sdl 57SUBDIRS += software_16_sdl
61endif 58endif
diff --git a/legacy/evas/src/modules/engines/software_16_sdl/Makefile.am b/legacy/evas/src/modules/engines/software_16_sdl/Makefile.am
index af0197d33c..88204c03cd 100644
--- a/legacy/evas/src/modules/engines/software_16_sdl/Makefile.am
+++ b/legacy/evas/src/modules/engines/software_16_sdl/Makefile.am
@@ -4,7 +4,7 @@ MAINTAINERCLEANFILES = Makefile.in
4 4
5INCLUDES = -I. -I$(top_srcdir)/src/lib -I$(top_srcdir)/src/lib/include @FREETYPE_CFLAGS@ @PIXMAN_CFLAGS@ @SDL_CFLAGS@ @EINA_CFLAGS@ 5INCLUDES = -I. -I$(top_srcdir)/src/lib -I$(top_srcdir)/src/lib/include @FREETYPE_CFLAGS@ @PIXMAN_CFLAGS@ @SDL_CFLAGS@ @EINA_CFLAGS@
6 6
7if BUILD_ENGINE_SOFTWARE_SDL 7if BUILD_ENGINE_SOFTWARE_16_SDL
8 8
9SOFTWARE_SDL_SOURCES = \ 9SOFTWARE_SDL_SOURCES = \
10evas_engine.c \ 10evas_engine.c \
@@ -14,7 +14,7 @@ evas_engine.h
14includes_HEADERS = Evas_Engine_SDL_16.h 14includes_HEADERS = Evas_Engine_SDL_16.h
15includesdir = $(includedir)/evas-@VMAJ@ 15includesdir = $(includedir)/evas-@VMAJ@
16 16
17if !EVAS_STATIC_BUILD_SOFTWARE_SDL 17if !EVAS_STATIC_BUILD_SOFTWARE_16_SDL
18 18
19pkgdir = $(libdir)/evas/modules/engines/software_16_sdl/$(MODULE_ARCH) 19pkgdir = $(libdir)/evas/modules/engines/software_16_sdl/$(MODULE_ARCH)
20pkg_LTLIBRARIES = module.la 20pkg_LTLIBRARIES = module.la
diff --git a/legacy/evas/src/modules/engines/software_sdl/Evas_Engine_SDL.h b/legacy/evas/src/modules/engines/software_sdl/Evas_Engine_SDL.h
deleted file mode 100644
index 3cce6ece82..0000000000
--- a/legacy/evas/src/modules/engines/software_sdl/Evas_Engine_SDL.h
+++ /dev/null
@@ -1,27 +0,0 @@
1#ifndef _EVAS_ENGINE_SDL_H
2#define _EVAS_ENGINE_SDL_H
3
4#include <SDL/SDL.h>
5
6typedef struct _Evas_Engine_Info_SDL Evas_Engine_Info_SDL;
7
8struct _Evas_Engine_Info_SDL
9{
10 /* PRIVATE - don't mess with this baby or evas will poke its tongue out */
11 /* at you and make nasty noises */
12 Evas_Engine_Info magic;
13
14 struct {
15 int rotation;
16 int fullscreen : 1;
17 int hwsurface : 1;
18 int noframe : 1;
19 int alpha : 1;
20 } info;
21
22 /* non-blocking or blocking mode */
23 Evas_Engine_Render_Mode render_mode;
24};
25#endif
26
27
diff --git a/legacy/evas/src/modules/engines/software_sdl/Makefile.am b/legacy/evas/src/modules/engines/software_sdl/Makefile.am
deleted file mode 100644
index b757db461c..0000000000
--- a/legacy/evas/src/modules/engines/software_sdl/Makefile.am
+++ /dev/null
@@ -1,43 +0,0 @@
1
2MAINTAINERCLEANFILES = Makefile.in
3
4AM_CPPFLAGS = \
5-I. \
6-I$(top_srcdir)/src/lib \
7-I$(top_srcdir)/src/lib/include \
8-I$(top_srcdir)/src/modules/engines \
9@FREETYPE_CFLAGS@ \
10@PIXMAN_CFLAGS@ \
11@EINA_CFLAGS@ \
12@evas_engine_software_sdl_cflags@
13
14if BUILD_ENGINE_SOFTWARE_SDL
15
16SOFTWARE_SDL_SOURCES = evas_engine.c
17SOFTWARE_SDL_LIBADD = @evas_engine_software_sdl_libs@
18
19
20includes_HEADERS = Evas_Engine_SDL.h
21includesdir = $(includedir)/evas-@VMAJ@
22
23if !EVAS_STATIC_BUILD_SOFTWARE_SDL
24
25pkgdir = $(libdir)/evas/modules/engines/software_sdl/$(MODULE_ARCH)
26pkg_LTLIBRARIES = module.la
27
28module_la_SOURCES = $(SOFTWARE_SDL_SOURCES)
29module_la_LIBADD = $(top_builddir)/src/lib/libevas.la @EINA_LIBS@ $(SOFTWARE_SDL_LIBADD)
30module_la_LDFLAGS = @lt_enable_auto_import@ -no-undefined -module -avoid-version
31module_la_LIBTOOLFLAGS = --tag=disable-static
32
33else
34
35noinst_LTLIBRARIES = libevas_engine_software_sdl.la
36
37libevas_engine_software_sdl_la_SOURCES = $(SOFTWARE_SDL_SOURCES)
38libevas_engine_software_sdl_la_LIBADD = $(SOFTWARE_SDL_LIBADD)
39
40endif
41endif
42
43EXTRA_DIST = evas_engine.h
diff --git a/legacy/evas/src/modules/engines/software_sdl/evas_engine.c b/legacy/evas/src/modules/engines/software_sdl/evas_engine.c
deleted file mode 100644
index 22c11b0508..0000000000
--- a/legacy/evas/src/modules/engines/software_sdl/evas_engine.c
+++ /dev/null
@@ -1,1218 +0,0 @@
1#include <assert.h>
2#include <math.h>
3#include <string.h>
4#include <sys/time.h>
5#include <time.h>
6#include <SDL/SDL.h>
7
8#include "evas_common.h" /* Also includes international specific stuff */
9#include "evas_engine.h"
10
11int _evas_engine_soft_sdl_log_dom = -1;
12/* #define DEBUG_SDL */
13
14static Evas_Func func, pfunc;
15
16static void* _sdl_output_setup (int w, int h, int fullscreen, int noframe, int alpha, int hwsurface);
17
18static Engine_Image_Entry *_sdl_image_alloc (void);
19static void _sdl_image_delete (Engine_Image_Entry *eim);
20
21static int _sdl_image_constructor (Engine_Image_Entry*, void* data);
22static void _sdl_image_destructor (Engine_Image_Entry *eim);
23
24static void _sdl_image_dirty_region(Engine_Image_Entry *eim, unsigned int x, unsigned int y, unsigned int w, unsigned int h);
25
26static int _sdl_image_dirty (Engine_Image_Entry *dst, const Engine_Image_Entry *src);
27
28static int _sdl_image_size_set (Engine_Image_Entry *dst, const Engine_Image_Entry *src);
29
30static int _sdl_image_update_data (Engine_Image_Entry* dst, void* engine_data);
31
32static void _sdl_image_load (Engine_Image_Entry *eim, const Image_Entry* im);
33static int _sdl_image_mem_size_get(Engine_Image_Entry *eim);
34
35#ifdef DEBUG_SDL
36static void _sdl_image_debug (const char* context, Engine_Image_Entry* im);
37#endif
38
39static const Evas_Cache_Engine_Image_Func _sdl_cache_engine_image_cb = {
40 NULL /* key */,
41 _sdl_image_alloc /* alloc */,
42 _sdl_image_delete /* dealloc */,
43 _sdl_image_constructor /* constructor */,
44 _sdl_image_destructor /* destructor */,
45 _sdl_image_dirty_region /* dirty_region */,
46 _sdl_image_dirty /* dirty */,
47 _sdl_image_size_set /* size_set */,
48 _sdl_image_update_data /* update_data */,
49 _sdl_image_load /* load */,
50 _sdl_image_mem_size_get /* mem_size_get */,
51#ifdef DEBUG_SDL /* debug */
52 _sdl_image_debug
53#else
54 NULL
55#endif
56};
57
58#define _SDL_UPDATE_PIXELS(EIM) \
59 ((RGBA_Image *) EIM->cache_entry.src)->image.data = EIM->surface->pixels;
60
61#define RMASK 0x00ff0000
62#define GMASK 0x0000ff00
63#define BMASK 0x000000ff
64#define AMASK 0xff000000
65
66/* SDL engine info function */
67static void*
68evas_engine_sdl_info (Evas* e __UNUSED__)
69{
70 Evas_Engine_Info_SDL* info;
71 info = calloc(1, sizeof (Evas_Engine_Info_SDL));
72 if (!info) return NULL;
73 info->magic.magic = rand();
74 return info;
75}
76
77static void
78evas_engine_sdl_info_free (Evas* e __UNUSED__, void* info)
79{
80 Evas_Engine_Info_SDL* in;
81 in = (Evas_Engine_Info_SDL*) info;
82 free(in);
83}
84
85/* SDL engine output manipulation function */
86static int
87evas_engine_sdl_setup (Evas* e, void* in)
88{
89 Evas_Engine_Info_SDL* info = (Evas_Engine_Info_SDL*) in;
90
91 /* if we arent set to sdl, why the hell do we get called?! */
92 if (evas_output_method_get(e) != evas_render_method_lookup("software_sdl"))
93 return 0;
94
95 SDL_Init(SDL_INIT_NOPARACHUTE);
96
97 if (SDL_InitSubSystem(SDL_INIT_VIDEO) < 0)
98 {
99 ERR("SDL_Init failed with %s", SDL_GetError());
100 SDL_Quit();
101 return 0;
102 }
103
104 /* lets just set up */
105 e->engine.data.output = _sdl_output_setup(e->output.w, e->output.h,
106 info->info.fullscreen,
107 info->info.noframe,
108 info->info.alpha,
109 info->info.hwsurface);
110
111 if (!e->engine.data.output)
112 return 0;
113
114 e->engine.func = &func;
115 e->engine.data.context = e->engine.func->context_new(e->engine.data.output);
116
117 return 1;
118}
119
120static void
121evas_engine_sdl_output_free (void *data)
122{
123 Render_Engine* re = data;
124
125 if (re->tb)
126 evas_common_tilebuf_free(re->tb);
127 if (re->rects)
128 evas_common_tilebuf_free_render_rects(re->rects);
129 if (re->rgba_engine_image)
130 evas_cache_engine_image_drop(&re->rgba_engine_image->cache_entry);
131 if (re->cache)
132 evas_cache_engine_image_shutdown(re->cache);
133
134 if (re->update_rects)
135 free(re->update_rects);
136 free(re);
137
138 evas_common_font_shutdown();
139 evas_common_image_shutdown();
140
141 SDL_QuitSubSystem(SDL_INIT_VIDEO);
142}
143
144static void
145evas_engine_sdl_output_resize (void *data, int w, int h)
146{
147 /* FIXME */
148 Render_Engine *re = data;
149 SDL_Surface *surface;
150
151 if (w == re->tb->outbuf_w && h == re->tb->outbuf_h)
152 return;
153
154 /* Destroy the current screen */
155 evas_cache_engine_image_drop(&re->rgba_engine_image->cache_entry);
156
157 /* Rebuil tilebuf */
158 evas_common_tilebuf_free(re->tb);
159 re->tb = evas_common_tilebuf_new(w, h);
160 if (re->tb)
161 evas_common_tilebuf_set_tile_size(re->tb, TILESIZE, TILESIZE);
162
163 /* Build the new screen */
164 surface = SDL_SetVideoMode(w, h, 32,
165 (re->flags.hwsurface ? SDL_HWSURFACE : SDL_SWSURFACE)
166 | (re->flags.fullscreen ? SDL_FULLSCREEN : 0)
167 | (re->flags.noframe ? SDL_NOFRAME : 0)
168 | (re->flags.alpha ? SDL_SRCALPHA : 0));
169
170 if (!surface)
171 {
172 ERR("Unable to change the resolution to : %ix%i", w, h);
173 exit(-1);
174 }
175 re->rgba_engine_image = (SDL_Engine_Image_Entry *) evas_cache_engine_image_engine(re->cache, surface);
176 if (!re->rgba_engine_image)
177 {
178 ERR("RGBA_Image allocation from SDL failed");
179 exit(-1);
180 }
181
182 SDL_FillRect(surface, NULL, 0);
183}
184
185static void
186evas_engine_sdl_output_tile_size_set (void *data, int w, int h)
187{
188 Render_Engine* re = (Render_Engine*) data;
189
190 evas_common_tilebuf_set_tile_size(re->tb, w, h);
191}
192
193static void
194evas_engine_sdl_output_redraws_rect_add (void *data, int x, int y, int w, int h)
195{
196 Render_Engine* re = (Render_Engine*) data;
197
198 evas_common_tilebuf_add_redraw(re->tb, x, y, w, h);
199}
200
201static void
202evas_engine_sdl_output_redraws_rect_del (void *data, int x, int y, int w, int h)
203{
204 Render_Engine* re = (Render_Engine*) data;
205
206 evas_common_tilebuf_del_redraw(re->tb, x, y, w, h);
207}
208
209static void
210evas_engine_sdl_output_redraws_clear (void *data)
211{
212 Render_Engine* re = (Render_Engine*) data;
213
214 evas_common_tilebuf_clear(re->tb);
215}
216
217static void*
218evas_engine_sdl_output_redraws_next_update_get (void *data,
219 int *x, int *y, int *w, int *h,
220 int *cx, int *cy, int *cw, int *ch)
221{
222 Render_Engine *re = data;
223 Tilebuf_Rect *tb_rect;
224 SDL_Rect rect;
225
226 if (re->flags.end)
227 {
228 re->flags.end = 0;
229 return NULL;
230 }
231 if (!re->rects)
232 {
233 re->rects = evas_common_tilebuf_get_render_rects(re->tb);
234 re->cur_rect = EINA_INLIST_GET(re->rects);
235 }
236 if (!re->cur_rect)
237 {
238 if (re->rects) evas_common_tilebuf_free_render_rects(re->rects);
239 re->rects = NULL;
240 return NULL;
241 }
242
243 tb_rect = (Tilebuf_Rect*) re->cur_rect;
244 *cx = *x = tb_rect->x;
245 *cy = *y = tb_rect->y;
246 *cw = *w = tb_rect->w;
247 *ch = *h = tb_rect->h;
248 re->cur_rect = re->cur_rect->next;
249 if (!re->cur_rect)
250 {
251 evas_common_tilebuf_free_render_rects(re->rects);
252 re->rects = NULL;
253 re->flags.end = 1;
254 }
255
256 rect.x = *x;
257 rect.y = *y;
258 rect.w = *w;
259 rect.h = *h;
260
261 /* Return the "fake" surface so it is passed to the drawing routines. */
262 return re->rgba_engine_image;
263}
264
265static void
266evas_engine_sdl_output_redraws_next_update_push (void *data, void *surface __UNUSED__,
267 int x, int y, int w, int h)
268{
269 Render_Engine *re = (Render_Engine *) data;
270
271 if (re->update_rects_count + 1 > re->update_rects_limit)
272 {
273 re->update_rects_limit += 8;
274 re->update_rects = realloc(re->update_rects, sizeof (SDL_Rect) * re->update_rects_limit);
275 }
276
277 re->update_rects[re->update_rects_count].x = x;
278 re->update_rects[re->update_rects_count].y = y;
279 re->update_rects[re->update_rects_count].w = w;
280 re->update_rects[re->update_rects_count].h = h;
281
282 ++re->update_rects_count;
283
284 evas_common_cpu_end_opt();
285}
286
287static void
288_sdl_image_dirty_region(Engine_Image_Entry *eim, unsigned int x, unsigned int y, unsigned int w, unsigned int h)
289{
290 SDL_Engine_Image_Entry *dst;
291 RGBA_Image *im;
292
293 dst = (SDL_Engine_Image_Entry *) eim;
294
295 SDL_UpdateRect(dst->surface, x, y, w, h);
296
297 im = (RGBA_Image *)eim->src;
298 im->flags |= RGBA_IMAGE_IS_DIRTY;
299}
300
301static void
302evas_engine_sdl_output_flush(void *data)
303{
304 Render_Engine *re = (Render_Engine *) data;
305
306 if (re->update_rects_count > 0)
307 SDL_UpdateRects(re->rgba_engine_image->surface, re->update_rects_count, re->update_rects);
308
309 re->update_rects_count = 0;
310}
311
312
313static void
314evas_engine_sdl_output_idle_flush(void *data)
315{
316 (void) data;
317}
318
319/*
320 * Image objects
321 */
322
323static void*
324evas_engine_sdl_image_load(void *data, const char *file, const char *key, int *error, Evas_Image_Load_Opts *lo)
325{
326 Render_Engine* re = (Render_Engine*) data;;
327
328 *error = 0;
329 return evas_cache_engine_image_request(re->cache, file, key, lo, NULL, error);
330}
331
332static int
333evas_engine_sdl_image_alpha_get(void *data __UNUSED__, void *image)
334{
335 SDL_Engine_Image_Entry *eim = image;
336 RGBA_Image *im;
337
338 if (!eim) return 1;
339 im = (RGBA_Image *) eim->cache_entry.src;
340 switch (eim->cache_entry.src->space)
341 {
342 case EVAS_COLORSPACE_ARGB8888:
343 if (im->cache_entry.flags.alpha) return 1;
344 default:
345 break;
346 }
347 return 0;
348}
349
350static void
351evas_engine_sdl_image_size_get(void *data __UNUSED__, void *image, int *w, int *h)
352{
353 SDL_Engine_Image_Entry *eim;
354
355 eim = image;
356 if (w) *w = eim->cache_entry.src->w;
357 if (h) *h = eim->cache_entry.src->h;
358}
359
360static int
361evas_engine_sdl_image_colorspace_get(void *data __UNUSED__, void *image)
362{
363 SDL_Engine_Image_Entry *eim = image;
364
365 if (!eim) return EVAS_COLORSPACE_ARGB8888;
366 return eim->cache_entry.src->space;
367}
368
369static void
370evas_engine_sdl_image_colorspace_set(void *data __UNUSED__, void *image, int cspace)
371{
372 SDL_Engine_Image_Entry *eim = image;
373
374 if (!eim) return;
375 if (eim->cache_entry.src->space == cspace) return;
376
377 evas_cache_engine_image_colorspace(&eim->cache_entry, cspace, NULL);
378}
379
380static void*
381evas_engine_sdl_image_new_from_copied_data(void *data,
382 int w, int h,
383 DATA32* image_data,
384 int alpha, int cspace)
385{
386 Render_Engine *re = (Render_Engine*) data;
387
388 return evas_cache_engine_image_copied_data(re->cache, w, h, image_data, alpha, cspace, NULL);
389}
390
391static void*
392evas_engine_sdl_image_new_from_data(void *data, int w, int h, DATA32* image_data, int alpha, int cspace)
393{
394 Render_Engine *re = (Render_Engine*) data;
395
396 return evas_cache_engine_image_data(re->cache, w, h, image_data, alpha, cspace, NULL);
397}
398
399static void
400evas_engine_sdl_image_free(void *data, void *image)
401{
402 SDL_Engine_Image_Entry *eim = image;
403
404 (void) data;
405
406 evas_cache_engine_image_drop(&eim->cache_entry);
407}
408
409static void*
410evas_engine_sdl_image_size_set(void *data, void *image, int w, int h)
411{
412 SDL_Engine_Image_Entry *eim = image;
413
414 (void) data;
415
416 return evas_cache_engine_image_size_set(&eim->cache_entry, w, h);
417}
418
419static void*
420evas_engine_sdl_image_dirty_region(void *data,
421 void *image,
422 int x, int y, int w, int h)
423{
424 SDL_Engine_Image_Entry *eim = image;
425
426 (void) data;
427
428 return evas_cache_engine_image_dirty(&eim->cache_entry, x, y, w, h);
429}
430
431static void*
432evas_engine_sdl_image_data_get(void *data, void *image,
433 int to_write, DATA32** image_data, int *err)
434{
435 SDL_Engine_Image_Entry *eim = image;
436 RGBA_Image *im;
437
438 (void) data;
439
440 if (!eim)
441 {
442 *image_data = NULL;
443 if (err) *err = EVAS_LOAD_ERROR_GENERIC;
444 return NULL;
445 }
446 im = (RGBA_Image *) eim->cache_entry.src;
447
448 switch (eim->cache_entry.src->space)
449 {
450 case EVAS_COLORSPACE_ARGB8888:
451 if (to_write)
452 eim = (SDL_Engine_Image_Entry *) evas_cache_engine_image_dirty(&eim->cache_entry, 0, 0, eim->cache_entry.src->w, eim->cache_entry.src->h);
453
454 evas_cache_engine_image_load_data(&eim->cache_entry);
455 *image_data = im->image.data;
456 break;
457 case EVAS_COLORSPACE_YCBCR422P709_PL:
458 case EVAS_COLORSPACE_YCBCR422P601_PL:
459 case EVAS_COLORSPACE_YCBCR422601_PL:
460 *image_data = im->cs.data;
461 break;
462 default:
463 abort();
464 break;
465 }
466 if (err) *err = EVAS_LOAD_ERROR_NONE;
467 return eim;
468}
469
470static void*
471evas_engine_sdl_image_data_put(void *data, void *image, DATA32* image_data)
472{
473 SDL_Engine_Image_Entry *eim = image;
474 Render_Engine *re = data;
475 RGBA_Image *im;
476
477 if (!eim) return NULL;
478 im = (RGBA_Image*) eim->cache_entry.src;
479
480 switch (eim->cache_entry.src->space)
481 {
482 case EVAS_COLORSPACE_ARGB8888:
483 if (image_data != im->image.data)
484 {
485 evas_cache_engine_image_drop(&eim->cache_entry);
486 eim = (SDL_Engine_Image_Entry *) evas_cache_engine_image_data(re->cache,
487 eim->cache_entry.w, eim->cache_entry.h,
488 image_data,
489 func.image_alpha_get(data, eim),
490 func.image_colorspace_get(data, eim),
491 NULL);
492 }
493 break;
494 case EVAS_COLORSPACE_YCBCR422P601_PL:
495 case EVAS_COLORSPACE_YCBCR422P709_PL:
496 case EVAS_COLORSPACE_YCBCR422601_PL:
497 if (image_data != im->cs.data)
498 {
499 if (im->cs.data)
500 if (!im->cs.no_free)
501 free(im->cs.data);
502 im->cs.data = image_data;
503 evas_common_image_colorspace_dirty(im);
504 }
505 break;
506 default:
507 abort();
508 break;
509 }
510 return eim;
511}
512
513static void
514evas_engine_sdl_image_data_preload_request(void *data __UNUSED__, void *image, const void *target)
515{
516 SDL_Engine_Image_Entry *eim = image;
517 RGBA_Image *im;
518
519 if (!eim) return ;
520 im = (RGBA_Image*) eim->cache_entry.src;
521 if (!im) return ;
522 evas_cache_image_preload_data(&im->cache_entry, target);
523}
524
525static void
526evas_engine_sdl_image_data_preload_cancel(void *data __UNUSED__, void *image, const void *target)
527{
528 SDL_Engine_Image_Entry *eim = image;
529 RGBA_Image *im;
530
531 if (!eim) return ;
532 im = (RGBA_Image*) eim->cache_entry.src;
533 if (!im) return ;
534 evas_cache_image_preload_cancel(&im->cache_entry, target);
535}
536
537static void*
538evas_engine_sdl_image_alpha_set(void *data, void *image, int has_alpha)
539{
540 SDL_Engine_Image_Entry *eim = image;
541 RGBA_Image *im;
542
543 (void) data;
544
545 if (!eim) return NULL;
546
547 im = (RGBA_Image *) eim->cache_entry.src;
548
549 if (eim->cache_entry.src->space != EVAS_COLORSPACE_ARGB8888)
550 {
551 im->cache_entry.flags.alpha = 0;
552 return eim;
553 }
554
555 eim = (SDL_Engine_Image_Entry *) evas_cache_engine_image_dirty(&eim->cache_entry, 0, 0, eim->cache_entry.w, eim->cache_entry.h);
556
557 /* FIXME: update SDL_Surface flags */
558 im->cache_entry.flags.alpha = has_alpha ? 1 : 0;
559 return eim;
560}
561
562static void*
563evas_engine_sdl_image_border_set(void *data __UNUSED__, void *image, int l __UNUSED__, int r __UNUSED__, int t __UNUSED__, int b __UNUSED__)
564{
565 return image;
566}
567
568static void
569evas_engine_sdl_image_border_get(void *data __UNUSED__, void *image __UNUSED__, int *l __UNUSED__, int *r __UNUSED__, int *t __UNUSED__, int *b __UNUSED__)
570{
571 /* FIXME: need to know what evas expect from this call */
572}
573
574static void
575evas_engine_sdl_image_draw(void *data, void *context, void *surface, void *image,
576 int src_region_x, int src_region_y, int src_region_w, int src_region_h,
577 int dst_region_x, int dst_region_y, int dst_region_w, int dst_region_h,
578 int smooth)
579{
580 SDL_Engine_Image_Entry *eim = image;
581 SDL_Engine_Image_Entry *dst = surface;
582 RGBA_Draw_Context *dc = (RGBA_Draw_Context*) context;
583 int mustlock_im = 0;
584 int mustlock_dst = 0;
585
586 (void) data;
587
588 if (eim->cache_entry.src->space == EVAS_COLORSPACE_ARGB8888)
589 evas_cache_engine_image_load_data(&eim->cache_entry);
590
591 /* Fallback to software method */
592 if (SDL_MUSTLOCK(dst->surface))
593 {
594 mustlock_dst = 1;
595 SDL_LockSurface(dst->surface);
596 _SDL_UPDATE_PIXELS(dst);
597 }
598
599 if (eim->surface && SDL_MUSTLOCK(eim->surface))
600 {
601 mustlock_im = 1;
602 SDL_LockSurface(eim->surface);
603 _SDL_UPDATE_PIXELS(eim);
604 }
605
606 evas_common_image_colorspace_normalize((RGBA_Image *) eim->cache_entry.src);
607
608 if (smooth)
609 evas_common_scale_rgba_in_to_out_clip_smooth((RGBA_Image *) eim->cache_entry.src,
610 (RGBA_Image *) dst->cache_entry.src,
611 dc,
612 src_region_x, src_region_y, src_region_w, src_region_h,
613 dst_region_x, dst_region_y, dst_region_w, dst_region_h);
614 else
615 evas_common_scale_rgba_in_to_out_clip_sample((RGBA_Image *) eim->cache_entry.src,
616 (RGBA_Image *) dst->cache_entry.src,
617 dc,
618 src_region_x, src_region_y, src_region_w, src_region_h,
619 dst_region_x, dst_region_y, dst_region_w, dst_region_h);
620 evas_common_cpu_end_opt ();
621
622 if (mustlock_im)
623 SDL_UnlockSurface(eim->surface);
624
625 if (mustlock_dst)
626 SDL_UnlockSurface(dst->surface);
627}
628
629static void
630evas_engine_sdl_image_map_draw(void *data __UNUSED__, void *context, void *surface, void *image, int npoints, RGBA_Map_Point *p, int smooth, int level)
631{
632 SDL_Engine_Image_Entry *eim = image;
633 SDL_Engine_Image_Entry *dst = surface;
634 int mustlock_im = 0;
635 int mustlock_dst = 0;
636
637 if (!eim || !dst) return;
638
639 if (SDL_MUSTLOCK(dst->surface))
640 {
641 mustlock_dst = 1;
642 SDL_LockSurface(dst->surface);
643 _SDL_UPDATE_PIXELS(dst);
644 }
645
646 if (eim->surface && SDL_MUSTLOCK(eim->surface))
647 {
648 mustlock_im = 1;
649 SDL_LockSurface(eim->surface);
650 _SDL_UPDATE_PIXELS(eim);
651 }
652
653 evas_common_map_rgba((RGBA_Image*) eim->cache_entry.src,
654 (RGBA_Image*) dst->cache_entry.src, context, npoints, p, smooth, level);
655 evas_common_cpu_end_opt();
656
657 if (mustlock_im)
658 SDL_UnlockSurface(eim->surface);
659
660 if (mustlock_dst)
661 SDL_UnlockSurface(dst->surface);
662}
663
664static void *
665evas_engine_sdl_image_map_surface_new(void *data, int w, int h, int alpha)
666{
667 Render_Engine *re = (Render_Engine*) data;
668 void *surface;
669
670 surface = evas_cache_engine_image_copied_data(re->cache,
671 w, h, NULL, alpha,
672 EVAS_COLORSPACE_ARGB8888,
673 NULL);
674 return surface;
675}
676
677static void
678evas_engine_sdl_image_map_surface_free(void *data __UNUSED__, void *surface)
679{
680 evas_cache_engine_image_drop(surface);
681}
682
683static void
684evas_engine_sdl_image_scale_hint_set(void *data __UNUSED__, void *image, int hint)
685{
686 SDL_Engine_Image_Entry *eim;
687
688 if (!image) return ;
689 eim = image;
690 eim->cache_entry.src->scale_hint = hint;
691}
692
693static int
694evas_engine_sdl_image_scale_hint_get(void *data __UNUSED__, void *image)
695{
696 SDL_Engine_Image_Entry *eim;
697
698 if (!image) return EVAS_IMAGE_SCALE_HINT_NONE;
699 eim = image;
700 return eim->cache_entry.src->scale_hint;
701}
702
703static void
704evas_engine_sdl_image_cache_flush(void *data)
705{
706 Render_Engine *re = (Render_Engine*) data;
707 int size;
708
709 size = evas_cache_engine_image_get(re->cache);
710 evas_cache_engine_image_set(re->cache, 0);
711 evas_cache_engine_image_set(re->cache, size);
712}
713
714static void
715evas_engine_sdl_image_cache_set(void *data, int bytes)
716{
717 Render_Engine *re = (Render_Engine*) data;
718
719 evas_cache_engine_image_set(re->cache, bytes);
720}
721
722static int
723evas_engine_sdl_image_cache_get(void *data)
724{
725 Render_Engine *re = (Render_Engine*) data;
726
727 return evas_cache_engine_image_get(re->cache);
728}
729
730static char*
731evas_engine_sdl_image_comment_get(void *data __UNUSED__, void *image, char *key __UNUSED__)
732{
733 SDL_Engine_Image_Entry *eim = image;
734 RGBA_Image *im;
735
736 if (!eim) return NULL;
737 im = (RGBA_Image *) eim->cache_entry.src;
738
739 return im->info.comment;
740}
741
742static char*
743evas_engine_sdl_image_format_get(void *data __UNUSED__, void *image __UNUSED__)
744{
745 /* FIXME: need to know what evas expect from this call */
746 return NULL;
747}
748
749static void
750evas_engine_sdl_font_draw(void *data __UNUSED__, void *context, void *surface, void *font, int x, int y, int w __UNUSED__, int h __UNUSED__, int ow __UNUSED__, int oh __UNUSED__, const Evas_Text_Props *intl_props)
751{
752 SDL_Engine_Image_Entry *eim = surface;
753 int mustlock_im = 0;
754
755 if (eim->surface && SDL_MUSTLOCK(eim->surface))
756 {
757 mustlock_im = 1;
758 SDL_LockSurface(eim->surface);
759 _SDL_UPDATE_PIXELS(eim);
760 }
761
762 evas_common_font_draw((RGBA_Image *) eim->cache_entry.src, context, font, x, y, intl_props);
763 evas_common_cpu_end_opt();
764
765 if (mustlock_im)
766 SDL_UnlockSurface(eim->surface);
767}
768
769static void
770evas_engine_sdl_line_draw(void *data __UNUSED__, void *context, void *surface, int x1, int y1, int x2, int y2)
771{
772 SDL_Engine_Image_Entry *eim = surface;
773 int mustlock_im = 0;
774
775 if (eim->surface && SDL_MUSTLOCK(eim->surface))
776 {
777 mustlock_im = 1;
778 SDL_LockSurface(eim->surface);
779 _SDL_UPDATE_PIXELS(eim);
780 }
781
782 evas_common_line_draw((RGBA_Image *) eim->cache_entry.src, context, x1, y1, x2, y2);
783 evas_common_cpu_end_opt();
784
785 if (mustlock_im)
786 SDL_UnlockSurface(eim->surface);
787}
788
789static void
790evas_engine_sdl_rectangle_draw(void *data __UNUSED__, void *context, void *surface, int x, int y, int w, int h)
791{
792 SDL_Engine_Image_Entry *eim = surface;
793#if ENGINE_SDL_PRIMITIVE
794 RGBA_Draw_Context *dc = context;
795#endif
796 int mustlock_im = 0;
797
798#if ENGINE_SDL_PRIMITIVE
799 if (A_VAL(&dc->col.col) != 0x00)
800 {
801 if (A_VAL(&dc->col.col) != 0xFF)
802 {
803#endif
804 if (eim->surface && SDL_MUSTLOCK(eim->surface))
805 {
806 mustlock_im = 1;
807 SDL_LockSurface(eim->surface);
808 _SDL_UPDATE_PIXELS(eim);
809 }
810
811 evas_common_rectangle_draw((RGBA_Image *) eim->cache_entry.src, context, x, y, w, h);
812 evas_common_cpu_end_opt();
813
814 if (mustlock_im)
815 SDL_UnlockSurface(eim->surface);
816#if ENGINE_SDL_PRIMITIVE
817 }
818 else
819 {
820 SDL_Rect dstrect;
821
822 if (dc->clip.use)
823 {
824 SDL_Rect cliprect;
825
826 cliprect.x = dc->clip.x;
827 cliprect.y = dc->clip.y;
828 cliprect.w = dc->clip.w;
829 cliprect.h = dc->clip.h;
830
831 SDL_SetClipRect(eim->surface, &cliprect);
832 }
833
834 dstrect.x = x;
835 dstrect.y = y;
836 dstrect.w = w;
837 dstrect.h = h;
838
839 SDL_FillRect(eim->surface, &dstrect, SDL_MapRGBA(eim->surface->format, R_VAL(&dc->col.col), G_VAL(&dc->col.col), B_VAL(&dc->col.col), 0xFF));
840
841 if (dc->clip.use)
842 SDL_SetClipRect(eim->surface, NULL);
843 }
844 }
845#endif
846}
847
848static void
849evas_engine_sdl_polygon_draw(void *data __UNUSED__, void *context, void *surface, void *polygon, int x, int y)
850{
851 SDL_Engine_Image_Entry *eim = surface;
852 int mustlock_im = 0;
853
854 if (eim->surface && SDL_MUSTLOCK(eim->surface))
855 {
856 mustlock_im = 1;
857 SDL_LockSurface(eim->surface);
858 _SDL_UPDATE_PIXELS(eim);
859 }
860
861 evas_common_polygon_draw((RGBA_Image *) eim->cache_entry.src, context, polygon, x, y);
862 evas_common_cpu_end_opt();
863
864 if (mustlock_im)
865 SDL_UnlockSurface(eim->surface);
866}
867
868static int module_open(Evas_Module *em)
869{
870 if (!em) return 0;
871 /* get whatever engine module we inherit from */
872 if (!_evas_module_engine_inherit(&pfunc, "software_generic")) return 0;
873 _evas_engine_soft_sdl_log_dom = eina_log_domain_register
874 ("evas-software_sdl", EVAS_DEFAULT_LOG_COLOR);
875 if (_evas_engine_soft_sdl_log_dom < 0)
876 {
877 EINA_LOG_ERR("Can not create a module log domain.");
878 return 0;
879 }
880 /* store it for later use */
881 func = pfunc;
882 /* now to override methods */
883#define ORD(f) EVAS_API_OVERRIDE(f, &func, evas_engine_sdl_)
884 ORD(info);
885 ORD(info_free);
886 ORD(setup);
887 ORD(output_free);
888 ORD(output_resize);
889 ORD(output_tile_size_set);
890 ORD(output_redraws_rect_add);
891 ORD(output_redraws_rect_del);
892 ORD(output_redraws_clear);
893 ORD(output_redraws_next_update_get);
894 ORD(output_redraws_next_update_push);
895 ORD(output_flush);
896 ORD(output_idle_flush);
897 ORD(image_load);
898 ORD(image_new_from_data);
899 ORD(image_new_from_copied_data);
900 ORD(image_colorspace_set);
901 ORD(image_colorspace_get);
902 ORD(image_free);
903 ORD(image_size_set);
904 ORD(image_size_get);
905 ORD(image_dirty_region);
906 ORD(image_data_get);
907 ORD(image_data_put);
908 ORD(image_data_preload_request);
909 ORD(image_data_preload_cancel);
910 ORD(image_alpha_set);
911 ORD(image_alpha_get);
912 ORD(image_border_set);
913 ORD(image_border_get);
914 ORD(image_draw);
915 ORD(image_map_draw);
916 ORD(image_map_surface_new);
917 ORD(image_map_surface_free);
918 ORD(image_comment_get);
919 ORD(image_format_get);
920 ORD(image_cache_flush);
921 ORD(image_cache_set);
922 ORD(image_cache_get);
923 ORD(font_draw);
924 ORD(line_draw);
925 ORD(rectangle_draw);
926 ORD(polygon_draw);
927
928 ORD(image_scale_hint_set);
929 ORD(image_scale_hint_get);
930
931 /* now advertise out own api */
932 em->functions = (void *)(&func);
933 return 1;
934}
935
936static void module_close(Evas_Module *em __UNUSED__)
937{
938 eina_log_domain_unregister(_evas_engine_soft_sdl_log_dom);
939}
940
941static Evas_Module_Api evas_modapi =
942{
943 EVAS_MODULE_API_VERSION,
944 "software_sdl",
945 "none",
946 {
947 module_open,
948 module_close
949 }
950};
951
952EVAS_MODULE_DEFINE(EVAS_MODULE_TYPE_ENGINE, engine, software_sdl);
953
954#ifndef EVAS_STATIC_BUILD_SOFTWARE_SDL
955EVAS_EINA_MODULE_DEFINE(engine, software_sdl);
956#endif
957
958/* Private routines. */
959
960static void*
961_sdl_output_setup (int w, int h, int fullscreen, int noframe, int alpha, int hwsurface)
962{
963 Render_Engine *re = calloc(1, sizeof(Render_Engine));
964 SDL_Surface *surface;
965
966 if (!re)
967 return NULL;
968
969 /* if we haven't initialized - init (automatic abort if already done) */
970 evas_common_cpu_init();
971 evas_common_blend_init();
972 evas_common_image_init();
973 evas_common_convert_init();
974 evas_common_scale_init();
975 evas_common_rectangle_init();
976 evas_common_polygon_init();
977 evas_common_line_init();
978 evas_common_font_init();
979 evas_common_draw_init();
980 evas_common_tilebuf_init();
981
982 if (w <= 0) w = 640;
983 if (h <= 0) h = 480;
984
985 re->cache = evas_cache_engine_image_init(&_sdl_cache_engine_image_cb, evas_common_image_cache_get());
986 if (!re->cache)
987 {
988 ERR("Evas_Cache_Engine_Image allocation failed!");
989 free (re);
990 return NULL;
991 }
992
993 re->tb = evas_common_tilebuf_new(w, h);
994 /* in preliminary tests 16x16 gave highest framerates */
995 evas_common_tilebuf_set_tile_size(re->tb, TILESIZE, TILESIZE);
996 surface = SDL_SetVideoMode(w, h, 32,
997 (hwsurface ? SDL_HWSURFACE : SDL_SWSURFACE)
998 | (fullscreen ? SDL_FULLSCREEN : 0)
999 | (noframe ? SDL_NOFRAME : 0)
1000 | (alpha ? SDL_SRCALPHA : 0));
1001
1002 if (!surface)
1003 {
1004 ERR("SDL_SetVideoMode [ %i x %i x 32 ] failed.", w, h);
1005 evas_cache_engine_image_shutdown(re->cache);
1006 free (re);
1007 return NULL;
1008 }
1009
1010 SDL_SetAlpha(surface, SDL_SRCALPHA | SDL_RLEACCEL, 0);
1011
1012 /* We create a "fake" RGBA_Image which points to the SDL surface. Each access
1013 * to that surface is wrapped in Lock / Unlock calls whenever the data is
1014 * manipulated directly. */
1015 re->rgba_engine_image = (SDL_Engine_Image_Entry *) evas_cache_engine_image_engine(re->cache, surface);
1016 if (!re->rgba_engine_image)
1017 {
1018 CRIT("RGBA_Image allocation from SDL failed");
1019 evas_cache_engine_image_shutdown(re->cache);
1020 free (re);
1021 return NULL;
1022 }
1023
1024 SDL_FillRect(surface, NULL, 0);
1025
1026 re->flags.alpha = alpha;
1027 re->flags.hwsurface = hwsurface;
1028 re->flags.fullscreen = fullscreen;
1029 re->flags.noframe = noframe;
1030 return re;
1031}
1032
1033static Engine_Image_Entry*
1034_sdl_image_alloc(void)
1035{
1036 SDL_Engine_Image_Entry *new;
1037
1038 new = calloc(1, sizeof (SDL_Engine_Image_Entry));
1039
1040 return (Engine_Image_Entry *) new;
1041}
1042
1043static void
1044_sdl_image_delete(Engine_Image_Entry *eim)
1045{
1046 free(eim);
1047}
1048
1049static int
1050_sdl_image_constructor(Engine_Image_Entry *ie, void *data __UNUSED__)
1051{
1052 SDL_Surface *sdl = NULL;
1053 SDL_Engine_Image_Entry *eim = (SDL_Engine_Image_Entry *) ie;
1054 RGBA_Image *im;
1055
1056 im = (RGBA_Image *) ie->src;
1057
1058 if (im)
1059 {
1060 evas_cache_image_load_data(&im->cache_entry);
1061
1062 if (im->image.data)
1063 {
1064 /* FIXME: Take care of CSPACE */
1065 sdl = SDL_CreateRGBSurfaceFrom(im->image.data,
1066 ie->w, ie->h,
1067 32, ie->w * 4,
1068 RMASK, GMASK, BMASK, AMASK);
1069 eim->surface = sdl;
1070 eim->flags.engine_surface = 0;
1071 }
1072 }
1073
1074 return EVAS_LOAD_ERROR_NONE;
1075}
1076
1077static void
1078_sdl_image_destructor(Engine_Image_Entry *eie)
1079{
1080 SDL_Engine_Image_Entry *seie = (SDL_Engine_Image_Entry *) eie;
1081
1082 if (seie->surface && !seie->flags.engine_surface)
1083 SDL_FreeSurface(seie->surface);
1084 seie->surface = NULL;
1085}
1086
1087static int
1088_sdl_image_dirty(Engine_Image_Entry *dst, const Engine_Image_Entry *src __UNUSED__)
1089{
1090 SDL_Engine_Image_Entry *eim = (SDL_Engine_Image_Entry *) dst;
1091 SDL_Surface *sdl = NULL;
1092 RGBA_Image *im;
1093
1094 im = (RGBA_Image *) dst->src;
1095
1096 /* FIXME: Take care of CSPACE */
1097 sdl = SDL_CreateRGBSurfaceFrom(im->image.data,
1098 dst->w, dst->h,
1099 32, dst->w * 4,
1100 0xff0000, 0xff00, 0xff, 0xff000000);
1101 eim->surface = sdl;
1102 eim->flags.engine_surface = 0;
1103
1104 return 0;
1105}
1106
1107static int
1108_sdl_image_update_data(Engine_Image_Entry *dst, void* engine_data)
1109{
1110 SDL_Engine_Image_Entry *eim = (SDL_Engine_Image_Entry *) dst;
1111 SDL_Surface *sdl = NULL;
1112 RGBA_Image *im;
1113
1114 im = (RGBA_Image *) dst->src;
1115
1116 if (engine_data)
1117 {
1118 sdl = engine_data;
1119
1120 if (im)
1121 {
1122 im->image.data = sdl->pixels;
1123 im->image.no_free = 1;
1124 im->cache_entry.flags.alpha = 0;
1125 dst->src->w = sdl->w;
1126 dst->src->h = sdl->h;
1127 }
1128 dst->w = sdl->w;
1129 dst->h = sdl->h;
1130 }
1131 else
1132 {
1133 /* FIXME: Take care of CSPACE */
1134 SDL_FreeSurface(eim->surface);
1135 sdl = SDL_CreateRGBSurfaceFrom(im->image.data,
1136 dst->w, dst->h,
1137 32, dst->w * 4,
1138 RMASK, GMASK, BMASK, AMASK);
1139 }
1140
1141 eim->surface = sdl;
1142
1143 return 0;
1144}
1145
1146static int
1147_sdl_image_size_set(Engine_Image_Entry *dst, const Engine_Image_Entry *src __UNUSED__)
1148{
1149 SDL_Engine_Image_Entry *eim = (SDL_Engine_Image_Entry *) dst;
1150 SDL_Surface *sdl;
1151 RGBA_Image *im;
1152
1153 im = (RGBA_Image *) dst->src;
1154
1155 /* FIXME: handle im == NULL */
1156 sdl = SDL_CreateRGBSurfaceFrom(im->image.data,
1157 dst->w, dst->h,
1158 32, dst->w * 4,
1159 RMASK, GMASK, BMASK, AMASK);
1160
1161 eim->surface = sdl;
1162
1163 return 0;
1164}
1165
1166static void
1167_sdl_image_load(Engine_Image_Entry *eim, const Image_Entry *ie_im)
1168{
1169 SDL_Engine_Image_Entry *load = (SDL_Engine_Image_Entry *) eim;
1170 SDL_Surface *sdl;
1171
1172 if (!load->surface)
1173 {
1174 RGBA_Image *im;
1175
1176 im = (RGBA_Image *) ie_im;
1177
1178 sdl = SDL_CreateRGBSurfaceFrom(im->image.data,
1179 eim->w, eim->h,
1180 32, eim->w * 4,
1181 RMASK, GMASK, BMASK, AMASK);
1182 load->surface = sdl;
1183 }
1184}
1185
1186static int
1187_sdl_image_mem_size_get(Engine_Image_Entry *eim)
1188{
1189 SDL_Engine_Image_Entry *seie = (SDL_Engine_Image_Entry *) eim;
1190 int size = 0;
1191
1192 /* FIXME: Count surface size. */
1193 if (seie->surface)
1194 size = sizeof (SDL_Surface) + sizeof (SDL_PixelFormat);
1195
1196 return size;
1197}
1198
1199#ifdef DEBUG_SDL
1200static void
1201_sdl_image_debug(const char* context, Engine_Image_Entry* eie)
1202{
1203 SDL_Engine_Image_Entry *eim = (SDL_Engine_Image_Entry *) eie;
1204
1205 DBG("*** %s image (%p) ***", context, eim);
1206 if (eim)
1207 {
1208 DBG("W: %i, H: %i, R: %i", eim->cache_entry.w, eim->cache_entry.h, eim->cache_entry.references);
1209 if (eim->cache_entry.src)
1210 DBG("Pixels: %p, SDL Surface: %p",((RGBA_Image*) eim->cache_entry.src)->image.data, eim->surface);
1211 if (eim->surface)
1212 DBG("Surface->pixels: %p", eim->surface->pixels);
1213 DBG("Key: %s", eim->cache_entry.cache_key);
1214 DBG("Reference: %i", eim->cache_entry.references);
1215 }
1216 DBG("*** ***");
1217}
1218#endif
diff --git a/legacy/evas/src/modules/engines/software_sdl/evas_engine.h b/legacy/evas/src/modules/engines/software_sdl/evas_engine.h
deleted file mode 100644
index 5133fec9b0..0000000000
--- a/legacy/evas/src/modules/engines/software_sdl/evas_engine.h
+++ /dev/null
@@ -1,72 +0,0 @@
1#ifndef EVAS_ENGINE_SDL_H
2#define EVAS_ENGINE_SDL_H
3
4#include "evas_common.h"
5#include "evas_private.h"
6#include "Evas_Engine_SDL.h"
7
8extern int _evas_engine_soft_sdl_log_dom ;
9#ifdef ERR
10# undef ERR
11#endif
12#define ERR(...) EINA_LOG_DOM_ERR(_evas_engine_soft_sdl_log_dom, __VA_ARGS__)
13
14#ifdef DBG
15# undef DBG
16#endif
17#define DBG(...) EINA_LOG_DOM_DBG(_evas_engine_soft_sdl_log_dom, __VA_ARGS__)
18
19#ifdef INF
20# undef INF
21#endif
22#define INF(...) EINA_LOG_DOM_INFO(_evas_engine_soft_sdl_log_dom, __VA_ARGS__)
23
24#ifdef WRN
25# undef WRN
26#endif
27#define WRN(...) EINA_LOG_DOM_WARN(_evas_engine_soft_sdl_log_dom, __VA_ARGS__)
28
29#ifdef CRIT
30# undef CRIT
31#endif
32#define CRIT(...) EINA_LOG_DOM_CRIT(_evas_engine_soft_sdl_log_dom, __VA_ARGS__)
33
34typedef struct _SDL_Engine_Image_Entry SDL_Engine_Image_Entry;
35struct _SDL_Engine_Image_Entry
36{
37 Engine_Image_Entry cache_entry;
38
39 SDL_Surface *surface;
40
41 struct
42 {
43 unsigned int engine_surface : 1;
44 } flags;
45};
46
47typedef struct _Render_Engine Render_Engine;
48struct _Render_Engine
49{
50 SDL_Engine_Image_Entry *rgba_engine_image;
51
52 Tilebuf *tb;
53 Tilebuf_Rect *rects;
54 Eina_Inlist *cur_rect;
55
56 Evas_Cache_Engine_Image *cache;
57
58 SDL_Rect *update_rects;
59 int update_rects_count;
60 int update_rects_limit;
61
62 struct
63 {
64 unsigned int fullscreen : 1;
65 unsigned int noframe : 1;
66 unsigned int alpha : 1;
67 unsigned int hwsurface : 1;
68 unsigned int end : 1;
69 } flags;
70};
71
72#endif