Nodes: Add general Combine/Separate Color nodes

Inspired by D12936 and D12929, this patch adds general purpose
"Combine Color" and "Separate Color" nodes to Geometry, Compositor,
Shader and Texture nodes.
- Within Geometry Nodes, it replaces the existing "Combine RGB" and
  "Separate RGB" nodes.
- Within Compositor Nodes, it replaces the existing
  "Combine RGBA/HSVA/YCbCrA/YUVA" and "Separate RGBA/HSVA/YCbCrA/YUVA"
  nodes.
- Within Texture Nodes, it replaces the existing "Combine RGBA" and
  "Separate RGBA" nodes.
- Within Shader Nodes, it replaces the existing "Combine RGB/HSV" and
  "Separate RGB/HSV" nodes.

Python addons have not been updated to the new nodes yet.

**New shader code**
In node_color.h, color.h and gpu_shader_material_color_util.glsl,
missing methods hsl_to_rgb and rgb_to_hsl are added by directly
converting existing C code. They always produce the same result.

**Old code**
As requested by T96219, old nodes still exist but are not displayed in
the add menu. This means Python scripts can still create them as usual.
Otherwise, versioning replaces the old nodes with the new nodes when
opening .blend files.

Differential Revision: https://developer.blender.org/D14034

12 files changed, 468 insertions, 134 deletions

