diff options
author | emersion <contact@emersion.fr> | 2018-06-13 19:47:43 +0100 |
---|---|---|
committer | Drew DeVault <sir@cmpwn.com> | 2018-06-16 13:32:23 -0400 |
commit | 088cae45c8467b0c7a06301d9aec18f2aab55a1d (patch) | |
tree | cbd4667088db18b5739b1254b2028cefde24a3a2 | |
parent | Merge pull request #2130 from frsfnrrg/keyboard-tuning (diff) | |
download | sway-088cae45c8467b0c7a06301d9aec18f2aab55a1d.tar.gz sway-088cae45c8467b0c7a06301d9aec18f2aab55a1d.tar.zst sway-088cae45c8467b0c7a06301d9aec18f2aab55a1d.zip |
Update for swaywm/wlroots#1060
-rw-r--r-- | sway/desktop/output.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sway/desktop/output.c b/sway/desktop/output.c index 29666c00..d4115be8 100644 --- a/sway/desktop/output.c +++ b/sway/desktop/output.c | |||
@@ -240,7 +240,8 @@ static void render_surface_iterator(struct wlr_surface *surface, int sx, int sy, | |||
240 | pixman_region32_t *output_damage = data->damage; | 240 | pixman_region32_t *output_damage = data->damage; |
241 | float alpha = data->alpha; | 241 | float alpha = data->alpha; |
242 | 242 | ||
243 | if (!wlr_surface_has_buffer(surface)) { | 243 | struct wlr_texture *texture = wlr_surface_get_texture(surface); |
244 | if (texture == NULL) { | ||
244 | return; | 245 | return; |
245 | } | 246 | } |
246 | 247 | ||
@@ -259,8 +260,7 @@ static void render_surface_iterator(struct wlr_surface *surface, int sx, int sy, | |||
259 | wlr_matrix_project_box(matrix, &box, transform, rotation, | 260 | wlr_matrix_project_box(matrix, &box, transform, rotation, |
260 | wlr_output->transform_matrix); | 261 | wlr_output->transform_matrix); |
261 | 262 | ||
262 | render_texture(wlr_output, output_damage, surface->texture, &box, matrix, | 263 | render_texture(wlr_output, output_damage, texture, &box, matrix, alpha); |
263 | alpha); | ||
264 | } | 264 | } |
265 | 265 | ||
266 | static void render_layer(struct sway_output *output, | 266 | static void render_layer(struct sway_output *output, |