summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjiin.moon <jiin.moon@samsung.com>2015-08-07 15:10:02 +0900
committerChunEon Park <hermet@hermet.pe.kr>2015-08-07 15:10:03 +0900
commit72c5b5fb270b0e7b533b52321532663665764196 (patch)
tree21922880ec7b1a8926e02c30c50696014043958c
parent1e399b6fe9813c029d0cd64239350d54849b56e2 (diff)
elm_win: add new condition about engine set when generate the elm_win object
Summary: Calling the elm_config_accel_preference_get api with "none" as parameter, it means user does not want to use acceleration. Reviewers: Hermet Reviewed By: Hermet Differential Revision: https://phab.enlightenment.org/D2920
-rw-r--r--src/lib/elm_config.h1
-rw-r--r--src/lib/elm_win.c8
2 files changed, 7 insertions, 2 deletions
diff --git a/src/lib/elm_config.h b/src/lib/elm_config.h
index 786174ea3..ce1b45c92 100644
--- a/src/lib/elm_config.h
+++ b/src/lib/elm_config.h
@@ -919,6 +919,7 @@ EAPI const char *elm_config_accel_preference_get(void);
919 * "gl", "opengl" - try use OpenGL. 919 * "gl", "opengl" - try use OpenGL.
920 * "3d" - try and use a 3d acceleration unit. 920 * "3d" - try and use a 3d acceleration unit.
921 * "hw", "hardware", "accel" - try any acceleration unit (best possible) 921 * "hw", "hardware", "accel" - try any acceleration unit (best possible)
922 * "none" - use no acceleration. try use software
922 * 923 *
923 * Since 1.14, it is also possible to specify some GL properties for the GL 924 * Since 1.14, it is also possible to specify some GL properties for the GL
924 * window surface. This allows applications to use GLView with depth, stencil 925 * window surface. This allows applications to use GLView with depth, stencil
diff --git a/src/lib/elm_win.c b/src/lib/elm_win.c
index 3fafa5047..f27d425cf 100644
--- a/src/lib/elm_win.c
+++ b/src/lib/elm_win.c
@@ -3492,8 +3492,12 @@ _elm_win_finalize_internal(Eo *obj, Elm_Win_Data *sd, const char *name, Elm_Win_
3492 else 3492 else
3493 { 3493 {
3494// add all engines with selected engine first - if any 3494// add all engines with selected engine first - if any
3495 enginelist[p++] = ENGINE_GET(); 3495 if (elm_config_preferred_engine_get())
3496 3496 enginelist[p++] = elm_config_preferred_engine_get();
3497// add check _elm_gl_preference whether "none" or not
3498 else if (!elm_config_accel_preference_get() ||
3499 strcmp(elm_config_accel_preference_get(),"none"))
3500 enginelist[p++] = elm_config_engine_get();
3497// add all engines with gl/accelerated ones first - only engines compiled 3501// add all engines with gl/accelerated ones first - only engines compiled
3498#ifdef HAVE_ELEMENTARY_X 3502#ifdef HAVE_ELEMENTARY_X
3499 enginelist[p++] = ELM_SOFTWARE_X11; 3503 enginelist[p++] = ELM_SOFTWARE_X11;