Merge pull request #432 from mahkoh/jorth/cm-2

wp-color-management-v1: update to version 2

Author: mahkoh

docs/features.md

@@ -174,7 +174,7 @@ Jay supports the following wayland protocols:
 | wl_shm                                               | 2               |               |
 | wl_subcompositor                                     | 1               |               |
 | wp_alpha_modifier_v1                                 | 1               |               |
-| wp_color_manager_v1                                  | 1               |               |
+| wp_color_manager_v1                                  | 2               |               |
 | wp_commit_timing_manager_v1                          | 1               |               |
 | wp_content_type_manager_v1                           | 1               |               |
 | wp_cursor_shape_manager_v1                           | 2               |               |

src/client/objects.rs

@@ -2,7 +2,10 @@ use {
     crate::{
         client::{Client, ClientError},
         ifs::{
-            color_management::wp_image_description_v1::WpImageDescriptionV1,
+            color_management::{
+                wp_image_description_reference_v1::WpImageDescriptionReferenceV1,
+                wp_image_description_v1::WpImageDescriptionV1,
+            },
             ext_foreign_toplevel_handle_v1::ExtForeignToplevelHandleV1,
             ext_image_capture_source_v1::ExtImageCaptureSourceV1,
             ext_image_copy::ext_image_copy_capture_session_v1::ExtImageCopyCaptureSessionV1,
@@ -48,10 +51,11 @@ use {
             ExtImageCopyCaptureSessionV1Id, ExtWorkspaceGroupHandleV1Id, JayHeadErrorV1Id,
             JayOutputId, JayScreencastId, JayToplevelId, JayWorkspaceId, WlBufferId,
             WlDataSourceId, WlOutputId, WlPointerId, WlRegionId, WlRegistryId, WlSeatId,
-            WlSurfaceId, WpDrmLeaseConnectorV1Id, WpImageDescriptionV1Id,
-            WpLinuxDrmSyncobjTimelineV1Id, XdgPopupId, XdgPositionerId, XdgSurfaceId,
-            XdgToplevelId, XdgWmBaseId, ZwlrDataControlSourceV1Id, ZwlrOutputHeadV1Id,
-            ZwlrOutputModeV1Id, ZwpPrimarySelectionSourceV1Id, ZwpTabletToolV2Id,
+            WlSurfaceId, WpDrmLeaseConnectorV1Id, WpImageDescriptionReferenceV1Id,
+            WpImageDescriptionV1Id, WpLinuxDrmSyncobjTimelineV1Id, XdgPopupId, XdgPositionerId,
+            XdgSurfaceId, XdgToplevelId, XdgWmBaseId, ZwlrDataControlSourceV1Id,
+            ZwlrOutputHeadV1Id, ZwlrOutputModeV1Id, ZwpPrimarySelectionSourceV1Id,
+            ZwpTabletToolV2Id,
         },
     },
     std::{cell::RefCell, rc::Rc},
@@ -94,6 +98,8 @@ pub struct Objects {
     pub ext_workspace_groups:
         CopyHashMap<ExtWorkspaceGroupHandleV1Id, Rc<ExtWorkspaceGroupHandleV1>>,
     pub wp_image_description: CopyHashMap<WpImageDescriptionV1Id, Rc<WpImageDescriptionV1>>,
+    pub wp_image_description_reference:
+        CopyHashMap<WpImageDescriptionReferenceV1Id, Rc<WpImageDescriptionReferenceV1>>,
     pub jay_head_errors: CopyHashMap<JayHeadErrorV1Id, Rc<JayHeadErrorV1>>,
     ids: RefCell<Vec<usize>>,
 }
@@ -136,6 +142,7 @@ impl Objects {
             ext_data_sources: Default::default(),
             ext_workspace_groups: Default::default(),
             wp_image_description: Default::default(),
+            wp_image_description_reference: Default::default(),
             jay_head_errors: Default::default(),
             ids: RefCell::new(vec![]),
         }
@@ -182,6 +189,8 @@ impl Objects {
         self.ext_data_sources.clear();
         self.ext_workspace_groups.clear();
         self.jay_head_errors.clear();
+        self.wp_image_description.clear();
+        self.wp_image_description_reference.clear();
     }
 
     pub fn id<T>(&self, client_data: &Client) -> Result<T, ClientError>

src/cmm/cmm_eotf.rs

@@ -13,6 +13,7 @@ pub enum Eotf {
     Log316,
     St428,
     Pow(EotfPow),
+    CompoundPower24,
 }
 
 const MUL: u32 = 10_000;

src/gfx_apis/vulkan/eotfs.rs

@@ -11,6 +11,7 @@ pub const EOTF_LOG316: u32 = 9;
 pub const EOTF_ST428: u32 = 10;
 pub const EOTF_POW: u32 = 11;
 pub const EOTF_GAMMA24: u32 = 12;
+pub const EOTF_COMPOUND_POWER_2_4: u32 = 13;
 
 #[derive(Copy, Clone, Debug, PartialEq, Eq, Hash, Linearize)]
 pub enum VulkanEotf {
@@ -25,6 +26,7 @@ pub enum VulkanEotf {
     Log316,
     St428,
     Pow,
+    CompoundPower24,
 }
 
 pub trait EotfExt: Sized {
@@ -54,6 +56,7 @@ impl EotfExt for Eotf {
             Log316,
             St428,
             Pow,
+            CompoundPower24,
         }
     }
 }
@@ -72,6 +75,7 @@ impl VulkanEotf {
             Self::Log316 => EOTF_LOG316,
             Self::St428 => EOTF_ST428,
             Self::Pow => EOTF_POW,
+            Self::CompoundPower24 => EOTF_COMPOUND_POWER_2_4,
         }
     }
 }

