~mir-team/mir/development-branch

« back to all changes in this revision

Viewing changes to src/platforms/mesa/server/bypass.cpp

merge trunk and resolve conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
35
35
    if (!bypass_is_feasible)
36
36
        return false;
37
37
 
38
 
    //offscreen or invisible surfaces don't affect if bypass is possible 
39
 
    if (!(renderable->visible() && //TODO: we shouldn't be getting invisible surfaces 
40
 
         view_area.contains(renderable->screen_position())))
 
38
    //offscreen surfaces don't affect if bypass is possible 
 
39
    if (!view_area.contains(renderable->screen_position()))
41
40
        return false;
42
41
 
43
42
    auto const is_opaque = !((renderable->alpha() != 1.0f) || renderable->shaped());