diff --git a/source/blender/compositor/CMakeLists.txt b/source/blender/compositor/CMakeLists.txt
index 66f813e02b2..55e349423bb 100644
--- a/source/blender/compositor/CMakeLists.txt
+++ b/source/blender/compositor/CMakeLists.txt
@@ -259,12 +259,16 @@ set(SRC
   # converter nodes
   nodes/COM_CombineColorNode.cc
   nodes/COM_CombineColorNode.h
+  nodes/COM_CombineColorNodeLegacy.cc
+  nodes/COM_CombineColorNodeLegacy.h
   nodes/COM_CombineXYZNode.cc
   nodes/COM_CombineXYZNode.h
   nodes/COM_IDMaskNode.cc
   nodes/COM_IDMaskNode.h
   nodes/COM_SeparateColorNode.cc
   nodes/COM_SeparateColorNode.h
+  nodes/COM_SeparateColorNodeLegacy.cc
+  nodes/COM_SeparateColorNodeLegacy.h
   nodes/COM_SeparateXYZNode.cc
   nodes/COM_SeparateXYZNode.h
 
diff --git a/source/blender/compositor/intern/COM_Converter.cc b/source/blender/compositor/intern/COM_Converter.cc
index 13d412a338b..6d7341376e9 100644
--- a/source/blender/compositor/intern/COM_Converter.cc
+++ b/source/blender/compositor/intern/COM_Converter.cc
@@ -29,6 +29,7 @@
 #include "COM_ColorSpillNode.h"
 #include "COM_ColorToBWNode.h"
 #include "COM_CombineColorNode.h"
+#include "COM_CombineColorNodeLegacy.h"
 #include "COM_CombineXYZNode.h"
 #include "COM_CompositorNode.h"
 #include "COM_ConvertAlphaNode.h"
@@ -82,6 +83,7 @@
 #include "COM_ScaleOperation.h"
 #include "COM_SceneTimeNode.h"
 #include "COM_SeparateColorNode.h"
+#include "COM_SeparateColorNodeLegacy.h"
 #include "COM_SeparateXYZNode.h"
 #include "COM_SetAlphaNode.h"
 #include "COM_SetValueOperation.h"
@@ -169,28 +171,34 @@ Node *COM_convert_bnode(bNode *b_node)
     case CMP_NODE_BRIGHTCONTRAST:
       node = new BrightnessNode(b_node);
       break;
-    case CMP_NODE_SEPRGBA:
+    case CMP_NODE_SEPARATE_COLOR:
+      node = new SeparateColorNode(b_node);
+      break;
+    case CMP_NODE_COMBINE_COLOR:
+      node = new CombineColorNode(b_node);
+      break;
+    case CMP_NODE_SEPRGBA_LEGACY:
       node = new SeparateRGBANode(b_node);
       break;
-    case CMP_NODE_COMBRGBA:
+    case CMP_NODE_COMBRGBA_LEGACY:
       node = new CombineRGBANode(b_node);
       break;
-    case CMP_NODE_SEPHSVA:
+    case CMP_NODE_SEPHSVA_LEGACY:
       node = new SeparateHSVANode(b_node);
       break;
-    case CMP_NODE_COMBHSVA:
+    case CMP_NODE_COMBHSVA_LEGACY:
       node = new CombineHSVANode(b_node);
       break;
-    case CMP_NODE_SEPYUVA:
+    case CMP_NODE_SEPYUVA_LEGACY:
       node = new SeparateYUVANode(b_node);
       break;
-    case CMP_NODE_COMBYUVA:
+    case CMP_NODE_COMBYUVA_LEGACY:
       node = new CombineYUVANode(b_node);
       break;
-    case CMP_NODE_SEPYCCA:
+    case CMP_NODE_SEPYCCA_LEGACY:
       node = new SeparateYCCANode(b_node);
       break;
-    case CMP_NODE_COMBYCCA:
+    case CMP_NODE_COMBYCCA_LEGACY:
       node = new CombineYCCANode(b_node);
       break;
     case CMP_NODE_ALPHAOVER:
diff --git a/source/blender/compositor/nodes/COM_CombineColorNode.cc b/source/blender/compositor/nodes/COM_CombineColorNode.cc
index 0c8748fd2d6..c766a359d63 100644
--- a/source/blender/compositor/nodes/COM_CombineColorNode.cc
+++ b/source/blender/compositor/nodes/COM_CombineColorNode.cc
@@ -40,7 +40,39 @@ void CombineColorNode::convert_to_operations(NodeConverter &converter,
   converter.map_input_socket(input_bsocket, operation->get_input_socket(2));
   converter.map_input_socket(input_asocket, operation->get_input_socket(3));
 
-  NodeOperation *color_conv = get_color_converter(context);
+  bNode *editor_node = this->get_bnode();
+  NodeCMPCombSepColor *storage = (NodeCMPCombSepColor *)editor_node->storage;
+
+  NodeOperation *color_conv = nullptr;
+  switch (storage->mode) {
+    case CMP_NODE_COMBSEP_COLOR_RGB: {
+      /* Pass */
+      break;
+    }
+    case CMP_NODE_COMBSEP_COLOR_HSV: {
+      color_conv = new ConvertHSVToRGBOperation();
+      break;
+    }
+    case CMP_NODE_COMBSEP_COLOR_HSL: {
+      color_conv = new ConvertHSLToRGBOperation();
+      break;
+    }
+    case CMP_NODE_COMBSEP_COLOR_YCC: {
+      ConvertYCCToRGBOperation *operation = new ConvertYCCToRGBOperation();
+      operation->set_mode(storage->ycc_mode);
+      color_conv = operation;
+      break;
+    }
+    case CMP_NODE_COMBSEP_COLOR_YUV: {
+      color_conv = new ConvertYUVToRGBOperation();
+      break;
+    }
+    default: {
+      BLI_assert_unreachable();
+      break;
+    }
+  }
+
   if (color_conv) {
     converter.add_operation(color_conv);
 
@@ -52,27 +84,4 @@ void CombineColorNode::convert_to_operations(NodeConverter &converter,
   }
 }
 
-NodeOperation *CombineRGBANode::get_color_converter(const CompositorContext & /*context*/) const
-{
-  return nullptr; /* no conversion needed */
-}
-
-NodeOperation *CombineHSVANode::get_color_converter(const CompositorContext & /*context*/) const
-{
-  return new ConvertHSVToRGBOperation();
-}
-
-NodeOperation *CombineYCCANode::get_color_converter(const CompositorContext & /*context*/) const
-{
-  ConvertYCCToRGBOperation *operation = new ConvertYCCToRGBOperation();
-  bNode *editor_node = this->get_bnode();
-  operation->set_mode(editor_node->custom1);
-  return operation;
-}
-
-NodeOperation *CombineYUVANode::get_color_converter(const CompositorContext & /*context*/) const
-{
-  return new ConvertYUVToRGBOperation();
-}
-
 }  // namespace blender::compositor
diff --git a/source/blender/compositor/nodes/COM_CombineColorNode.h b/source/blender/compositor/nodes/COM_CombineColorNode.h
index 2bead24cb02..7576cc9eb2d 100644
--- a/source/blender/compositor/nodes/COM_CombineColorNode.h
+++ b/source/blender/compositor/nodes/COM_CombineColorNode.h
@@ -12,45 +12,6 @@ class CombineColorNode : public Node {
   CombineColorNode(bNode *editor_node);
   void convert_to_operations(NodeConverter &converter,
                              const CompositorContext &context) const override;
-
- protected:
-  virtual NodeOperation *get_color_converter(const CompositorContext &context) const = 0;
-};
-
-class CombineRGBANode : public CombineColorNode {
- public:
-  CombineRGBANode(bNode *editor_node) : CombineColorNode(editor_node)
-  {
-  }
-
-  NodeOperation *get_color_converter(const CompositorContext &context) const override;
-};
-
-class CombineHSVANode : public CombineColorNode {
- public:
-  CombineHSVANode(bNode *editor_node) : CombineColorNode(editor_node)
-  {
-  }
-
-  NodeOperation *get_color_converter(const CompositorContext &context) const override;
-};
-
-class CombineYCCANode : public CombineColorNode {
- public:
-  CombineYCCANode(bNode *editor_node) : CombineColorNode(editor_node)
-  {
-  }
-
-  NodeOperation *get_color_converter(const CompositorContext &context) const override;
-};
-
-class CombineYUVANode : public CombineColorNode {
- public:
-  CombineYUVANode(bNode *editor_node) : CombineColorNode(editor_node)
-  {
-  }
-
-  NodeOperation *get_color_converter(const CompositorContext &context) const override;
 };
 
 }  // namespace blender::compositor
