mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2025-11-06 13:29:45 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Call glReadPixels right before swapping buffers

Browse source
This commit is contained in:
emersion 2017-10-07 12:01:21 +02:00
parent 05096ab458
commit d4cc82f11a
No known key found for this signature in database
GPG key ID: 0FDE7BE0E88F5E48
6 changed files with 11 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

12
types/wlr_output.c
View file

@ -8,6 +8,7 @@
#include <wlr/util/list.h>
#include <wlr/util/log.h>
#include <GLES2/gl2.h>
#include <GLES2/gl2ext.h>
#include <wlr/render/matrix.h>
#include <wlr/render/gles2.h>
#include <wlr/render.h>
@ -105,7 +106,7 @@ void wlr_output_init(struct wlr_output *output,
output->transform = WL_OUTPUT_TRANSFORM_NORMAL;
output->scale = 1;
wl_signal_init(&output->events.frame);
wl_signal_init(&output->events.post_frame);
wl_signal_init(&output->events.swap_buffers);
wl_signal_init(&output->events.resolution);
wl_signal_init(&output->events.destroy);
}
@ -232,6 +233,8 @@ void wlr_output_swap_buffers(struct wlr_output *output) {
wlr_render_with_matrix(output->cursor.renderer, output->cursor.texture, &matrix);
}
wl_signal_emit(&output->events.swap_buffers, &output);
output->impl->swap_buffers(output);
}
@ -250,7 +253,8 @@ uint16_t wlr_output_get_gamma_size(struct wlr_output *output) {
}
void wlr_output_read_pixels(struct wlr_output *output, void *out_data) {
if (output->impl->read_pixels) {
output->impl->read_pixels(output, out_data);
}
// TODO: is wlr_output_make_current required?
wlr_output_make_current(output);
glReadPixels(0, 0, output->width, output->height, GL_BGRA_EXT,
GL_UNSIGNED_BYTE, out_data);
}

2
types/wlr_screenshooter.c
View file

@ -59,7 +59,7 @@ static void screenshooter_shoot(struct wl_client *client,
state->output = output;
state->screenshot = screenshot;
state->frame_listener.notify = output_frame_notify;
wl_signal_add(&output->events.post_frame, &state->frame_listener);
wl_signal_add(&output->events.swap_buffers, &state->frame_listener);
}
static struct orbital_screenshooter_interface screenshooter_impl = {