Merge remote-tracking branch 'upstream/master' into atomic

This commit is contained in:
Ryan Dwyer 2018-06-18 15:58:48 +10:00
commit 645bf446fa
7 changed files with 142 additions and 118 deletions

View file

@ -285,10 +285,10 @@ static void render_surface_iterator(struct wlr_surface *surface, int sx, int sy,
intersects = get_view_box(&data->root_geo, data->output, data->view,
sx, sy, &box);
} else {
if (!wlr_surface_has_buffer(surface)) {
texture = wlr_surface_get_texture(surface);
if (texture == NULL) {
return;
}
texture = surface->texture;
intersects = get_surface_box(&data->root_geo, data->output, surface,
sx, sy, &box);
}