aboutsummaryrefslogtreecommitdiff
path: root/backend
diff options
context:
space:
mode:
Diffstat (limited to 'backend')
-rw-r--r--backend/drm/drm.c6
-rw-r--r--backend/drm/renderer.c43
2 files changed, 26 insertions, 23 deletions
diff --git a/backend/drm/drm.c b/backend/drm/drm.c
index a454df03..3f19a799 100644
--- a/backend/drm/drm.c
+++ b/backend/drm/drm.c
@@ -722,7 +722,7 @@ static bool drm_connector_init_renderer(struct wlr_drm_connector *conn,
modifiers = false;
}
- if (!drm_plane_init_surface(plane, drm, width, height, format, 0, modifiers) ||
+ if (!drm_plane_init_surface(plane, drm, width, height, format, false, modifiers) ||
!drm_connector_pageflip_renderer(conn)) {
if (!modifiers) {
wlr_log(WLR_ERROR, "Failed to initialize renderer "
@@ -742,7 +742,7 @@ static bool drm_connector_init_renderer(struct wlr_drm_connector *conn,
crtc->pending.mode = mode;
if (!drm_plane_init_surface(plane, drm, width, height, format,
- 0, modifiers)) {
+ false, modifiers)) {
return false;
}
if (!drm_connector_pageflip_renderer(conn)) {
@@ -897,7 +897,7 @@ static bool drm_connector_set_cursor(struct wlr_output *output,
h = ret ? 64 : h;
if (!drm_plane_init_surface(plane, drm, w, h,
- DRM_FORMAT_ARGB8888, GBM_BO_USE_LINEAR, false)) {
+ DRM_FORMAT_ARGB8888, true, false)) {
wlr_log(WLR_ERROR, "Cannot allocate cursor resources");
return false;
}
diff --git a/backend/drm/renderer.c b/backend/drm/renderer.c
index 27cd50f1..79add1ba 100644
--- a/backend/drm/renderer.c
+++ b/backend/drm/renderer.c
@@ -66,7 +66,7 @@ void finish_drm_renderer(struct wlr_drm_renderer *renderer) {
static bool init_drm_surface(struct wlr_drm_surface *surf,
struct wlr_drm_renderer *renderer, uint32_t width, uint32_t height,
- const struct wlr_drm_format *drm_format, uint32_t flags) {
+ const struct wlr_drm_format *drm_format) {
if (surf->width == width && surf->height == height) {
return true;
}
@@ -80,22 +80,8 @@ static bool init_drm_surface(struct wlr_drm_surface *surf,
wlr_swapchain_destroy(surf->swapchain);
surf->swapchain = NULL;
- struct wlr_drm_format *format_linear = NULL;
- if (flags & GBM_BO_USE_LINEAR) {
- format_linear = calloc(1, sizeof(struct wlr_drm_format) + sizeof(uint64_t));
- if (format_linear == NULL) {
- return false;
- }
- format_linear->format = drm_format->format;
- format_linear->len = 1;
- format_linear->cap = 1;
- format_linear->modifiers[0] = DRM_FORMAT_MOD_LINEAR;
- drm_format = format_linear;
- }
-
surf->swapchain = wlr_swapchain_create(&renderer->allocator->base,
width, height, drm_format);
- free(format_linear);
if (surf->swapchain == NULL) {
wlr_log(WLR_ERROR, "Failed to create swapchain");
memset(surf, 0, sizeof(*surf));
@@ -225,7 +211,7 @@ static uint32_t strip_alpha_channel(uint32_t format) {
bool drm_plane_init_surface(struct wlr_drm_plane *plane,
struct wlr_drm_backend *drm, int32_t width, uint32_t height,
- uint32_t format, uint32_t flags, bool with_modifiers) {
+ uint32_t format, bool force_linear, bool with_modifiers) {
if (!wlr_drm_format_set_has(&plane->formats, format, DRM_FORMAT_MOD_INVALID)) {
format = strip_alpha_channel(format);
}
@@ -265,22 +251,39 @@ bool drm_plane_init_surface(struct wlr_drm_plane *plane,
drm_format = wlr_drm_format_dup(&format_no_modifiers);
}
+ struct wlr_drm_format *drm_format_linear =
+ calloc(1, sizeof(struct wlr_drm_format) + sizeof(uint64_t));
+ if (drm_format_linear == NULL) {
+ free(drm_format);
+ return false;
+ }
+ drm_format_linear->format = drm_format->format;
+ drm_format_linear->len = 1;
+ drm_format_linear->cap = 1;
+ drm_format_linear->modifiers[0] = DRM_FORMAT_MOD_LINEAR;
+
+ if (force_linear) {
+ free(drm_format);
+ drm_format = wlr_drm_format_dup(drm_format_linear);
+ }
+
drm_plane_finish_surface(plane);
bool ok = true;
if (!drm->parent) {
- ok = init_drm_surface(&plane->surf, &drm->renderer, width, height,
- drm_format, flags | GBM_BO_USE_SCANOUT);
+ ok = init_drm_surface(&plane->surf, &drm->renderer,
+ width, height, drm_format);
} else {
ok = init_drm_surface(&plane->surf, &drm->parent->renderer,
- width, height, drm_format, flags | GBM_BO_USE_LINEAR);
+ width, height, drm_format_linear);
if (ok && !init_drm_surface(&plane->mgpu_surf, &drm->renderer,
- width, height, drm_format, flags | GBM_BO_USE_SCANOUT)) {
+ width, height, drm_format)) {
finish_drm_surface(&plane->surf);
ok = false;
}
}
+ free(drm_format_linear);
free(drm_format);
return ok;