fdo-mirrors/weston
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/weston.git synced 2026-05-08 13:38:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

libweston: move color-management protocol init call to core

Browse source 
This reverts commit 188a3ebd5e.

Call weston_compositor_enable_color_management_protocol() after
compositor->color_manager has been set, and so allows to check if the
color manager supports the features mandatory in protocol. The check is
added in the next patch.

Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.com>
This commit is contained in:
Pekka Paalanen 2024-02-16 11:31:19 +02:00
parent 35a580dab6
commit d9a7b3795a
5 changed files with 18 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
libweston/color-lcms/color-lcms.c
View file

@ -32,7 +32,7 @@
#include "color.h"
#include "color-lcms.h"
#include "color-management.h"
#include "color-properties.h"
#include "shared/helpers.h"
#include "shared/xalloc.h"
#include "shared/weston-assert.h"
@ -470,6 +470,7 @@ weston_color_manager_create(struct weston_compositor *compositor)
cm->base.name = "work-in-progress";
cm->base.compositor = compositor;
cm->base.supports_client_protocol = true;
cm->base.init = cmlcms_init;
cm->base.destroy = cmlcms_destroy;
cm->base.destroy_color_profile = cmlcms_destroy_color_profile;
@ -480,10 +481,6 @@ weston_color_manager_create(struct weston_compositor *compositor)
cm->base.get_surface_color_transform = cmlcms_get_surface_color_transform;
cm->base.create_output_color_outcome = cmlcms_create_output_color_outcome;
/* We support the CM&HDR protocol extension when using LittleCMS. */
if (weston_compositor_enable_color_management_protocol(compositor) < 0)
goto err;
/* We still do not support creating parametric color profiles. */
cm->base.supported_color_features = (1 << WESTON_COLOR_FEATURE_ICC);

2
libweston/color-management.c
View file

@ -1105,7 +1105,7 @@ bind_color_management(struct wl_client *client, void *data, uint32_t version,
* \param compositor The compositor to init for.
* \return Zero on success, -1 on failure.
*/
WL_EXPORT int
int
weston_compositor_enable_color_management_protocol(struct weston_compositor *compositor)
{
uint32_t version = 1;

1
libweston/color-noop.c
View file

@ -250,6 +250,7 @@ weston_color_manager_noop_create(struct weston_compositor *compositor)
cm->base.name = "no-op";
cm->base.compositor = compositor;
cm->base.supports_client_protocol = false;
cm->base.init = cmnoop_init;
cm->base.destroy = cmnoop_destroy;
cm->base.destroy_color_profile = cmnoop_destroy_color_profile;

3
libweston/color.h
View file

@ -252,6 +252,9 @@ struct weston_color_manager {
/** This compositor instance */
struct weston_compositor *compositor;
/** Supports the Wayland CM&HDR protocol extension? */
bool supports_client_protocol;
/**
* Supported color features from Wayland CM&HDR protocol extension.
*

11
libweston/compositor.c
View file

@ -9455,6 +9455,17 @@ weston_compositor_backends_loaded(struct weston_compositor *compositor)
return -1;
weston_log("Color manager: %s\n", compositor->color_manager->name);
weston_log_continue(STAMP_SPACE " protocol support: %s\n",
yesno(compositor->color_manager->supports_client_protocol));
if (compositor->color_manager->supports_client_protocol &&
weston_compositor_enable_color_management_protocol(compositor) < 0) {
/*
* The only way out is to quit the compositor,
* and that will clean up.
*/
return -1;
}
return 0;
}