hyprwm
/
wlroots-hyprland
mirror of https://github.com/hyprwm/wlroots-hyprland.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

screencopy_v1: Use new read pixels API

This commit is contained in:
Alexander Orzechowski 2023-06-19 02:10:38 -04:00
parent 8ac5139007
commit b3575fedbc
1 changed files with 32 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
types/wlr_screencopy_v1.c
View File

@ -3,6 +3,7 @@
#include <drm_fourcc.h> #include <drm_fourcc.h>
#include <wlr/interfaces/wlr_output.h> #include <wlr/interfaces/wlr_output.h>
#include <wlr/render/allocator.h> #include <wlr/render/allocator.h>
#include <wlr/render/swapchain.h>
#include <wlr/render/wlr_renderer.h> #include <wlr/render/wlr_renderer.h>
#include <wlr/types/wlr_screencopy_v1.h> #include <wlr/types/wlr_screencopy_v1.h>
#include <wlr/backend.h> #include <wlr/backend.h>
@ -194,11 +195,6 @@ static bool frame_shm_copy(struct wlr_screencopy_frame_v1 *frame,
struct wlr_renderer *renderer = output->renderer; struct wlr_renderer *renderer = output->renderer;
assert(renderer); assert(renderer);
int x = frame->box.x;
int y = frame->box.y;
int width = frame->box.width;
int height = frame->box.height;
void *data; void *data;
uint32_t format; uint32_t format;
size_t stride; size_t stride;
@ -208,12 +204,20 @@ static bool frame_shm_copy(struct wlr_screencopy_frame_v1 *frame,
} }
bool ok = false; bool ok = false;
if (!renderer_bind_buffer(renderer, src_buffer)) {
struct wlr_texture *texture = wlr_texture_from_buffer(renderer, src_buffer);
if (!texture) {
goto out; goto out;
} }
ok = wlr_renderer_read_pixels(renderer, format,
stride, width, height, x, y, 0, 0, data); ok = wlr_texture_read_pixels(texture, &(struct wlr_texture_read_pixels_options) {
renderer_bind_buffer(renderer, NULL); .data = data,
.format = format,
.stride = stride,
.src_box = frame->box,
});
wlr_texture_destroy(texture);
out: out:
wlr_buffer_end_data_ptr_access(frame->buffer); wlr_buffer_end_data_ptr_access(frame->buffer);
@ -525,7 +529,25 @@ static void capture_output(struct wl_client *wl_client,
struct wlr_renderer *renderer = output->renderer; struct wlr_renderer *renderer = output->renderer;
assert(renderer); assert(renderer);
frame->shm_format = wlr_output_preferred_read_format(frame->output); if (!wlr_output_configure_primary_swapchain(output, NULL, &output->swapchain)) {
goto error;
}
int buffer_age;
struct wlr_buffer *buffer = wlr_swapchain_acquire(output->swapchain, &buffer_age);
if (buffer == NULL) {
goto error;
}
struct wlr_texture *texture = wlr_texture_from_buffer(renderer, buffer);
wlr_buffer_unlock(buffer);
if (!texture) {
goto error;
}
frame->shm_format = wlr_texture_preferred_read_format(texture);
wlr_texture_destroy(texture);
if (frame->shm_format == DRM_FORMAT_INVALID) { if (frame->shm_format == DRM_FORMAT_INVALID) {
wlr_log(WLR_ERROR, wlr_log(WLR_ERROR,
"Failed to capture output: no read format supported by renderer"); "Failed to capture output: no read format supported by renderer");