Merge pull request #2135 from emersion/wlroots-1060

Update for swaywm/wlroots#1060
master
Drew DeVault 7 years ago committed by GitHub
commit 378697b79d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -240,7 +240,8 @@ static void render_surface_iterator(struct wlr_surface *surface, int sx, int sy,
pixman_region32_t *output_damage = data->damage; pixman_region32_t *output_damage = data->damage;
float alpha = data->alpha; float alpha = data->alpha;
if (!wlr_surface_has_buffer(surface)) { struct wlr_texture *texture = wlr_surface_get_texture(surface);
if (texture == NULL) {
return; return;
} }
@ -259,8 +260,7 @@ static void render_surface_iterator(struct wlr_surface *surface, int sx, int sy,
wlr_matrix_project_box(matrix, &box, transform, rotation, wlr_matrix_project_box(matrix, &box, transform, rotation,
wlr_output->transform_matrix); wlr_output->transform_matrix);
render_texture(wlr_output, output_damage, surface->texture, &box, matrix, render_texture(wlr_output, output_damage, texture, &box, matrix, alpha);
alpha);
} }
static void render_layer(struct sway_output *output, static void render_layer(struct sway_output *output,

Loading…
Cancel
Save