From 3462bd8c7ef52c24a7b6a24fb1709904a203401d Mon Sep 17 00:00:00 2001 From: Tian Liao Date: Wed, 3 Apr 2024 21:04:01 +0800 Subject: [PATCH] remove unused fields --- src/GraphControl/DirectX/RenderMain.cpp | 14 +++++++------- src/GraphControl/DirectX/RenderMain.h | 4 ---- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/src/GraphControl/DirectX/RenderMain.cpp b/src/GraphControl/DirectX/RenderMain.cpp index 3b9c61f0..fbaf9aad 100644 --- a/src/GraphControl/DirectX/RenderMain.cpp +++ b/src/GraphControl/DirectX/RenderMain.cpp @@ -30,11 +30,10 @@ namespace namespace GraphControl::DX { RenderMain::RenderMain(SwapChainPanel ^ panel) - : m_deviceResources{ panel } - , m_nearestPointRenderer{ &m_deviceResources } - , m_backgroundColor{ {} } - , m_swapChainPanel{ panel } - , m_TraceLocation(Point(0, 0)) + : m_deviceResources(panel) + , m_nearestPointRenderer(&m_deviceResources) + , m_swapChainPanel(panel) + , m_TraceLocation(Point{ 0, 0 }) , m_Tracing(false) { // Register to be notified if the Device is lost or recreated @@ -47,6 +46,7 @@ namespace GraphControl::DX RenderMain::~RenderMain() { + m_renderPassCts.cancel(); UnregisterEventHandlers(); } @@ -212,8 +212,8 @@ namespace GraphControl::DX } m_renderPassCts = concurrency::cancellation_token_source{}; - bool result = true; - co_await CoreWindow::GetForCurrentThread()->Dispatcher->RunAsync( + bool result = false; + co_await m_coreWindow->Dispatcher->RunAsync( CoreDispatcherPriority::High, ref new DispatchedHandler( [this, &result, cancel = m_renderPassCts.get_token()] diff --git a/src/GraphControl/DirectX/RenderMain.h b/src/GraphControl/DirectX/RenderMain.h index 9ce1014f..4c5a724f 100644 --- a/src/GraphControl/DirectX/RenderMain.h +++ b/src/GraphControl/DirectX/RenderMain.h @@ -175,10 +175,6 @@ namespace GraphControl::DX Windows::Foundation::EventRegistrationToken m_tokenOrientationChanged; Windows::Foundation::EventRegistrationToken m_tokenDisplayContentsInvalidated; - // Track our independent input on a background worker thread. - Windows::Foundation::IAsyncAction ^ m_inputLoopWorker = nullptr; - Windows::UI::Core::CoreIndependentInputSource ^ m_coreInput = nullptr; - double m_XTraceValue; double m_YTraceValue;