enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 3 Projects Releases Wiki Activity

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
This commit is contained in:
Cedric BAIL 2012-02-23 16:25:07 +00:00
parent 4ecc9ffa63
commit 0dbc99f33a
13 changed files with 15 additions and 1419 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
legacy/evas/ChangeLog
View File

@ -671,3 +671,7 @@
* Fix rouding of update regions for image objects when scaled
(leaves trails without this).
2012-02-23 Cedric Bail
* Remove Software SDL engine.

3
legacy/evas/Makefile.am
View File

@ -43,7 +43,6 @@ evas-software-ddraw.pc.in \
evas-software-16-ddraw.pc.in \
evas-direct3d.pc.in \
evas-software-16-wince.pc.in \
evas-software-sdl.pc.in \
evas-psl1ght.pc.in \
evas-wayland-shm.pc.in \
evas-wayland-egl.pc.in \
@ -121,7 +120,7 @@ if BUILD_ENGINE_SOFTWARE_16_WINCE
pkgconfig_DATA += evas-software-16-wince.pc
endif
if BUILD_ENGINE_SOFTWARE_SDL
if BUILD_ENGINE_SOFTWARE_16_SDL
pkgconfig_DATA += evas-software-sdl.pc
endif

4
legacy/evas/NEWS
View File

@ -14,6 +14,10 @@ Improvements:
* Use Eina_File mmap infrastructure for bmp, ico, pmaps, psd, wbmp and xpm file access.
Removal:
* Software_SDL engine is gone, use buffer engine directly.
Evas 1.1.0
Changes since Evas 1.0.0:

7
legacy/evas/configure.ac
View File

