mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2026-04-20 06:47:19 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

backend/drm: Fix hardware cursors when rendering to linear is not available

Browse source 
GPUs such as NVIDIA and VmWare do not support rendering to a linear
buffer, but require linear cursor buffers. This means we have to
render to some other format, and then convert it ourselves.

This change advertises any render format as an available cursor format.
This commit is contained in:
Austin Shafer 2024-02-05 16:04:56 -05:00
parent 5a2e98e6c2
commit 02cf478581
4 changed files with 134 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

77
backend/drm/renderer.c
View file

@ -1,4 +1,5 @@
#include <assert.h>
#include <stdlib.h>
#include <drm_fourcc.h>
#include <wlr/render/swapchain.h>
#include <wlr/render/wlr_renderer.h>
@ -73,6 +74,82 @@ bool init_drm_surface(struct wlr_drm_surface *surf,
return true;
}
struct wlr_buffer *drm_cursor_copy(struct wlr_drm_surface *surf,
struct wlr_drm_renderer *parent_renderer, struct wlr_buffer *buffer) {
void *data, *src_data;
size_t stride, src_stride;
uint32_t drm_format = DRM_FORMAT_ARGB8888;
if (surf->swapchain->width != buffer->width ||
surf->swapchain->height != buffer->height) {
wlr_log(WLR_ERROR, "Surface size doesn't match buffer size");
return NULL;
}
struct wlr_texture *tex = wlr_texture_from_buffer(parent_renderer->wlr_rend, buffer);
if (tex == NULL) {
wlr_log(WLR_ERROR, "Failed to import cursor into multi-GPU renderer");
return NULL;
}
struct wlr_buffer *dst = wlr_swapchain_acquire(surf->swapchain, NULL);
if (!dst) {
wlr_log(WLR_ERROR, "Failed to acquire multi-GPU swapchain buffer");
goto error_tex;
}
if (!wlr_buffer_begin_data_ptr_access(dst, WLR_BUFFER_DATA_PTR_ACCESS_WRITE, &data,
&drm_format, &stride)) {
wlr_log(WLR_ERROR, "Failed to get data ptr access to DRM cursor surface");
goto error_dst;
}
// Allocate memory to store our pixel data
src_stride = tex->width * 4;
src_data = malloc(tex->height * src_stride);
if (data == NULL) {
goto end_access;
}
// Get our linear pixel data from the source texture
bool result = wlr_texture_read_pixels(tex, &(struct wlr_texture_read_pixels_options) {
.format = DRM_FORMAT_ARGB8888,
.stride = src_stride,
.data = src_data,
});
if (!result) {
wlr_log(WLR_ERROR, "Failed to get data ptr access to DRM cursor surface");
goto free_src_data;
}
if (stride != src_stride) {
wlr_log(WLR_ERROR, "Format/stride values for DRM cursor source and destination"
"buffers do not match");
goto free_src_data;
}
// Copy our linear pixels into our DRM surface
memcpy(data, src_data, stride * buffer->height);
free(src_data);
wlr_buffer_end_data_ptr_access(dst);
wlr_texture_destroy(tex);
return dst;
free_src_data:
free(src_data);
end_access:
wlr_buffer_end_data_ptr_access(dst);
error_dst:
wlr_buffer_unlock(dst);
error_tex:
wlr_texture_destroy(tex);
return NULL;
}
struct wlr_buffer *drm_surface_blit(struct wlr_drm_surface *surf,
struct wlr_buffer *buffer) {
struct wlr_renderer *renderer = surf->renderer->wlr_rend;