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

ecore: remove use of SDL software sdl 16 from Ecore_Evas. 

SVN revision: 68446
This commit is contained in:
Cedric BAIL 2012-02-25 21:20:42 +00:00
parent 96211b171a
commit b01e8f4802
3 changed files with 8 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
legacy/ecore/configure.ac
View File

@ -1836,11 +1836,13 @@ fi
# ecore_evas_software_sdl
ECORE_EVAS_CHECK_MODULE([software-sdl],
[${want_ecore_evas_software_sdl}],
[Software SDL],
[${have_ecore_sdl}],
[requirements_ecore_evas="ecore-sdl >= 1.1.99 ${requirements_ecore_evas}"])
have_ecore_evas_software_sdl="no"
if test "x${have_ecore_sdl}" = "xyes"; then
requirements_ecore_evas="ecore-sdl >= 1.1.99 ${requirements_ecore_evas}"
have_ecore_evas_software_sdl="yes"
AC_DEFINE(BUILD_ECORE_EVAS_SOFTWARE_SDL, 1, [Support for Software SDL Engine in Ecore_Evas])
requirements_ecore_evas="ecore-sdl >= 1.1.99 ${requirements_ecore_evas}"
fi
# ecore_evas_gl_sdl

19
legacy/ecore/src/lib/ecore_evas/ecore_evas.c
View File

@ -509,24 +509,6 @@ _ecore_evas_constructor_sdl(int x __UNUSED__, int y __UNUSED__, int w, int h, co
return ee;
}
static Ecore_Evas *
_ecore_evas_constructor_sdl16(int x __UNUSED__, int y __UNUSED__, int w, int h, const char *extra_options)
{
Ecore_Evas *ee;
unsigned int fullscreen = 0, hwsurface = 0, noframe = 0, alpha = 0;
char *name = NULL;
_ecore_evas_parse_extra_options_str(extra_options, "name=", &name);
_ecore_evas_parse_extra_options_uint(extra_options, "fullscreen=", &fullscreen);
_ecore_evas_parse_extra_options_uint(extra_options, "hwsurface=", &hwsurface);
_ecore_evas_parse_extra_options_uint(extra_options, "alpha=", &alpha);
ee = ecore_evas_sdl16_new(name, w, h, fullscreen, hwsurface, noframe, alpha);
free(name);
return ee;
}
#endif
#ifdef BUILD_ECORE_EVAS_OPENGL_SDL
@ -788,7 +770,6 @@ static const struct ecore_evas_engine _engines[] = {
#ifdef BUILD_ECORE_EVAS_SOFTWARE_SDL
{"sdl", _ecore_evas_constructor_sdl},
{"software_16_sdl", _ecore_evas_constructor_sdl16},
#endif
/* independent */

46
legacy/ecore/src/lib/ecore_evas/ecore_evas_sdl.c
View File

@ -486,35 +486,7 @@ _ecore_evas_internal_sdl_new(int rmethod, const char* name, int w, int h, int fu
evas_output_size_set(ee->evas, w, h);
evas_output_viewport_set(ee->evas, 0, 0, w, h);
if (rmethod == evas_render_method_lookup("software_16_sdl"))
{
#ifdef BUILD_ECORE_EVAS_SOFTWARE_SDL
Evas_Engine_Info_SDL *einfo;
einfo = (Evas_Engine_Info_SDL *) evas_engine_info_get(ee->evas);
if (einfo)
{
einfo->info.rotation = 0;
einfo->info.fullscreen = fullscreen;
einfo->info.hwsurface = hwsurface;
einfo->info.noframe = noframe;
einfo->info.alpha = alpha;
if (!evas_engine_info_set(ee->evas, (Evas_Engine_Info *)einfo))
{
ERR("evas_engine_info_set() for engine '%s' failed.", ee->driver);
ecore_evas_free(ee);
return NULL;
}
}
else
{
ERR("evas_engine_info_set() init engine '%s' failed.", ee->driver);
ecore_evas_free(ee);
return NULL;
}
#endif
}
else if (rmethod == evas_render_method_lookup("buffer"))
if (rmethod == evas_render_method_lookup("buffer"))
{
Evas_Engine_Info_Buffer *einfo;
@ -648,28 +620,12 @@ ecore_evas_sdl_new(const char* name __UNUSED__, int w __UNUSED__, int h __UNUSED
}
#endif
#ifdef BUILD_ECORE_EVAS_SOFTWARE_SDL
EAPI Ecore_Evas*
ecore_evas_sdl16_new(const char* name, int w, int h, int fullscreen, int hwsurface, int noframe, int alpha)
{
Ecore_Evas *ee;
int rmethod;
rmethod = evas_render_method_lookup("software_16_sdl");
if (!rmethod) return NULL;
ee = _ecore_evas_internal_sdl_new(rmethod, name, w, h, fullscreen, hwsurface, noframe, alpha);
ee->driver = "software_16_sdl";
return ee;
}
#else
EAPI Ecore_Evas*
ecore_evas_sdl16_new(const char* name __UNUSED__, int w __UNUSED__, int h __UNUSED__, int fullscreen __UNUSED__, int hwsurface __UNUSED__, int noframe __UNUSED__, int alpha __UNUSED__)
{
ERR("OUTCH !");
return NULL;
}
#endif
#ifdef BUILD_ECORE_EVAS_OPENGL_SDL
EAPI Ecore_Evas*