diff --git a/source/blender/compositor/nodes/COM_CombineColorNodeLegacy.cc b/source/blender/compositor/nodes/COM_CombineColorNodeLegacy.cc
new file mode 100644
index 00000000000..d5ba379bfc2
--- /dev/null
+++ b/source/blender/compositor/nodes/COM_CombineColorNodeLegacy.cc
@@ -0,0 +1,78 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later
+ * Copyright 2011 Blender Foundation. */
+
+#include "COM_CombineColorNodeLegacy.h"
+
+#include "COM_ConvertOperation.h"
+
+namespace blender::compositor {
+
+CombineColorNodeLegacy::CombineColorNodeLegacy(bNode *editor_node) : Node(editor_node)
+{
+}
+
+void CombineColorNodeLegacy::convert_to_operations(NodeConverter &converter,
+                                                   const CompositorContext &context) const
+{
+  NodeInput *input_rsocket = this->get_input_socket(0);
+  NodeInput *input_gsocket = this->get_input_socket(1);
+  NodeInput *input_bsocket = this->get_input_socket(2);
+  NodeInput *input_asocket = this->get_input_socket(3);
+  NodeOutput *output_socket = this->get_output_socket(0);
+
+  CombineChannelsOperation *operation = new CombineChannelsOperation();
+  if (input_rsocket->is_linked()) {
+    operation->set_canvas_input_index(0);
+  }
+  else if (input_gsocket->is_linked()) {
+    operation->set_canvas_input_index(1);
+  }
+  else if (input_bsocket->is_linked()) {
+    operation->set_canvas_input_index(2);
+  }
+  else {
+    operation->set_canvas_input_index(3);
+  }
+  converter.add_operation(operation);
+
+  converter.map_input_socket(input_rsocket, operation->get_input_socket(0));
+  converter.map_input_socket(input_gsocket, operation->get_input_socket(1));
+  converter.map_input_socket(input_bsocket, operation->get_input_socket(2));
+  converter.map_input_socket(input_asocket, operation->get_input_socket(3));
+
+  NodeOperation *color_conv = get_color_converter(context);
+  if (color_conv) {
+    converter.add_operation(color_conv);
+
+    converter.add_link(operation->get_output_socket(), color_conv->get_input_socket(0));
+    converter.map_output_socket(output_socket, color_conv->get_output_socket());
+  }
+  else {
+    converter.map_output_socket(output_socket, operation->get_output_socket());
+  }
+}
+
+NodeOperation *CombineRGBANode::get_color_converter(const CompositorContext & /*context*/) const
+{
+  return nullptr; /* no conversion needed */
+}
+
+NodeOperation *CombineHSVANode::get_color_converter(const CompositorContext & /*context*/) const
+{
+  return new ConvertHSVToRGBOperation();
+}
+
+NodeOperation *CombineYCCANode::get_color_converter(const CompositorContext & /*context*/) const
+{
+  ConvertYCCToRGBOperation *operation = new ConvertYCCToRGBOperation();
+  bNode *editor_node = this->get_bnode();
+  operation->set_mode(editor_node->custom1);
+  return operation;
+}
+
+NodeOperation *CombineYUVANode::get_color_converter(const CompositorContext & /*context*/) const
+{
+  return new ConvertYUVToRGBOperation();
+}
+
+}  // namespace blender::compositor
diff --git a/source/blender/compositor/nodes/COM_CombineColorNodeLegacy.h b/source/blender/compositor/nodes/COM_CombineColorNodeLegacy.h
new file mode 100644
index 00000000000..edc66c8932f
--- /dev/null
+++ b/source/blender/compositor/nodes/COM_CombineColorNodeLegacy.h
@@ -0,0 +1,56 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later
+ * Copyright 2011 Blender Foundation. */
+
+#pragma once
+
+#include "COM_Node.h"
+
+namespace blender::compositor {
+
+class CombineColorNodeLegacy : public Node {
+ public:
+  CombineColorNodeLegacy(bNode *editor_node);
+  void convert_to_operations(NodeConverter &converter,
+                             const CompositorContext &context) const override;
+
+ protected:
+  virtual NodeOperation *get_color_converter(const CompositorContext &context) const = 0;
+};
+
+class CombineRGBANode : public CombineColorNodeLegacy {
+ public:
+  CombineRGBANode(bNode *editor_node) : CombineColorNodeLegacy(editor_node)
+  {
+  }
+
+  NodeOperation *get_color_converter(const CompositorContext &context) const override;
+};
+
+class CombineHSVANode : public CombineColorNodeLegacy {
+ public:
+  CombineHSVANode(bNode *editor_node) : CombineColorNodeLegacy(editor_node)
+  {
+  }
+
+  NodeOperation *get_color_converter(const CompositorContext &context) const override;
+};
+
+class CombineYCCANode : public CombineColorNodeLegacy {
+ public:
+  CombineYCCANode(bNode *editor_node) : CombineColorNodeLegacy(editor_node)
+  {
+  }
+
+  NodeOperation *get_color_converter(const CompositorContext &context) const override;
+};
+
+class CombineYUVANode : public CombineColorNodeLegacy {
+ public:
+  CombineYUVANode(bNode *editor_node) : CombineColorNodeLegacy(editor_node)
+  {
+  }
+
+  NodeOperation *get_color_converter(const CompositorContext &context) const override;
+};
+
+}  // namespace blender::compositor
diff --git a/source/blender/compositor/nodes/COM_SeparateColorNode.cc b/source/blender/compositor/nodes/COM_SeparateColorNode.cc
index 221d80e67f2..6e69bd097a1 100644
--- a/source/blender/compositor/nodes/COM_SeparateColorNode.cc
+++ b/source/blender/compositor/nodes/COM_SeparateColorNode.cc
@@ -20,7 +20,39 @@ void SeparateColorNode::convert_to_operations(NodeConverter &converter,
   NodeOutput *output_bsocket = this->get_output_socket(2);
   NodeOutput *output_asocket = this->get_output_socket(3);
 
-  NodeOperation *color_conv = get_color_converter(context);
+  bNode *editor_node = this->get_bnode();
+  NodeCMPCombSepColor *storage = (NodeCMPCombSepColor *)editor_node->storage;
+
+  NodeOperation *color_conv = nullptr;
+  switch (storage->mode) {
+    case CMP_NODE_COMBSEP_COLOR_RGB: {
+      /* Pass */
+      break;
+    }
+    case CMP_NODE_COMBSEP_COLOR_HSV: {
+      color_conv = new ConvertRGBToHSVOperation();
+      break;
+    }
+    case CMP_NODE_COMBSEP_COLOR_HSL: {
+      color_conv = new ConvertRGBToHSLOperation();
+      break;
+    }
+    case CMP_NODE_COMBSEP_COLOR_YCC: {
+      ConvertRGBToYCCOperation *operation = new ConvertRGBToYCCOperation();
+      operation->set_mode(storage->ycc_mode);
+      color_conv = operation;
+      break;
+    }
+    case CMP_NODE_COMBSEP_COLOR_YUV: {
+      color_conv = new ConvertRGBToYUVOperation();
+      break;
+    }
+    default: {
+      BLI_assert_unreachable();
+      break;
+    }
+  }
+
   if (color_conv) {
     converter.add_operation(color_conv);
 
@@ -84,27 +116,4 @@ void SeparateColorNode::convert_to_operations(NodeConverter &converter,
   }
 }
 
-NodeOperation *SeparateRGBANode::get_color_converter(const CompositorContext & /*context*/) const
-{
-  return nullptr; /* no conversion needed */
-}
-
-NodeOperation *SeparateHSVANode::get_color_converter(const CompositorContext & /*context*/) const
-{
-  return new ConvertRGBToHSVOperation();
-}
-
-NodeOperation *SeparateYCCANode::get_color_converter(const CompositorContext & /*context*/) const
-{
-  ConvertRGBToYCCOperation *operation = new ConvertRGBToYCCOperation();
-  bNode *editor_node = this->get_bnode();
-  operation->set_mode(editor_node->custom1);
-  return operation;
-}
-
-NodeOperation *SeparateYUVANode::get_color_converter(const CompositorContext & /*context*/) const
-{
-  return new ConvertRGBToYUVOperation();
-}
-
 }  // namespace blender::compositor
