From: Mike Blumenkrantz <zmike@osg.samsung.com>
Date: Mon, 2 Nov 2015 20:54:13 +0000 (-0500)
Subject: fix comp object native surface config checking for non-x11 compositors
X-Git-Tag: upstream/0.20.0~97
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e7d534ad8020c1f8e8e67511620e0fb85006df9b;p=platform%2Fupstream%2Fenlightenment.git

fix comp object native surface config checking for non-x11 compositors
---

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);
      }