[EGIT] [core/enlightenment] master 01/04: unconditionally show opengl option in compositor settings

[Mike Blumenkrantz]

discomfitor pushed a commit to branch master.

http://git.enlightenment.org/core/enlightenment.git/commit/?id=9bf2438ba92b5842f8e213bd61e0f0735ca87b52

commit 9bf2438ba92b5842f8e213bd61e0f0735ca87b52
Author: Mike Blumenkrantz <zm...@osg.samsung.com>
Date:   Thu Oct 22 12:49:51 2015 -0400

    unconditionally show opengl option in compositor settings
    
    enlightenment is not always running in x11, so making this option
    dependent on xlib will break other environments
---
 src/bin/e_int_config_comp.c | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/src/bin/e_int_config_comp.c b/src/bin/e_int_config_comp.c
index 92dd506..07ee16b 100644
--- a/src/bin/e_int_config_comp.c
+++ b/src/bin/e_int_config_comp.c
@@ -265,13 +265,12 @@ _advanced_create_widgets(E_Config_Dialog *cfd, Evas 
*evas, E_Config_Dialog_Data
    rg = e_widget_radio_group_new(&(cfdata->engine));
    ob = e_widget_radio_add(evas, _("Software"), E_COMP_ENGINE_SW, rg);
    e_widget_framelist_object_append(of, ob);
-   if (!getenv("ECORE_X_NO_XLIB"))
+   ob = e_widget_radio_add(evas, _("OpenGL"), E_COMP_ENGINE_GL, rg);
+   e_widget_framelist_object_append(of, ob);
+   if ((e_comp->comp_type == E_PIXMAP_TYPE_X) && (!getenv("ECORE_X_NO_XLIB")))
      {
         if (ecore_evas_engine_type_supported_get(ECORE_EVAS_ENGINE_OPENGL_X11))
           {
-             ob = e_widget_radio_add(evas, _("OpenGL"), E_COMP_ENGINE_GL, rg);
-             e_widget_framelist_object_append(of, ob);
-
              ob = e_widget_label_add(evas, _("OpenGL options:"));
              e_widget_framelist_object_append(of, ob);
              ob = e_widget_check_add(evas, _("Tear-free updates (VSynced)"), 
&(cfdata->vsync));
@@ -600,14 +599,8 @@ _basic_create_widgets(E_Config_Dialog *cfd,
    rg = e_widget_radio_group_new(&(cfdata->engine));
    ob = e_widget_radio_add(evas, _("Software"), E_COMP_ENGINE_SW, rg);
    e_widget_framelist_object_append(of, ob);
-   if (!getenv("ECORE_X_NO_XLIB"))
-     {
-        if (ecore_evas_engine_type_supported_get(ECORE_EVAS_ENGINE_OPENGL_X11))
-          {
-             ob = e_widget_radio_add(evas, _("OpenGL"), E_COMP_ENGINE_GL, rg);
-             e_widget_framelist_object_append(of, ob);
-          }
-     }
+   ob = e_widget_radio_add(evas, _("OpenGL"), E_COMP_ENGINE_GL, rg);
+   e_widget_framelist_object_append(of, ob);
    ob = e_widget_label_add(evas, _("To reset compositor:"));
    e_widget_framelist_object_append(of, ob);
    ob = e_widget_label_add(evas, _("Ctrl+Alt+Shift+Home"));

--