diff --git a/source/blender/compositor/nodes/COM_SeparateColorNode.h b/source/blender/compositor/nodes/COM_SeparateColorNode.h
index 78ab0959f43..6adb2d0bb22 100644
--- a/source/blender/compositor/nodes/COM_SeparateColorNode.h
+++ b/source/blender/compositor/nodes/COM_SeparateColorNode.h
@@ -12,45 +12,6 @@ class SeparateColorNode : public Node {
   SeparateColorNode(bNode *editor_node);
   void convert_to_operations(NodeConverter &converter,
                              const CompositorContext &context) const override;
-
- protected:
-  virtual NodeOperation *get_color_converter(const CompositorContext &context) const = 0;
-};
-
-class SeparateRGBANode : public SeparateColorNode {
- public:
-  SeparateRGBANode(bNode *editor_node) : SeparateColorNode(editor_node)
-  {
-  }
-
-  NodeOperation *get_color_converter(const CompositorContext &context) const override;
-};
-
-class SeparateHSVANode : public SeparateColorNode {
- public:
-  SeparateHSVANode(bNode *editor_node) : SeparateColorNode(editor_node)
-  {
-  }
-
-  NodeOperation *get_color_converter(const CompositorContext &context) const override;
-};
-
-class SeparateYCCANode : public SeparateColorNode {
- public:
-  SeparateYCCANode(bNode *editor_node) : SeparateColorNode(editor_node)
-  {
-  }
-
-  NodeOperation *get_color_converter(const CompositorContext &context) const override;
-};
-
-class SeparateYUVANode : public SeparateColorNode {
- public:
-  SeparateYUVANode(bNode *editor_node) : SeparateColorNode(editor_node)
-  {
-  }
-
-  NodeOperation *get_color_converter(const CompositorContext &context) const override;
 };
 
 }  // namespace blender::compositor
