projects
/
platform
/
upstream
/
enlightenment.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
b45e16e
)
fix comp object native surface config checking for non-x11 compositors
author
Mike Blumenkrantz
<zmike@osg.samsung.com>
Mon, 2 Nov 2015 20:54:13 +0000
(15:54 -0500)
committer
Mike Blumenkrantz
<zmike@osg.samsung.com>
Mon, 2 Nov 2015 21:25:02 +0000
(16:25 -0500)
src/bin/e_comp_object.c
patch
|
blob
|
history
diff --git
a/src/bin/e_comp_object.c
b/src/bin/e_comp_object.c
index
ead5511
..
c248d7f
100644
(file)
--- 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);
}