forked from enlightenment/enlightenment
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.
This commit is contained in:
parent
57f0150b73
commit
50a3f84191
|
@ -3671,7 +3671,6 @@ e_comp_object_native_surface_set(Evas_Object *obj, Eina_Bool set)
|
||||||
EINA_SAFETY_ON_NULL_RETURN(cw->ec);
|
EINA_SAFETY_ON_NULL_RETURN(cw->ec);
|
||||||
if (cw->ec->input_only) return;
|
if (cw->ec->input_only) return;
|
||||||
set = !!set;
|
set = !!set;
|
||||||
if ((!set) && (!cw->native)) return;
|
|
||||||
|
|
||||||
if (set)
|
if (set)
|
||||||
{
|
{
|
||||||
|
@ -3692,6 +3691,8 @@ e_comp_object_native_surface_set(Evas_Object *obj, Eina_Bool set)
|
||||||
if (set)
|
if (set)
|
||||||
set = (!!cw->ns) || e_pixmap_native_surface_init(cw->ec->pixmap, &ns);
|
set = (!!cw->ns) || e_pixmap_native_surface_init(cw->ec->pixmap, &ns);
|
||||||
}
|
}
|
||||||
|
if ((!set) && (!cw->native)) return;
|
||||||
|
|
||||||
cw->native = set;
|
cw->native = set;
|
||||||
|
|
||||||
evas_object_image_native_surface_set(cw->obj, set && (!cw->blanked) ? (cw->ns ?: &ns) : NULL);
|
evas_object_image_native_surface_set(cw->obj, set && (!cw->blanked) ? (cw->ns ?: &ns) : NULL);
|
||||||
|
|
Loading…
Reference in New Issue