@ -98,7 +98,6 @@ want_evas_engine_software_xlib="no"
want_evas_engine_software_xcb="no"
want_evas_engine_software_gdi="no"
want_evas_engine_software_ddraw="no"
want_evas_engine_software_sdl="no"
want_evas_engine_software_8_x11="no"
want_evas_engine_software_16_x11="no"
want_evas_engine_software_16_ddraw="no"
@ -734,8 +733,6 @@ EVAS_CHECK_ENGINE([software-ddraw], [${want_evas_engine_software_ddraw}], [no],
EVAS_CHECK_ENGINE([direct3d], [${want_evas_engine_direct3d}], [no], [Direct3D])
EVAS_CHECK_ENGINE([software-sdl], [${want_evas_engine_software_sdl}], [no], [Software SDL])
EVAS_CHECK_ENGINE([psl1ght], [${want_evas_engine_psl1ght}], [no], [PSL1GHT])
EVAS_CHECK_ENGINE([gl-sdl], [${want_evas_engine_gl_sdl}], [no], [OpenGL SDL])
@ -1918,7 +1915,6 @@ src/modules/engines/gl_x11/Makefile
src/modules/engines/gl_sdl/Makefile
src/modules/engines/gl_cocoa/Makefile
src/modules/engines/psl1ght/Makefile
src/modules/engines/software_sdl/Makefile
src/modules/engines/software_8/Makefile
src/modules/engines/software_8_x11/Makefile
src/modules/engines/software_16/Makefile
@ -2005,8 +2001,7 @@ fi
echo " Software GDI...............: $have_evas_engine_software_gdi"
echo " Software DirectDraw........: $have_evas_engine_software_ddraw"
echo " Direct3d...................: $have_evas_engine_direct3d"
echo " Software SDL...............: $have_evas_engine_software_sdl (primitive: $sdl_primitive)"
echo $ECHO_N " OpenGL SDL.................: $have_evas_engine_gl_sdl $ECHO_C"
echo " OpenGL SDL.................: $have_evas_engine_gl_sdl $ECHO_C"
if test "x$have_evas_engine_gl_sdl" = "xyes"; then
echo "(GLES: $gl_flavor_gles) (SGX: $gles_variety_sgx) (s3c6410: $gles_variety_s3c6410)"
else

37
legacy/evas/m4/evas_check_engine.m4
View File

@ -495,43 +495,6 @@ fi
])
dnl use: EVAS_CHECK_ENGINE_DEP_SOFTWARE_SDL(engine, simple, want_static[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
AC_DEFUN([EVAS_CHECK_ENGINE_DEP_SOFTWARE_SDL],
[
requirement=""
have_dep="no"
evas_engine_[]$1[]_cflags=""
evas_engine_[]$1[]_libs=""
PKG_CHECK_MODULES([SDL],
[sdl >= 1.2.0],
[
have_dep="yes"
requirement="sdl"
evas_engine_[]$1[]_cflags="${SDL_CFLAGS}"
evas_engine_[]$1[]_libs="${SDL_LIBS}"
]
)
AC_SUBST([evas_engine_$1_cflags])
AC_SUBST([evas_engine_$1_libs])
if test "x$3" = "xstatic" ; then
requirement_evas="${requirement} ${requirement_evas}"
fi
if test "x${have_dep}" = "xyes" ; then
m4_default([$4], [:])
else
m4_default([$5], [:])
fi
])
dnl use: EVAS_CHECK_ENGINE_DEP_SOFTWARE_16_SDL(engine, simple, want_static[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
AC_DEFUN([EVAS_CHECK_ENGINE_DEP_SOFTWARE_16_SDL],

8
legacy/evas/src/lib/Makefile.am
View File

@ -76,13 +76,11 @@ SUBDIRS += ../modules/engines/software_8_x11/
EVAS_STATIC_MODULE += ../modules/engines/software_8_x11/libevas_engine_software_8_x11.la
EVAS_STATIC_LIBADD += @evas_engine_software_8_x11_libs@
endif
if EVAS_STATIC_BUILD_SOFTWARE_SDL
if EVAS_STATIC_BUILD_SOFTWARE_16_SDL
SUBDIRS += \
../modules/engines/software_16_sdl/ \
../modules/engines/software_sdl/
../modules/engines/software_16_sdl/
EVAS_STATIC_MODULE += \
../modules/engines/software_16_sdl/libevas_engine_software_16_sdl.la \
../modules/engines/software_sdl/libevas_engine_software_sdl.la
../modules/engines/software_16_sdl/libevas_engine_software_16_sdl.la
EVAS_STATIC_LIBADD += @SDL_LIBS@
endif
if EVAS_STATIC_BUILD_SOFTWARE_DDRAW

4
legacy/evas/src/lib/file/evas_module.c
View File

@ -98,7 +98,6 @@ EVAS_EINA_STATIC_MODULE_DEFINE(engine, software_8_x11);
EVAS_EINA_STATIC_MODULE_DEFINE(engine, software_ddraw);
EVAS_EINA_STATIC_MODULE_DEFINE(engine, software_gdi);
EVAS_EINA_STATIC_MODULE_DEFINE(engine, software_generic);
EVAS_EINA_STATIC_MODULE_DEFINE(engine, software_sdl);
EVAS_EINA_STATIC_MODULE_DEFINE(engine, software_x11);
EVAS_EINA_STATIC_MODULE_DEFINE(image_loader, bmp);
EVAS_EINA_STATIC_MODULE_DEFINE(image_loader, edb);
@ -176,9 +175,6 @@ static const struct {
#ifdef EVAS_STATIC_BUILD_SOFTWARE_GENERIC
EVAS_EINA_STATIC_MODULE_USE(engine, software_generic),
#endif
#ifdef EVAS_STATIC_BUILD_SOFTWARE_SDL
EVAS_EINA_STATIC_MODULE_USE(engine, software_sdl),
#endif
#ifdef EVAS_STATIC_BUILD_SOFTWARE_X11
EVAS_EINA_STATIC_MODULE_USE(engine, software_x11),
#endif

3
legacy/evas/src/modules/engines/Makefile.am
View File

@ -53,9 +53,6 @@ endif
if !EVAS_STATIC_BUILD_SOFTWARE_16_X11
SUBDIRS += software_16_x11
endif
if !EVAS_STATIC_BUILD_SOFTWARE_SDL
SUBDIRS += software_sdl
endif
if !EVAS_STATIC_BUILD_SOFTWARE_16_SDL
SUBDIRS += software_16_sdl
endif

4
legacy/evas/src/modules/engines/software_16_sdl/Makefile.am
View File

@ -4,7 +4,7 @@ MAINTAINERCLEANFILES = Makefile.in
INCLUDES = -I. -I$(top_srcdir)/src/lib -I$(top_srcdir)/src/lib/include @FREETYPE_CFLAGS@ @PIXMAN_CFLAGS@ @SDL_CFLAGS@ @EINA_CFLAGS@
if BUILD_ENGINE_SOFTWARE_SDL
if BUILD_ENGINE_SOFTWARE_16_SDL
SOFTWARE_SDL_SOURCES = \
evas_engine.c \
@ -14,7 +14,7 @@ evas_engine.h
includes_HEADERS = Evas_Engine_SDL_16.h
includesdir = $(includedir)/evas-@VMAJ@
if !EVAS_STATIC_BUILD_SOFTWARE_SDL
if !EVAS_STATIC_BUILD_SOFTWARE_16_SDL
pkgdir = $(libdir)/evas/modules/engines/software_16_sdl/$(MODULE_ARCH)
pkg_LTLIBRARIES = module.la

27
legacy/evas/src/modules/engines/software_sdl/Evas_Engine_SDL.h
View File

@ -1,27 +0,0 @@
#ifndef _EVAS_ENGINE_SDL_H
#define _EVAS_ENGINE_SDL_H
#include <SDL/SDL.h>
typedef struct _Evas_Engine_Info_SDL Evas_Engine_Info_SDL;
struct _Evas_Engine_Info_SDL
{
/* PRIVATE - don't mess with this baby or evas will poke its tongue out */
/* at you and make nasty noises */
Evas_Engine_Info magic;
struct {
int rotation;
int fullscreen : 1;
int hwsurface : 1;
int noframe : 1;
int alpha : 1;
} info;
/* non-blocking or blocking mode */
Evas_Engine_Render_Mode render_mode;
};
#endif

43
legacy/evas/src/modules/engines/software_sdl/Makefile.am
View File

@ -1,43 +0,0 @@
MAINTAINERCLEANFILES = Makefile.in
AM_CPPFLAGS = \
-I. \
-I$(top_srcdir)/src/lib \
-I$(top_srcdir)/src/lib/include \
-I$(top_srcdir)/src/modules/engines \
@FREETYPE_CFLAGS@ \
@PIXMAN_CFLAGS@ \
@EINA_CFLAGS@ \
@evas_engine_software_sdl_cflags@
if BUILD_ENGINE_SOFTWARE_SDL
SOFTWARE_SDL_SOURCES = evas_engine.c
SOFTWARE_SDL_LIBADD = @evas_engine_software_sdl_libs@
includes_HEADERS = Evas_Engine_SDL.h
includesdir = $(includedir)/evas-@VMAJ@
if !EVAS_STATIC_BUILD_SOFTWARE_SDL
pkgdir = $(libdir)/evas/modules/engines/software_sdl/$(MODULE_ARCH)
pkg_LTLIBRARIES = module.la
module_la_SOURCES = $(SOFTWARE_SDL_SOURCES)
module_la_LIBADD = $(top_builddir)/src/lib/libevas.la @EINA_LIBS@ $(SOFTWARE_SDL_LIBADD)
module_la_LDFLAGS = @lt_enable_auto_import@ -no-undefined -module -avoid-version
module_la_LIBTOOLFLAGS = --tag=disable-static
else
noinst_LTLIBRARIES = libevas_engine_software_sdl.la
libevas_engine_software_sdl_la_SOURCES = $(SOFTWARE_SDL_SOURCES)
libevas_engine_software_sdl_la_LIBADD = $(SOFTWARE_SDL_LIBADD)
endif
endif
EXTRA_DIST = evas_engine.h

1218
legacy/evas/src/modules/engines/software_sdl/evas_engine.c
View File

File diff suppressed because it is too large Load Diff

72
legacy/evas/src/modules/engines/software_sdl/evas_engine.h
View File

@ -1,72 +0,0 @@
#ifndef EVAS_ENGINE_SDL_H
#define EVAS_ENGINE_SDL_H
#include "evas_common.h"
#include "evas_private.h"
#include "Evas_Engine_SDL.h"
extern int _evas_engine_soft_sdl_log_dom ;
#ifdef ERR
# undef ERR
#endif
#define ERR(...) EINA_LOG_DOM_ERR(_evas_engine_soft_sdl_log_dom, __VA_ARGS__)
#ifdef DBG
# undef DBG
#endif
#define DBG(...) EINA_LOG_DOM_DBG(_evas_engine_soft_sdl_log_dom, __VA_ARGS__)
#ifdef INF
# undef INF
#endif
#define INF(...) EINA_LOG_DOM_INFO(_evas_engine_soft_sdl_log_dom, __VA_ARGS__)
#ifdef WRN
# undef WRN
#endif
#define WRN(...) EINA_LOG_DOM_WARN(_evas_engine_soft_sdl_log_dom, __VA_ARGS__)
#ifdef CRIT
# undef CRIT
#endif
#define CRIT(...) EINA_LOG_DOM_CRIT(_evas_engine_soft_sdl_log_dom, __VA_ARGS__)
typedef struct _SDL_Engine_Image_Entry SDL_Engine_Image_Entry;
struct _SDL_Engine_Image_Entry
{
Engine_Image_Entry cache_entry;
SDL_Surface *surface;
struct
{
unsigned int engine_surface : 1;
} flags;
};
typedef struct _Render_Engine Render_Engine;
struct _Render_Engine
{
SDL_Engine_Image_Entry *rgba_engine_image;
Tilebuf *tb;
Tilebuf_Rect *rects;
Eina_Inlist *cur_rect;
Evas_Cache_Engine_Image *cache;
SDL_Rect *update_rects;
int update_rects_count;
int update_rects_limit;
struct
{
unsigned int fullscreen : 1;
unsigned int noframe : 1;
unsigned int alpha : 1;
unsigned int hwsurface : 1;
unsigned int end : 1;
} flags;
};
#endif