diff --git a/source/blender/compositor/nodes/COM_SeparateColorNodeLegacy.cc b/source/blender/compositor/nodes/COM_SeparateColorNodeLegacy.cc
new file mode 100644
index 00000000000..c3728bc152f
--- /dev/null
+++ b/source/blender/compositor/nodes/COM_SeparateColorNodeLegacy.cc
@@ -0,0 +1,110 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later
+ * Copyright 2011 Blender Foundation. */
+
+#include "COM_SeparateColorNodeLegacy.h"
+
+#include "COM_ConvertOperation.h"
+
+namespace blender::compositor {
+
+SeparateColorNodeLegacy::SeparateColorNodeLegacy(bNode *editor_node) : Node(editor_node)
+{
+}
+
+void SeparateColorNodeLegacy::convert_to_operations(NodeConverter &converter,
+                                                    const CompositorContext &context) const
+{
+  NodeInput *image_socket = this->get_input_socket(0);
+  NodeOutput *output_rsocket = this->get_output_socket(0);
+  NodeOutput *output_gsocket = this->get_output_socket(1);
+  NodeOutput *output_bsocket = this->get_output_socket(2);
+  NodeOutput *output_asocket = this->get_output_socket(3);
+
+  NodeOperation *color_conv = get_color_converter(context);
+  if (color_conv) {
+    converter.add_operation(color_conv);
+
+    converter.map_input_socket(image_socket, color_conv->get_input_socket(0));
+  }
+
+  {
+    SeparateChannelOperation *operation = new SeparateChannelOperation();
+    operation->set_channel(0);
+    converter.add_operation(operation);
+
+    if (color_conv) {
+      converter.add_link(color_conv->get_output_socket(), operation->get_input_socket(0));
+    }
+    else {
+      converter.map_input_socket(image_socket, operation->get_input_socket(0));
+    }
+    converter.map_output_socket(output_rsocket, operation->get_output_socket(0));
+  }
+
+  {
+    SeparateChannelOperation *operation = new SeparateChannelOperation();
+    operation->set_channel(1);
+    converter.add_operation(operation);
+
+    if (color_conv) {
+      converter.add_link(color_conv->get_output_socket(), operation->get_input_socket(0));
+    }
+    else {
+      converter.map_input_socket(image_socket, operation->get_input_socket(0));
+    }
+    converter.map_output_socket(output_gsocket, operation->get_output_socket(0));
+  }
+
+  {
+    SeparateChannelOperation *operation = new SeparateChannelOperation();
+    operation->set_channel(2);
+    converter.add_operation(operation);
+
+    if (color_conv) {
+      converter.add_link(color_conv->get_output_socket(), operation->get_input_socket(0));
+    }
+    else {
+      converter.map_input_socket(image_socket, operation->get_input_socket(0));
+    }
+    converter.map_output_socket(output_bsocket, operation->get_output_socket(0));
+  }
+
+  {
+    SeparateChannelOperation *operation = new SeparateChannelOperation();
+    operation->set_channel(3);
+    converter.add_operation(operation);
+
+    if (color_conv) {
+      converter.add_link(color_conv->get_output_socket(), operation->get_input_socket(0));
+    }
+    else {
+      converter.map_input_socket(image_socket, operation->get_input_socket(0));
+    }
+    converter.map_output_socket(output_asocket, operation->get_output_socket(0));
+  }
+}
+
+NodeOperation *SeparateRGBANode::get_color_converter(const CompositorContext & /*context*/) const
+{
+  return nullptr; /* no conversion needed */
+}
+
+NodeOperation *SeparateHSVANode::get_color_converter(const CompositorContext & /*context*/) const
+{
+  return new ConvertRGBToHSVOperation();
+}
+
+NodeOperation *SeparateYCCANode::get_color_converter(const CompositorContext & /*context*/) const
+{
+  ConvertRGBToYCCOperation *operation = new ConvertRGBToYCCOperation();
+  bNode *editor_node = this->get_bnode();
+  operation->set_mode(editor_node->custom1);
+  return operation;
+}
+
+NodeOperation *SeparateYUVANode::get_color_converter(const CompositorContext & /*context*/) const
+{
+  return new ConvertRGBToYUVOperation();
+}
+
+}  // namespace blender::compositor
diff --git a/source/blender/compositor/nodes/COM_SeparateColorNodeLegacy.h b/source/blender/compositor/nodes/COM_SeparateColorNodeLegacy.h
new file mode 100644
index 00000000000..10b33039c86
--- /dev/null
+++ b/source/blender/compositor/nodes/COM_SeparateColorNodeLegacy.h
@@ -0,0 +1,56 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later
+ * Copyright 2011 Blender Foundation. */
+
+#pragma once
+
+#include "COM_Node.h"
+
+namespace blender::compositor {
+
+class SeparateColorNodeLegacy : public Node {
+ public:
+  SeparateColorNodeLegacy(bNode *editor_node);
+  void convert_to_operations(NodeConverter &converter,
+                             const CompositorContext &context) const override;
+
+ protected:
+  virtual NodeOperation *get_color_converter(const CompositorContext &context) const = 0;
+};
+
+class SeparateRGBANode : public SeparateColorNodeLegacy {
+ public:
+  SeparateRGBANode(bNode *editor_node) : SeparateColorNodeLegacy(editor_node)
+  {
+  }
+
+  NodeOperation *get_color_converter(const CompositorContext &context) const override;
+};
+
+class SeparateHSVANode : public SeparateColorNodeLegacy {
+ public:
+  SeparateHSVANode(bNode *editor_node) : SeparateColorNodeLegacy(editor_node)
+  {
+  }
+
+  NodeOperation *get_color_converter(const CompositorContext &context) const override;
+};
+
+class SeparateYCCANode : public SeparateColorNodeLegacy {
+ public:
+  SeparateYCCANode(bNode *editor_node) : SeparateColorNodeLegacy(editor_node)
+  {
+  }
+
+  NodeOperation *get_color_converter(const CompositorContext &context) const override;
+};
+
+class SeparateYUVANode : public SeparateColorNodeLegacy {
+ public:
+  SeparateYUVANode(bNode *editor_node) : SeparateColorNodeLegacy(editor_node)
+  {
+  }
+
+  NodeOperation *get_color_converter(const CompositorContext &context) const override;
+};
+
+}  // namespace blender::compositor
diff --git a/source/blender/compositor/operations/COM_ConvertOperation.cc b/source/blender/compositor/operations/COM_ConvertOperation.cc
index 7579abf792a..24c0c577ac7 100644
--- a/source/blender/compositor/operations/COM_ConvertOperation.cc
+++ b/source/blender/compositor/operations/COM_ConvertOperation.cc
@@ -464,6 +464,68 @@ void ConvertHSVToRGBOperation::update_memory_buffer_partial(BuffersIterator<floa
   }
 }
 
