[EGIT] [core/enlightenment] master 03/05: fix comp object native surface config checking for non-x11 compositors

[Mike Blumenkrantz]

discomfitor pushed a commit to branch master.

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

commit e7d534ad8020c1f8e8e67511620e0fb85006df9b
Author: Mike Blumenkrantz <zm...@osg.samsung.com>
Date:   Mon Nov 2 15:54:13 2015 -0500

    fix comp object native surface config checking for non-x11 compositors
---
 src/bin/e_comp_object.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/bin/e_comp_object.c b/src/bin/e_comp_object.c
index ead5511..c248d7f 100644
--- a/src/bin/e_comp_object.c
+++ b/src/bin/e_comp_object.c
@@ -3493,7 +3493,9 @@ e_comp_object_native_surface_set(Evas_Object *obj, 
Eina_Bool set)
    if (set)
      {
         /* native requires gl enabled, texture from pixmap enabled, and a 
non-shaped client */
-        set = (e_comp->gl && e_comp_config_get()->texture_from_pixmap && 
(!cw->ec->shaped));
+        set = (e_comp->gl &&
+          ((e_comp->comp_type != E_PIXMAP_TYPE_X) || 
e_comp_config_get()->texture_from_pixmap) &&
+          (!cw->ec->shaped));
         if (set)
           set = (!!cw->ns) || e_pixmap_native_surface_init(cw->ec->pixmap, 
&ns);
      }

--