blankie
/
wlroots
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

output: fix dangling renderer context after wlr_output_preferred_read_format 

attach_render was called without un-setting the current rendering
context afterwards.

Closes: https://github.com/swaywm/wlroots/issues/2164
This commit is contained in:
Simon Ser 2020-06-19 16:07:49 +02:00 committed by Drew DeVault
parent 3c5dbfd97c
commit 155d57b01d
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
types/wlr_output.c
View File

@ -448,15 +448,16 @@ bool wlr_output_attach_render(struct wlr_output *output, int *buffer_age) {
bool wlr_output_preferred_read_format(struct wlr_output *output, bool wlr_output_preferred_read_format(struct wlr_output *output,
enum wl_shm_format *fmt) { enum wl_shm_format *fmt) {
if (!output->impl->attach_render(output, NULL)) {
return false;
}
struct wlr_renderer *renderer = wlr_backend_get_renderer(output->backend); struct wlr_renderer *renderer = wlr_backend_get_renderer(output->backend);
if (!renderer->impl->preferred_read_format || !renderer->impl->read_pixels) { if (!renderer->impl->preferred_read_format || !renderer->impl->read_pixels) {
return false; return false;
} }
if (!output->impl->attach_render(output, NULL)) {
return false;
}
*fmt = renderer->impl->preferred_read_format(renderer); *fmt = renderer->impl->preferred_read_format(renderer);
output->impl->rollback_render(output);
return true; return true;
} }