1 files changed, 51 insertions, 53 deletions
diff --git a/hwc3/ComposerCommandEngine.h b/hwc3/ComposerCommandEngine.h
index ad46889..e55be65 100644
--- a/hwc3/ComposerCommandEngine.h
+++ b/hwc3/ComposerCommandEngine.h
@@ -30,69 +30,67 @@ class ComposerCommandEngine {
             : mHal(hal), mResources(resources) {}
       bool init();
 
-      int32_t execute(const std::vector<command::CommandPayload>& commands,
-                      std::vector<command::CommandResultPayload> *result);
+      int32_t execute(const std::vector<DisplayCommand>& commands,
+                      std::vector<CommandResultPayload>* result);
 
       void reset() {
           mWriter->reset();
       }
 
   private:
-    void dispatchDisplayCommand(const command::DisplayCommand& displayCommand);
-    void dispatchLayerCommand(const command::LayerCommand& displayCommand);
+      void dispatchDisplayCommand(const DisplayCommand& displayCommand);
+      void dispatchLayerCommand(int64_t display, const LayerCommand& displayCommand);
 
-    void executeSetColorTransform(int64_t display, const command::ColorTransformPayload& command);
-    void executeSetClientTarget(int64_t display, const command::ClientTarget& command);
-    void executeSetOutputBuffer(uint64_t display, const command::Buffer& buffer);
-    void executeValidateDisplay(int64_t display);
-    void executePresentOrValidateDisplay(int64_t display);
-    void executeAcceptDisplayChanges(int64_t display);
-    int executePresentDisplay(int64_t display);
+      void executeSetColorTransform(int64_t display, const ColorTransformPayload& command);
+      void executeSetClientTarget(int64_t display, const ClientTarget& command);
+      void executeSetOutputBuffer(uint64_t display, const Buffer& buffer);
+      void executeValidateDisplay(int64_t display);
+      void executePresentOrValidateDisplay(int64_t display);
+      void executeAcceptDisplayChanges(int64_t display);
+      int executePresentDisplay(int64_t display);
 
-    void executeSetLayerCursorPosition(int64_t display, int64_t layer,
-                                       const common::Point& cursorPosition);
-    void executeSetLayerBuffer(int64_t display, int64_t layer,
-                               const command::Buffer& buffer);
-    void executeSetLayerSurfaceDamage(int64_t display, int64_t layer,
-                const std::vector<std::optional<common::Rect>>& damage);
-    void executeSetLayerBlendMode(int64_t display, int64_t layer,
-                                  const command::ParcelableBlendMode& blendMode);
-    void executeSetLayerColor(int64_t display, int64_t layer, const Color& color);
-    void executeSetLayerComposition(int64_t display, int64_t layer,
-                                        const command::ParcelableComposition& composition);
-    void executeSetLayerDataspace(int64_t display, int64_t layer,
-                                  const command::ParcelableDataspace& dataspace);
-    void executeSetLayerDisplayFrame(int64_t display, int64_t layer,
-                                     const common::Rect& rect);
-    void executeSetLayerPlaneAlpha(int64_t display, int64_t layer,
-                                   const command::PlaneAlpha& planeAlpha);
-    void executeSetLayerSidebandStream(int64_t display, int64_t layer,
-                                       const AidlNativeHandle& sidebandStream);
-    void executeSetLayerSourceCrop(int64_t display, int64_t layer,
-                                   const common::FRect& sourceCrop);
-    void executeSetLayerTransform(int64_t display, int64_t layer,
-                                  const command::ParcelableTransform& transform);
-    void executeSetLayerVisibleRegion(int64_t display, int64_t layer,
-                const std::vector<std::optional<common::Rect>>& visibleRegion);
-    void executeSetLayerZOrder(int64_t display, int64_t layer,
-                               const command::ZOrder& zOrder);
-    void executeSetLayerPerFrameMetadata(int64_t display, int64_t layer,
-                const std::vector<std::optional<PerFrameMetadata>>& perFrameMetadata);
-    void executeSetLayerFloatColor(int64_t display, int64_t layer,
-                                   const FloatColor& floatColor);
-    void executeSetLayerColorTransform(int64_t display, int64_t layer,
-                                       const std::vector<float>& colorTransform);
-    void executeSetLayerPerFrameMetadataBlobs(int64_t display, int64_t layer,
-                const std::vector<std::optional<PerFrameMetadataBlob>>& perFrameMetadataBlob);
-    void executeSetLayerGenericMetadata(int64_t display, int64_t layer,
-                                        const command::GenericMetadata& genericMetadata);
+      void executeSetLayerCursorPosition(int64_t display, int64_t layer,
+                                         const common::Point& cursorPosition);
+      void executeSetLayerBuffer(int64_t display, int64_t layer, const Buffer& buffer);
+      void executeSetLayerSurfaceDamage(int64_t display, int64_t layer,
+                                        const std::vector<std::optional<common::Rect>>& damage);
+      void executeSetLayerBlendMode(int64_t display, int64_t layer,
+                                    const ParcelableBlendMode& blendMode);
+      void executeSetLayerColor(int64_t display, int64_t layer, const Color& color);
+      void executeSetLayerComposition(int64_t display, int64_t layer,
+                                      const ParcelableComposition& composition);
+      void executeSetLayerDataspace(int64_t display, int64_t layer,
+                                    const ParcelableDataspace& dataspace);
+      void executeSetLayerDisplayFrame(int64_t display, int64_t layer, const common::Rect& rect);
+      void executeSetLayerPlaneAlpha(int64_t display, int64_t layer, const PlaneAlpha& planeAlpha);
+      void executeSetLayerSidebandStream(int64_t display, int64_t layer,
+                                         const AidlNativeHandle& sidebandStream);
+      void executeSetLayerSourceCrop(int64_t display, int64_t layer,
+                                     const common::FRect& sourceCrop);
+      void executeSetLayerTransform(int64_t display, int64_t layer,
+                                    const ParcelableTransform& transform);
+      void executeSetLayerVisibleRegion(
+              int64_t display, int64_t layer,
+              const std::vector<std::optional<common::Rect>>& visibleRegion);
+      void executeSetLayerZOrder(int64_t display, int64_t layer, const ZOrder& zOrder);
+      void executeSetLayerPerFrameMetadata(
+              int64_t display, int64_t layer,
+              const std::vector<std::optional<PerFrameMetadata>>& perFrameMetadata);
+      void executeSetLayerFloatColor(int64_t display, int64_t layer, const FloatColor& floatColor);
+      void executeSetLayerColorTransform(int64_t display, int64_t layer,
+                                         const std::vector<float>& colorTransform);
+      void executeSetLayerPerFrameMetadataBlobs(
+              int64_t display, int64_t layer,
+              const std::vector<std::optional<PerFrameMetadataBlob>>& perFrameMetadataBlob);
+      void executeSetLayerGenericMetadata(int64_t display, int64_t layer,
+                                          const GenericMetadata& genericMetadata);
 
-    int32_t executeValidateDisplayInternal(int64_t display);
+      int32_t executeValidateDisplayInternal(int64_t display);
 
-    IComposerHal* mHal;
-    IResourceManager* mResources;
-    std::unique_ptr<CommandWriterBase> mWriter;
-    int32_t mCommandIndex;
+      IComposerHal* mHal;
+      IResourceManager* mResources;
+      std::unique_ptr<CommandWriterBase> mWriter;
+      int32_t mCommandIndex;
 };
 
 } // namespace aidl::android::hardware::graphics::composer3::impl