From adc598383bba9e6dda8245ee45f7398a6e64532d Mon Sep 17 00:00:00 2001 From: SooChan Lim Date: Fri, 28 Aug 2020 16:59:13 +0900 Subject: [PATCH] DSDisplayDeviceHWC: make hwc window without DSWindow parameter Change-Id: I090b3ef69362d875c4bb84c1476da8e04fb2b381 --- src/DSDisplayArea/DSDisplayArea.cpp | 2 +- src/DSDisplayDevice/DSDisplayDeviceHWCTDMImpl.cpp | 4 ++-- src/DSDisplayDevice/DSDisplayDeviceHWCTDMImpl.h | 2 +- src/DSDisplayDevice/DSDisplayDeviceHWCWindowTDMImpl.cpp | 6 +++--- src/DSDisplayDevice/DSDisplayDeviceHWCWindowTDMImpl.h | 2 +- src/DSDisplayDevice/IDSDisplayDeviceHWC.h | 2 +- tests/DSDisplayDeviceTDMImpl-test.cpp | 4 ++-- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/DSDisplayArea/DSDisplayArea.cpp b/src/DSDisplayArea/DSDisplayArea.cpp index 0fee756..0630043 100644 --- a/src/DSDisplayArea/DSDisplayArea.cpp +++ b/src/DSDisplayArea/DSDisplayArea.cpp @@ -139,7 +139,7 @@ void DSDisplayAreaPrivate::__onWindowCreated(std::shared_ptr window) { // TODO: think about using unordered_map __renderViewList.push_back(__renderEngine->makeRenderView(window)); - __displayDeviceHWCWindowList.push_back(__displayDeviceHWC->makeHWCWindow(window)); + __displayDeviceHWCWindowList.push_back(__displayDeviceHWC->makeHWCWindow()); } void DSDisplayAreaPrivate::__onWindowDestroy(std::shared_ptr window) diff --git a/src/DSDisplayDevice/DSDisplayDeviceHWCTDMImpl.cpp b/src/DSDisplayDevice/DSDisplayDeviceHWCTDMImpl.cpp index 9a3b3a0..b6be04f 100644 --- a/src/DSDisplayDevice/DSDisplayDeviceHWCTDMImpl.cpp +++ b/src/DSDisplayDevice/DSDisplayDeviceHWCTDMImpl.cpp @@ -77,7 +77,7 @@ bool DSDisplayDeviceHWCTDMImpl::setTargetBuffer(std::shared_ptr buffe return true; } -std::shared_ptr DSDisplayDeviceHWCTDMImpl::makeHWCWindow(std::shared_ptr window) +std::shared_ptr DSDisplayDeviceHWCTDMImpl::makeHWCWindow() { std::shared_ptr deviceHWCWindow; tdm_error terror; @@ -89,7 +89,7 @@ std::shared_ptr DSDisplayDeviceHWCTDMImpl::makeHWCWin return nullptr; } - deviceHWCWindow = std::make_shared(window, twindow); + deviceHWCWindow = std::make_shared(twindow); if (!deviceHWCWindow) { DSLOG_ERR("HWCTDM", "new DSDisplayDeviceHWCWindowTDMImpl fails."); return nullptr; diff --git a/src/DSDisplayDevice/DSDisplayDeviceHWCTDMImpl.h b/src/DSDisplayDevice/DSDisplayDeviceHWCTDMImpl.h index abdfc70..d33efaa 100644 --- a/src/DSDisplayDevice/DSDisplayDeviceHWCTDMImpl.h +++ b/src/DSDisplayDevice/DSDisplayDeviceHWCTDMImpl.h @@ -39,7 +39,7 @@ public: std::shared_ptr getTargetBufferQueue() override; bool setTargetBuffer(std::shared_ptr buffer) override; - std::shared_ptr makeHWCWindow(std::shared_ptr window) override; + std::shared_ptr makeHWCWindow() override; bool addVisibleHWCWindow(std::shared_ptr deviceHWCWindow) override; bool removeVisibleHWCWindow(std::shared_ptr deviceHWCWindow) override; void clearVisibleHWCWindows() override; diff --git a/src/DSDisplayDevice/DSDisplayDeviceHWCWindowTDMImpl.cpp b/src/DSDisplayDevice/DSDisplayDeviceHWCWindowTDMImpl.cpp index 051cbd1..2b19be8 100644 --- a/src/DSDisplayDevice/DSDisplayDeviceHWCWindowTDMImpl.cpp +++ b/src/DSDisplayDevice/DSDisplayDeviceHWCWindowTDMImpl.cpp @@ -26,10 +26,10 @@ namespace display_server { -DSDisplayDeviceHWCWindowTDMImpl::DSDisplayDeviceHWCWindowTDMImpl(std::shared_ptr window, tdm_hwc_window *twindow) - : __window(window), - __twindow(twindow) +DSDisplayDeviceHWCWindowTDMImpl::DSDisplayDeviceHWCWindowTDMImpl(tdm_hwc_window *twindow) + : __twindow(twindow) {} + DSDisplayDeviceHWCWindowTDMImpl::~DSDisplayDeviceHWCWindowTDMImpl() { tdm_hwc_window_destroy(__twindow); diff --git a/src/DSDisplayDevice/DSDisplayDeviceHWCWindowTDMImpl.h b/src/DSDisplayDevice/DSDisplayDeviceHWCWindowTDMImpl.h index 1a6fc6a..5550190 100644 --- a/src/DSDisplayDevice/DSDisplayDeviceHWCWindowTDMImpl.h +++ b/src/DSDisplayDevice/DSDisplayDeviceHWCWindowTDMImpl.h @@ -34,7 +34,7 @@ namespace display_server class DSDisplayDeviceHWCWindowTDMImpl : public IDSDisplayDeviceHWCWindow { public: - DSDisplayDeviceHWCWindowTDMImpl(std::shared_ptr window, tdm_hwc_window *twindow); + DSDisplayDeviceHWCWindowTDMImpl(tdm_hwc_window *twindow); ~DSDisplayDeviceHWCWindowTDMImpl(); tdm_hwc_window *getNativeHWCWindow(); diff --git a/src/DSDisplayDevice/IDSDisplayDeviceHWC.h b/src/DSDisplayDevice/IDSDisplayDeviceHWC.h index ca02b5f..050316b 100644 --- a/src/DSDisplayDevice/IDSDisplayDeviceHWC.h +++ b/src/DSDisplayDevice/IDSDisplayDeviceHWC.h @@ -39,7 +39,7 @@ public: virtual std::shared_ptr getTargetBufferQueue() = 0; virtual bool setTargetBuffer(std::shared_ptr buffer) = 0; - virtual std::shared_ptr makeHWCWindow(std::shared_ptr window) = 0; + virtual std::shared_ptr makeHWCWindow() = 0; virtual bool addVisibleHWCWindow(std::shared_ptr deviceHWCWindow) = 0; virtual bool removeVisibleHWCWindow(std::shared_ptr deviceHWCWindow) = 0; virtual void clearVisibleHWCWindows() = 0; diff --git a/tests/DSDisplayDeviceTDMImpl-test.cpp b/tests/DSDisplayDeviceTDMImpl-test.cpp index 7f9f47c..b23e6bd 100644 --- a/tests/DSDisplayDeviceTDMImpl-test.cpp +++ b/tests/DSDisplayDeviceTDMImpl-test.cpp @@ -255,7 +255,7 @@ TEST_F(DSDisplayDeviceTDMImplTest, DeviceOutput_makeHWCWindow) deviceHWC = output->getHWC(); EXPECT_TRUE(deviceHWC != nullptr); - deviceHWCWindow = deviceHWC->makeHWCWindow(std::make_shared()); + deviceHWCWindow = deviceHWC->makeHWCWindow(); EXPECT_TRUE(deviceHWC != nullptr); } } @@ -289,7 +289,7 @@ TEST_F(DSDisplayDeviceTDMImplTest, DeviceHWC_commit) auto bufferQueue = deviceHWC->getTargetBufferQueue(); EXPECT_TRUE(deviceHWC != nullptr); - deviceHWCWindow = deviceHWC->makeHWCWindow(std::make_shared()); + deviceHWCWindow = deviceHWC->makeHWCWindow(); EXPECT_TRUE(deviceHWC != nullptr); EXPECT_TRUE(deviceHWC->addVisibleHWCWindow(deviceHWCWindow)); -- 2.7.4