+/* ******** RGB to HSL ******** */
+
+ConvertRGBToHSLOperation::ConvertRGBToHSLOperation() : ConvertBaseOperation()
+{
+  this->add_input_socket(DataType::Color);
+  this->add_output_socket(DataType::Color);
+}
+
+void ConvertRGBToHSLOperation::execute_pixel_sampled(float output[4],
+                                                     float x,
+                                                     float y,
+                                                     PixelSampler sampler)
+{
+  float input_color[4];
+  input_operation_->read_sampled(input_color, x, y, sampler);
+  rgb_to_hsl_v(input_color, output);
+  output[3] = input_color[3];
+}
+
+void ConvertRGBToHSLOperation::update_memory_buffer_partial(BuffersIterator<float> &it)
+{
+  for (; !it.is_end(); ++it) {
+    const float *in = it.in(0);
+    rgb_to_hsl_v(in, it.out);
+    it.out[3] = in[3];
+  }
+}
+
+/* ******** HSL to RGB ******** */
+
+ConvertHSLToRGBOperation::ConvertHSLToRGBOperation() : ConvertBaseOperation()
+{
+  this->add_input_socket(DataType::Color);
+  this->add_output_socket(DataType::Color);
+}
+
+void ConvertHSLToRGBOperation::execute_pixel_sampled(float output[4],
+                                                     float x,
+                                                     float y,
+                                                     PixelSampler sampler)
+{
+  float input_color[4];
+  input_operation_->read_sampled(input_color, x, y, sampler);
+  hsl_to_rgb_v(input_color, output);
+  output[0] = max_ff(output[0], 0.0f);
+  output[1] = max_ff(output[1], 0.0f);
+  output[2] = max_ff(output[2], 0.0f);
+  output[3] = input_color[3];
+}
+
+void ConvertHSLToRGBOperation::update_memory_buffer_partial(BuffersIterator<float> &it)
+{
+  for (; !it.is_end(); ++it) {
+    const float *in = it.in(0);
+    hsl_to_rgb_v(in, it.out);
+    it.out[0] = max_ff(it.out[0], 0.0f);
+    it.out[1] = max_ff(it.out[1], 0.0f);
+    it.out[2] = max_ff(it.out[2], 0.0f);
+    it.out[3] = in[3];
+  }
+}
+
 /* ******** Premul to Straight ******** */
 
 ConvertPremulToStraightOperation::ConvertPremulToStraightOperation() : ConvertBaseOperation()