src/gfx_apis/vulkan/renderer.rs

@@ -766,7 +766,7 @@ impl VulkanRenderer {
                 }
             }
         };
-        for (index, op) in opts.into_iter().enumerate() {
+        for (index, op) in opts.iter().enumerate() {
             match op {
                 GfxApiOpt::Sync => {
                     sync(memory);

src/gfx_apis/vulkan/shaders/eotfs.glsl

@@ -15,6 +15,7 @@
 #define TF_ST428 10
 #define TF_POW 11
 #define TF_GAMMA24 12
+#define TF_COMPOUND_POWER_2_4 13
 
 vec3 eotf_bt1886(vec3 c) {
     c = clamp(c, 0.0, 1.0);
@@ -101,6 +102,22 @@ vec3 inv_eotf_st428(vec3 c) {
     return pow(vec3(48.0) * c / vec3(52.37), vec3(1.0 / 2.6));
 }
 
+vec3 eotf_compound_power_2_4(vec3 c) {
+    return mix(
+        c * vec3(1.0 / 12.92),
+        pow((c + vec3(0.055)) * vec3(1.0 / 1.055), vec3(2.4)),
+        greaterThanEqual(c, vec3(0.04045))
+    );
+}
+
+vec3 inv_eotf_compound_power_2_4(vec3 c) {
+    return mix(
+        vec3(12.92) * c,
+        vec3(1.055) * pow(c, vec3(1.0 / 2.4)) - vec3(0.055),
+        greaterThanEqual(c, vec3(0.0031308))
+    );
+}
+
 vec3 apply_eotf(vec3 c) {
     switch (eotf) {
         case TF_LINEAR: return c;
@@ -114,6 +131,7 @@ vec3 apply_eotf(vec3 c) {
         case TF_LOG316: return eotf_log316(c);
         case TF_ST428: return eotf_st428(c);
         case TF_POW: return sign(c) * pow(abs(c), vec3(cm_eotf_args.arg1));
+        case TF_COMPOUND_POWER_2_4: return eotf_compound_power_2_4(c);
         default: return c;
     }
 }
@@ -131,6 +149,7 @@ vec3 apply_inv_eotf(vec3 c) {
         case TF_LOG316: return inv_eotf_log316(c);
         case TF_ST428: return inv_eotf_st428(c);
         case TF_POW: return sign(c) * pow(abs(c), vec3(cm_inv_eotf_args.arg1));
+        case TF_COMPOUND_POWER_2_4: return inv_eotf_compound_power_2_4(c);
         default: return c;
     }
 }

src/gfx_apis/vulkan/shaders_bin/out.frag.spv

@@ -1,4 +1,4 @@
-f49076a6465a6790c72a6d290c13d5f14c7dae8ae3eed6ca71c57424e3306f66 src/gfx_apis/vulkan/shaders/eotfs.glsl
+b6a0df1e231fab533499329636b7a580384784418baee06c147af5fcc384cf5c src/gfx_apis/vulkan/shaders/eotfs.glsl
 8a38df18851cd13884499820f26939fb7319f45d913d867f254d8118d59fb117 src/gfx_apis/vulkan/shaders/fill.common.glsl
 21c488d12aa5ad2f109ec44cb856dfe837e02ea9025b5ed64439d742c17cbf30 src/gfx_apis/vulkan/shaders/fill.frag
 4fb481d8d73afdfb0d8f077eb8665d86f06c8a32a91e44ed369ef5dff554646d src/gfx_apis/vulkan/shaders/fill.vert

src/gfx_apis/vulkan/shaders_bin/tex.frag.spv

@@ -1,3 +1,4 @@
+use crate::object::Version;
 pub use consts::*;
 
 pub mod wp_color_management_output_v1;
@@ -6,8 +7,13 @@ pub mod wp_color_manager_v1;
 pub mod wp_image_description_creator_icc_v1;
 pub mod wp_image_description_creator_params_v1;
 pub mod wp_image_description_info_v1;
+pub mod wp_image_description_reference_v1;
 pub mod wp_image_description_v1;
 
+const UNIQUE_CM_IDS_SINCE: Version = Version(2);
+const SRGB_DEPRECATED_SINCE: Version = Version(2);
+const COMPOUND_POWER_2_4_SINCE: Version = Version(2);
+
 const PRIMARIES_MUL: f64 = 1_000_000.0;
 const PRIMARIES_MUL_INV: f64 = 1.0 / PRIMARIES_MUL;
 
@@ -55,6 +61,7 @@ mod consts {
     pub const TRANSFER_FUNCTION_ST2084_PQ: u32 = 11;
     pub const TRANSFER_FUNCTION_ST428: u32 = 12;
     pub const TRANSFER_FUNCTION_HLG: u32 = 13;
+    pub const TRANSFER_FUNCTION_COMPOUND_POWER_2_4: u32 = 14;
 
     pub const CAUSE_LOW_VERSION: u32 = 0;
     pub const CAUSE_UNSUPPORTED: u32 = 1;