drm_hwcomposer: HWC3: Remove HWC2 ComposerResources dependencies
Now that we have our own buffer importer and slots tracker,
ComposerResourcer is no longer needed.
Change-Id: I9b1e15800695b4c5f1a3f2c942ba669526e8a94c
Signed-off-by: Roman Stratiienko <r.stratiienko@gmail.com>
diff --git a/hwc3/DrmHwcThree.h b/hwc3/DrmHwcThree.h
index 3a9a6db..44168aa 100644
--- a/hwc3/DrmHwcThree.h
+++ b/hwc3/DrmHwcThree.h
@@ -19,15 +19,18 @@
#include <aidl/android/hardware/graphics/composer3/IComposerCallback.h>
#include "drm/DrmHwc.h"
-#include "hwc3/ComposerResources.h"
+#include "hwc2_device/HwcDisplay.h"
namespace aidl::android::hardware::graphics::composer3::impl {
+class Hwc3Display : public ::android::FrontendDisplayBase {
+ public:
+ bool must_validate = false;
+};
+
class DrmHwcThree : public ::android::DrmHwc {
public:
- explicit DrmHwcThree(ComposerResources* composer_resources)
- : composer_resources_(composer_resources) {
- }
+ explicit DrmHwcThree() = default;
~DrmHwcThree() override;
void Init(std::shared_ptr<IComposerCallback> callback);
@@ -41,10 +44,10 @@
void SendHotplugEventToClient(hwc2_display_t display_id,
DrmHwc::DisplayStatus display_status) override;
- private:
- void HandleDisplayHotplugEvent(uint64_t display_id, bool connected);
+ static auto GetHwc3Display(::android::HwcDisplay& display)
+ -> std::shared_ptr<Hwc3Display>;
+ private:
std::shared_ptr<IComposerCallback> composer_callback_;
- ComposerResources* composer_resources_;
};
} // namespace aidl::android::hardware::graphics::composer3::impl