wayland: support cm

Author: vaxerski

CMakeLists.txt

@@ -133,6 +133,7 @@ protocolnew("staging/ext-session-lock" "ext-session-lock-v1" false)
 protocolnew("stable/tablet" "tablet-v2" false)
 protocolnew("unstable/text-input" "text-input-unstable-v3" false)
 protocolnew("staging/linux-drm-syncobj" "linux-drm-syncobj-v1" false)
+protocolnew("staging/color-management" "color-management-v1" false)
 protocolnew("protocols" "wlr-layer-shell-unstable-v1" true)
 
 # Tests

src/core/platforms/WaylandPlatform.cpp

@@ -110,6 +110,10 @@ bool CWaylandPlatform::attempt() {
             TRACE(g_logger->log(HT_LOG_TRACE, "  > binding to global: {} (version {}) with id {}", name, 1, id));
             m_waylandState.sessionLock = makeShared<CCExtSessionLockManagerV1>(
                 (wl_proxy*)wl_registry_bind((wl_registry*)m_waylandState.registry->resource(), id, &ext_session_lock_manager_v1_interface, 1));
+        } else if (NAME == wp_color_manager_v1_interface.name) {
+            TRACE(g_logger->log(HT_LOG_TRACE, "  > binding to global: {} (version {}) with id {}", name, 1, id));
+            m_waylandState.colorManagement =
+                makeShared<CCWpColorManagerV1>((wl_proxy*)wl_registry_bind((wl_registry*)m_waylandState.registry->resource(), id, &wp_color_manager_v1_interface, 1));
         }
     });
     m_waylandState.registry->setGlobalRemove([this](CCWlRegistry* r, uint32_t id) {

src/core/platforms/WaylandPlatform.hpp

@@ -25,6 +25,7 @@
 #include <wlr-layer-shell-unstable-v1.hpp>
 #include <linux-drm-syncobj-v1.hpp>
 #include <ext-session-lock-v1.hpp>
+#include <color-management-v1.hpp>
 
 #include <aquamarine/allocator/GBM.hpp>
 #include <aquamarine/backend/Misc.hpp>
@@ -91,6 +92,7 @@ namespace Hyprtoolkit {
             Hyprutils::Memory::CSharedPointer<CCZwlrLayerShellV1>           layerShell;
             Hyprutils::Memory::CSharedPointer<CCWpLinuxDrmSyncobjManagerV1> syncobj;
             Hyprutils::Memory::CSharedPointer<CCExtSessionLockManagerV1>    sessionLock;
+            Hyprutils::Memory::CSharedPointer<CCWpColorManagerV1>           colorManagement;
 
             // control
             bool initialized  = false;

src/window/IWaylandWindow.cpp

@@ -63,6 +63,7 @@ void IWaylandWindow::configure(const Vector2D& size, uint32_t serial) {
 
     resizeSwapchain(m_waylandState.size);
     damageEntire();
+    ensureCMReady();
 
     m_rootElement->reposition({0, 0, m_waylandState.logicalSize.x, m_waylandState.logicalSize.y});
 }
@@ -173,6 +174,8 @@ void IWaylandWindow::render() {
     if (!currentBuffer)
         return;
 
+    applyCMToSurface();
+
     m_needsFrame = false;
 
     g_renderer->beginRendering(m_self.lock(), currentBuffer->m_buffer.lock());
@@ -286,3 +289,42 @@ void IWaylandWindow::resetIM() {
     m_currentInput       = "";
     m_currentInputCursor = 0;
 }
+
+void IWaylandWindow::ensureCMReady() {
+    if (m_waylandState.cmImageDesc || m_waylandState.cmSurface)
+        return;
+
+    m_waylandState.cmSurface = makeShared<CCWpColorManagementSurfaceV1>(g_waylandPlatform->m_waylandState.colorManagement->sendGetSurface(m_waylandState.surface->resource()));
+
+    // create our image description.
+    auto imageDesc = makeShared<CCWpImageDescriptionCreatorParamsV1>(g_waylandPlatform->m_waylandState.colorManagement->sendCreateParametricCreator());
+
+    // Because we don't actually give a flying fuck about color in our renderer... at the moment (FIXME: I wanna write an image viewer, proper colors would be nice...)
+    // we essentially do an srgb kinda...
+
+    // FIXME: for some reason this is correct while named sRGB isn't. Hyprland bug probably. Needs a hl patch.
+    constexpr const int32_t MILLION = 1000000;
+    imageDesc->sendSetPrimaries(          //
+        0.64 * MILLION, 0.33 * MILLION,   // r
+        0.3 * MILLION, 0.6 * MILLION,     // g
+        0.15 * MILLION, 0.06 * MILLION,   // b
+        0.3127 * MILLION, 0.329 * MILLION // D65 white point
+    );
+    imageDesc->sendSetTfNamed(WP_COLOR_MANAGER_V1_TRANSFER_FUNCTION_SRGB);
+    m_waylandState.cmImageDesc = makeShared<CCWpImageDescriptionV1>(imageDesc->sendCreate());
+    m_waylandState.cmImageDesc->setReady([this](CCWpImageDescriptionV1* r, uint32_t id) {
+        g_logger->log(HT_LOG_DEBUG, "wayland: cm creation succeeded");
+        m_waylandState.cmReady = true;
+    });
+    m_waylandState.cmImageDesc->setFailed([this](CCWpImageDescriptionV1* r, wpImageDescriptionV1Cause c, const char* msg) {
+        g_logger->log(HT_LOG_ERROR, "wayland: cm creation failed with code {} and message {}", sc<uint32_t>(c), msg);
+        m_waylandState.cmImageDesc.reset();
+    });
+}
+
+void IWaylandWindow::applyCMToSurface() {
+    if (m_waylandState.cmApplied)
+        return;
+
+    m_waylandState.cmSurface->sendSetImageDescription(m_waylandState.cmImageDesc.get(), WP_COLOR_MANAGER_V1_RENDER_INTENT_PERCEPTUAL);
+}

src/window/IWaylandWindow.hpp

@@ -16,6 +16,7 @@
 #include <viewporter.hpp>
 #include <text-input-unstable-v3.hpp>
 #include <linux-drm-syncobj-v1.hpp>
+#include <color-management-v1.hpp>
 
 #include <chrono>
 
@@ -64,6 +65,9 @@ namespace Hyprtoolkit {
         virtual void configure(const Hyprutils::Math::Vector2D& size, uint32_t serial);
         virtual void resizeSwapchain(const Hyprutils::Math::Vector2D& pixelSize);
 
+        void         ensureCMReady();
+        void         applyCMToSurface();
+
         void         prepareExplicit(SP<CWaylandBuffer>);
         void         submitExplicit(SP<CWaylandBuffer>);
 
@@ -79,6 +83,10 @@ namespace Hyprtoolkit {
             SP<CCWlCallback>                        frameCallback;
             SP<CCWpLinuxDrmSyncobjSurfaceV1>        syncobjSurf;
 
+            bool                                    cmReady = false, cmApplied = false;
+            SP<CCWpColorManagementSurfaceV1>        cmSurface;
+            SP<CCWpImageDescriptionV1>              cmImageDesc;
+
             std::array<SP<CWaylandBuffer>, 2>       wlBuffers;
             SP<Aquamarine::CSwapchain>              swapchain;
             size_t                                  bufIdx = 0;