derekf pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=50a3f84191e5db58599b7145e47c88b9040f714f
commit 50a3f84191e5db58599b7145e47c88b9040f714f Author: Derek Foreman <[email protected]> Date: Fri Apr 29 11:32:37 2016 -0500 Move the test for resetting no native surface to after caps checks This is supposed to be functionally equivalent, but is a little tricky to prove. The benefit of this is a simplification to the callers, which no longer have to consider gl capabilities in the call, as that is now tested for internally. --- src/bin/e_comp_object.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/bin/e_comp_object.c b/src/bin/e_comp_object.c index 033a46c..b9e9502 100644 --- a/src/bin/e_comp_object.c +++ b/src/bin/e_comp_object.c @@ -3671,7 +3671,6 @@ e_comp_object_native_surface_set(Evas_Object *obj, Eina_Bool set) EINA_SAFETY_ON_NULL_RETURN(cw->ec); if (cw->ec->input_only) return; set = !!set; - if ((!set) && (!cw->native)) return; if (set) { @@ -3692,6 +3691,8 @@ e_comp_object_native_surface_set(Evas_Object *obj, Eina_Bool set) if (set) set = (!!cw->ns) || e_pixmap_native_surface_init(cw->ec->pixmap, &ns); } + if ((!set) && (!cw->native)) return; + cw->native = set; evas_object_image_native_surface_set(cw->obj, set && (!cw->blanked) ? (cw->ns ?: &ns) : NULL); --
