libhwc2.1: update displaycolor header file

Bug: 224869931
Change-Id: I637080d2cedfaa08b068b7beebadf2a918c79514

1 files changed, 16 insertions, 10 deletions

diff --git a/include/displaycolor/displaycolor.h b/include/displaycolor/displaycolor.h
index 0856add..f23d8a8 100644
--- a/include/displaycolor/displaycolor.h
+++ b/include/displaycolor/displaycolor.h
@@ -34,6 +34,7 @@ using android::hardware::graphics::common::V1_2::PixelFormat;
 /**
  * hwc/displaycolor interface history
  *
+ * 7.0.0.2022-03-22 Interface refactor
  * 6.2.0.2022-05-18 Get calibrated serial number.
  * 6.1.0.2022-04-29 dim solid color layer
  * 6.0.0.2022-02-22 Get whether dimming in linear.
@@ -61,8 +62,8 @@ constexpr struct DisplayColorIntfVer {
     }
 
 } kInterfaceVersion {
-    6,
-    2,
+    7,
+    0,
     0,
 };
 
@@ -345,6 +346,13 @@ class IDisplayColorGeneric {
         const ConfigType *config = nullptr;
     };
 
+    /// A collection of stages. For example, It could be pre-blending stages
+    //(per-channel) or post-blending stages.
+    template <typename ... IStageData>
+    struct IStageDataCollection : public IStageData ... {
+        virtual ~IStageDataCollection() {}
+    };
+
     /// Interface for accessing data for panel
     class IPanel {
       public:
@@ -364,7 +372,7 @@ class IDisplayColorGeneric {
      * @param scene Display scene data to use during the update.
      * @return OK if successful, error otherwise.
      */
-    virtual int Update(DisplayType display, const DisplayScene &scene) = 0;
+    virtual int Update(const DisplayType display, const DisplayScene &scene) = 0;
 
     /**
      * @brief Update display color data. This function is expected to be called
@@ -375,29 +383,27 @@ class IDisplayColorGeneric {
      * @param scene Display scene data to use during the update.
      * @return OK if successful, error otherwise.
      */
-    virtual int UpdatePresent(DisplayType display, const DisplayScene &scene) = 0;
+    virtual int UpdatePresent(const DisplayType display, const DisplayScene &scene) = 0;
 
     /**
      * @brief Check if refresh rate regamma compensation is enabled.
      *
      * @return true for yes.
      */
-    virtual bool IsRrCompensationEnabled(DisplayType display) = 0;
+    virtual bool IsRrCompensationEnabled(const DisplayType display) = 0;
 
     /**
      * @brief Get calibration information for each profiles.
      * @param display The display to get the calibration information.
      */
-    virtual const CalibrationInfo &GetCalibrationInfo(
-        DisplayType display) const = 0;
+    virtual const CalibrationInfo &GetCalibrationInfo(const DisplayType display) const = 0;
 
     /**
      * @brief Get a map of supported ColorModes, and supported RenderIntents for
      * each ColorMode.
      * @param display The display to get the color modes and render intents.
      */
-    virtual const ColorModesMap &ColorModesAndRenderIntents(
-        DisplayType display) const = 0;
+    virtual const ColorModesMap &ColorModesAndRenderIntents(const DisplayType display) const = 0;
 
     /**
      * @brief Get pixel format and dataspace of blending stage.
@@ -406,7 +412,7 @@ class IDisplayColorGeneric {
      * @param dataspace Dataspace of blending stage
      * @return OK if successful, error otherwise.
      */
-    virtual int GetBlendingProperty(DisplayType display,
+    virtual int GetBlendingProperty(const DisplayType display,
                                     hwc::PixelFormat &pixel_format,
                                     hwc::Dataspace &dataspace,
                                     bool &dimming_linear) const = 0;