diff --git a/source/blender/compositor/operations/COM_ConvertOperation.h b/source/blender/compositor/operations/COM_ConvertOperation.h
index e1904d61d46..16d1e2e6bb5 100644
--- a/source/blender/compositor/operations/COM_ConvertOperation.h
+++ b/source/blender/compositor/operations/COM_ConvertOperation.h
@@ -172,6 +172,26 @@ class ConvertHSVToRGBOperation : public ConvertBaseOperation {
   void update_memory_buffer_partial(BuffersIterator<float> &it) override;
 };
 
+class ConvertRGBToHSLOperation : public ConvertBaseOperation {
+ public:
+  ConvertRGBToHSLOperation();
+
+  void execute_pixel_sampled(float output[4], float x, float y, PixelSampler sampler) override;
+
+ protected:
+  void update_memory_buffer_partial(BuffersIterator<float> &it) override;
+};
+
+class ConvertHSLToRGBOperation : public ConvertBaseOperation {
+ public:
+  ConvertHSLToRGBOperation();
+
+  void execute_pixel_sampled(float output[4], float x, float y, PixelSampler sampler) override;
+
+ protected:
+  void update_memory_buffer_partial(BuffersIterator<float> &it) override;
+};
+
 class ConvertPremulToStraightOperation : public ConvertBaseOperation {
  public:
   ConvertPremulToStraightOperation();