mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2026-03-03 01:41:10 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

color_representation: ensure encoding/range/drm formats compatibility

Browse source
This commit is contained in:
Steve Williams 2026-01-31 15:10:49 +04:00
parent 8f2ef81666
commit 7e34909a67
1 changed files with 30 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

30
types/wlr_color_representation_v1.c
View file

@ -2,12 +2,14 @@
#include <stdlib.h> #include <stdlib.h>
#include <wlr/render/wlr_renderer.h> #include <wlr/render/wlr_renderer.h>
#include <wlr/types/wlr_buffer.h>
#include <wlr/types/wlr_compositor.h> #include <wlr/types/wlr_compositor.h>
#include <wlr/types/wlr_color_representation_v1.h> #include <wlr/types/wlr_color_representation_v1.h>
#include <wlr/util/addon.h> #include <wlr/util/addon.h>
#include <wlr/util/log.h> #include <wlr/util/log.h>
#include "color-representation-v1-protocol.h" #include "color-representation-v1-protocol.h"
#include "render/pixel_format.h"
#include "util/mem.h" #include "util/mem.h"
#define WP_COLOR_REPRESENTATION_VERSION 1 #define WP_COLOR_REPRESENTATION_VERSION 1
@ -234,8 +236,35 @@ static void color_repr_manager_handle_destroy(struct wl_client *client,
wl_resource_destroy(resource); wl_resource_destroy(resource);
} }
static void surface_synced_commit(struct wlr_surface_synced *synced) {
struct wlr_color_representation_v1 *color_repr = wl_container_of(synced, color_repr, synced);
struct wlr_dmabuf_attributes dmabuf;
if (!color_repr->surface->buffer ||
!wlr_buffer_get_dmabuf(&color_repr->surface->buffer->base, &dmabuf)) {
return;
}
bool is_unset = color_repr->current.coefficients == 0 && color_repr->current.range == 0;
bool is_ycbcr = pixel_format_is_ycbcr(dmabuf.format);
if (is_ycbcr) {
if (is_unset) {
color_repr->current.coefficients = WP_COLOR_REPRESENTATION_SURFACE_V1_COEFFICIENTS_BT601;
color_repr->current.range = WP_COLOR_REPRESENTATION_SURFACE_V1_RANGE_LIMITED;
}
} else /* rgb */ {
if (!is_unset) {
wl_resource_post_error(color_repr->resource,
WP_COLOR_REPRESENTATION_SURFACE_V1_ERROR_PIXEL_FORMAT,
"unexpected encoding/range for rgb");
}
}
}
static const struct wlr_surface_synced_impl surface_synced_impl = { static const struct wlr_surface_synced_impl surface_synced_impl = {
.state_size = sizeof(struct wlr_color_representation_v1_surface_state), .state_size = sizeof(struct wlr_color_representation_v1_surface_state),
.commit = surface_synced_commit
}; };
static struct wlr_color_representation_v1 *color_repr_from_surface( static struct wlr_color_representation_v1 *color_repr_from_surface(
@ -280,6 +309,7 @@ static void color_repr_manager_handle_get_surface(struct wl_client *client,
} }
color_repr->manager = manager_from_resource(manager_resource); color_repr->manager = manager_from_resource(manager_resource);
color_repr->surface = surface;
if (!wlr_surface_synced_init(&color_repr->synced, surface, if (!wlr_surface_synced_init(&color_repr->synced, surface,
&surface_synced_impl, &color_repr->pending, &color_repr->current)) { &surface_synced_impl, &color_repr->pending, &color_repr->current)) {