forked from enlightenment/efl
Revert "elm: Add eglfs backend support."
This reverts commit 0d6aedbf44e5c371bddfa2b6b61c9409ed2184e3. This patch landed a little bit to early.
This commit is contained in:
parent
a392441fca
commit
b17287397a
|
@ -543,7 +543,6 @@ echo
|
|||
echo " Engines:"
|
||||
echo " X11....................: ${have_elementary_x}"
|
||||
echo " Framebuffer............: ${have_elementary_fb}"
|
||||
echo " Eglfs..................: ${have_elementary_eglfs}"
|
||||
echo " DRM....................: ${have_elementary_drm}"
|
||||
echo " PSL1GHT................: ${have_elementary_psl1ght}"
|
||||
echo " SDL....................: ${have_elementary_sdl}"
|
||||
|
|
|
@ -34,7 +34,6 @@ Eina_Hash *_elm_key_bindings = NULL;
|
|||
const char *_elm_engines[] = {
|
||||
"software_x11",
|
||||
"fb",
|
||||
"eglfs",
|
||||
"opengl_x11",
|
||||
"software_gdi",
|
||||
"sdl",
|
||||
|
@ -1865,8 +1864,6 @@ _env_get(void)
|
|||
eina_stringshare_replace(&_elm_config->engine, ELM_WAYLAND_EGL);
|
||||
else if ((!strcasecmp(s, "drm")))
|
||||
eina_stringshare_replace(&_elm_config->engine, ELM_DRM);
|
||||
else if ((!strcasecmp(s, "eglfs")))
|
||||
eina_stringshare_replace(&_elm_config->engine, ELM_EGLFS);
|
||||
else if ((!strcasecmp(s, "ddraw")))
|
||||
eina_stringshare_replace(&_elm_config->engine, ELM_SOFTWARE_DDRAW);
|
||||
else
|
||||
|
|
|
@ -148,7 +148,6 @@ extern const char *_elm_engines[];
|
|||
#define ELM_WAYLAND_EGL (_elm_engines[11])
|
||||
#define ELM_DRM (_elm_engines[12])
|
||||
#define ELM_SOFTWARE_DDRAW (_elm_engines[13])
|
||||
#define ELM_EGLFS (_elm_engines[14])
|
||||
|
||||
#define ELM_FONT_TOKEN_STYLE ":style="
|
||||
|
||||
|
|
|
@ -3446,7 +3446,6 @@ _elm_win_finalize_internal(Eo *obj, Elm_Win_Data *sd, const char *name, Elm_Win_
|
|||
#endif
|
||||
#ifdef HAVE_ELEMENTARY_FB
|
||||
enginelist[p++] = ELM_SOFTWARE_FB;
|
||||
enginelist[p++] = ELM_EGLFS;
|
||||
#endif
|
||||
}
|
||||
#endif
|
||||
|
@ -3507,7 +3506,6 @@ _elm_win_finalize_internal(Eo *obj, Elm_Win_Data *sd, const char *name, Elm_Win_
|
|||
enginelist[p++] = ELM_DRM;
|
||||
#endif
|
||||
#ifdef HAVE_ELEMENTARY_FB
|
||||
enginelist[p++] = ELM_EGLFS;
|
||||
enginelist[p++] = ELM_SOFTWARE_FB;
|
||||
#endif
|
||||
#ifdef HAVE_ELEMENTARY_COCOA
|
||||
|
@ -3553,7 +3551,6 @@ _elm_win_finalize_internal(Eo *obj, Elm_Win_Data *sd, const char *name, Elm_Win_
|
|||
enginelist[p++] = ELM_DRM;
|
||||
#endif
|
||||
#ifdef HAVE_ELEMENTARY_FB
|
||||
enginelist[p++] = ELM_EGLFS;
|
||||
enginelist[p++] = ELM_SOFTWARE_FB;
|
||||
#endif
|
||||
#ifdef HAVE_ELEMENTARY_COCOA
|
||||
|
@ -3637,8 +3634,6 @@ _elm_win_finalize_internal(Eo *obj, Elm_Win_Data *sd, const char *name, Elm_Win_
|
|||
tmp_sd.ee = ecore_evas_ews_new(0, 0, 1, 1);
|
||||
else if (!strcmp(enginelist[i], ELM_SOFTWARE_FB))
|
||||
tmp_sd.ee = ecore_evas_fb_new(NULL, 0, 1, 1);
|
||||
else if (!strcmp(enginelist[i], ELM_EGLFS))
|
||||
tmp_sd.ee = ecore_evas_eglfs_new(NULL, 0, 1, 1);
|
||||
else if (!strcmp(enginelist[i], ELM_BUFFER))
|
||||
tmp_sd.ee = ecore_evas_buffer_new(1, 1);
|
||||
else if (!strcmp(enginelist[i], ELM_SOFTWARE_PSL1GHT))
|
||||
|
@ -3815,7 +3810,7 @@ _elm_win_finalize_internal(Eo *obj, Elm_Win_Data *sd, const char *name, Elm_Win_
|
|||
_elm_win_list = eina_list_append(_elm_win_list, obj);
|
||||
_elm_win_count++;
|
||||
|
||||
if ((engine) && ((!strcmp(engine, ELM_SOFTWARE_FB)) || (!strcmp(engine, ELM_DRM) || (!strcmp(engine, ELM_EGLFS))))
|
||||
if ((engine) && ((!strcmp(engine, ELM_SOFTWARE_FB)) || (!strcmp(engine, ELM_DRM))))
|
||||
{
|
||||
TRAP(sd, fullscreen_set, 1);
|
||||
}
|
||||
|
@ -3847,7 +3842,7 @@ _elm_win_finalize_internal(Eo *obj, Elm_Win_Data *sd, const char *name, Elm_Win_
|
|||
if ((_elm_config->softcursor_mode == ELM_SOFTCURSOR_MODE_ON) ||
|
||||
((_elm_config->softcursor_mode == ELM_SOFTCURSOR_MODE_AUTO) &&
|
||||
((engine) &&
|
||||
((!strcmp(engine, ELM_SOFTWARE_FB)) || (!strcmp(engine, ELM_DRM) || (!strcmp(engine, ELM_EGLFS))))))
|
||||
((!strcmp(engine, ELM_SOFTWARE_FB)) || (!strcmp(engine, ELM_DRM))))))
|
||||
{
|
||||
Evas_Object *o;
|
||||
Evas_Coord mw = 1, mh = 1, hx = 0, hy = 0;
|
||||
|
@ -4272,8 +4267,7 @@ _elm_win_fullscreen_set(Eo *obj EINA_UNUSED, Elm_Win_Data *sd, Eina_Bool fullscr
|
|||
// YYY: handle if sd->img_obj
|
||||
if (engine_name &&
|
||||
((!strcmp(engine_name, ELM_SOFTWARE_FB)) ||
|
||||
(!strcmp(engine_name, ELM_DRM)) ||
|
||||
(!strcmp(engine_name, ELM_EGLFS))))
|
||||
(!strcmp(engine_name, ELM_DRM))))
|
||||
{
|
||||
// these engines... can ONLY be fullscreen
|
||||
return;
|
||||
|
@ -4318,8 +4312,7 @@ _elm_win_fullscreen_get(Eo *obj EINA_UNUSED, Elm_Win_Data *sd)
|
|||
|
||||
if (engine_name &&
|
||||
((!strcmp(engine_name, ELM_SOFTWARE_FB)) ||
|
||||
(!strcmp(engine_name, ELM_DRM)) ||
|
||||
(!strcmp(engine_name, ELM_EGLFS))))
|
||||
(!strcmp(engine_name, ELM_DRM))))
|
||||
{
|
||||
// these engines... can ONLY be fullscreen
|
||||
return EINA_TRUE;
|
||||
|
|
|
@ -31,8 +31,6 @@
|
|||
* exits)
|
||||
* @li "fb", "software-fb", "software_fb" (Linux framebuffer direct software
|
||||
* rendering)
|
||||
* @li "fb", "software-fb", "software_fb" (Linux framebuffer accelerated
|
||||
* rendering)
|
||||
* @li "sdl", "software-sdl", "software_sdl" (SDL software rendering to SDL
|
||||
* buffer)
|
||||
* @li "gl-sdl", "gl_sdl", "opengl-sdl", "opengl_sdl" (OpenGL or OpenGL-ES2
|
||||
|
|
Loading…
Reference in New Issue