fix: 多个错误修复

Author: Blinue

src/Magpie.Core/CursorDrawer2.cpp

@@ -0,0 +1,12 @@
+#include "pch.h"
+#include "CursorDrawer2.h"
+
+namespace Magpie {
+
+bool CursorDrawer2::Initialize(GraphicsContext& graphicsContext) noexcept {
+	_graphicsContext = &graphicsContext;
+
+	return true;
+}
+
+}

src/Magpie.Core/CursorDrawer2.h

@@ -0,0 +1,19 @@
+#pragma once
+
+namespace Magpie {
+
+class GraphicsContext;
+
+class CursorDrawer2 {
+public:
+	CursorDrawer2() noexcept = default;
+	CursorDrawer2(const CursorDrawer2&) = delete;
+	CursorDrawer2(CursorDrawer2&&) = delete;
+
+	bool Initialize(GraphicsContext& graphicsContext) noexcept;
+
+private:
+	GraphicsContext* _graphicsContext = nullptr;
+};
+
+}

src/Magpie.Core/FrameProducer.cpp

@@ -78,7 +78,7 @@ void FrameProducer::OnResizedAsync(
 	Size& outputSize,
 	SimpleTask<HRESULT>& task
 ) noexcept {
-	_dispatcher.TryEnqueue([&] {
+	_dispatcher.TryEnqueue([&, rendererSize] {
 		HRESULT hr = S_OK;
 		auto se = wil::scope_exit([&] {
 			// 同步 outputSize
@@ -211,18 +211,18 @@ void FrameProducer::_ProducerThreadProc(
 	RECT srcRect,
 	Size rendererSize,
 	Size& outputSize,
-	SimpleTask<bool>& task
+	SimpleTask<bool>& initializeTask
 ) noexcept {
 #ifdef _DEBUG
 	SetThreadDescription(GetCurrentThread(), L"Magpie-缩放生产者线程");
 #endif
 
 	if (_Initialize(colorInfo, hMonSrc, srcRect, rendererSize, outputSize)) {
 		// 同步 outputSize
-		task.SetResult(true, std::memory_order_release);
+		initializeTask.SetResult(true, std::memory_order_release);
 	} else {
 		Logger::Get().Error("_Initialize 失败");
-		task.SetResult(false);
+		initializeTask.SetResult(false);
 		return;
 	}
 

src/Magpie.Core/FrameProducer.h

@@ -51,7 +51,7 @@ class FrameProducer {
 		RECT srcRect,
 		Size rendererSize,
 		Size& outputSize,
-		SimpleTask<bool>& task
+		SimpleTask<bool>& initializeTask
 	) noexcept;
 
 	bool _Initialize(

src/Magpie.Core/GraphicsCaptureFrameSource.cpp

@@ -673,27 +673,6 @@ HRESULT GraphicsCaptureFrameSource::OnCursorVisibilityChanged(bool isVisible, bo
 	return S_OK;
 }
 
-static bool IsDebugLayersAvailable() noexcept {
-#ifdef _DEBUG
-	static bool result = SUCCEEDED(D3D11CreateDevice(
-		nullptr,
-		D3D_DRIVER_TYPE_NULL,       // There is no need to create a real hardware device.
-		nullptr,
-		D3D11_CREATE_DEVICE_DEBUG,  // Check for the SDK layers.
-		nullptr,                    // Any feature level will do.
-		0,
-		D3D11_SDK_VERSION,
-		nullptr,                    // No need to keep the D3D device reference.
-		nullptr,                    // No need to know the feature level.
-		nullptr                     // No need to keep the D3D device context reference.
-	));
-	return result;
-#else
-	// Relaese 配置不使用调试层
-	return false;
-#endif
-}
-
 bool GraphicsCaptureFrameSource::_CreateCaptureDevice(HMONITOR hMonSrc) noexcept {
 	// 查找源窗口所在屏幕连接的适配器
 	winrt::com_ptr<IDXGIAdapter1> srcMonAdapter =
@@ -729,9 +708,9 @@ bool GraphicsCaptureFrameSource::_CreateCaptureDevice(HMONITOR hMonSrc) noexcept
 	const UINT nFeatureLevels = ARRAYSIZE(featureLevels);
 
 	UINT createDeviceFlags = D3D11_CREATE_DEVICE_BGRA_SUPPORT;
-	if (IsDebugLayersAvailable()) {
-		createDeviceFlags |= D3D11_CREATE_DEVICE_DEBUG;
-	}
+#ifdef _DEBUG
+	createDeviceFlags |= D3D11_CREATE_DEVICE_DEBUG;
+#endif
 
 	winrt::com_ptr<ID3D11Device> d3dDevice;
 	winrt::com_ptr<ID3D11DeviceContext> d3dDC;
@@ -780,7 +759,16 @@ bool GraphicsCaptureFrameSource::_CreateCaptureDevice(HMONITOR hMonSrc) noexcept
 		return false;
 	}
 
-	winrt::com_ptr<IDXGIDevice> dxgiDevice = _d3d11Device.try_as<IDXGIDevice>();
+#ifdef _DEBUG
+	// 调试层汇报错误或警告时中断
+	if (winrt::com_ptr<ID3D11InfoQueue> infoQueue = d3dDevice.try_as<ID3D11InfoQueue>()) {
+		infoQueue->SetBreakOnSeverity(D3D11_MESSAGE_SEVERITY_CORRUPTION, TRUE);
+		infoQueue->SetBreakOnSeverity(D3D11_MESSAGE_SEVERITY_ERROR, TRUE);
+		infoQueue->SetBreakOnSeverity(D3D11_MESSAGE_SEVERITY_WARNING, TRUE);
+	}
+#endif
+	
+	winrt::com_ptr<IDXGIDevice> dxgiDevice = d3dDevice.try_as<IDXGIDevice>();
 	if (!dxgiDevice) {
 		Logger::Get().Error("获取 IDXGIDevice 失败");
 		return false;
@@ -807,6 +795,15 @@ bool GraphicsCaptureFrameSource::_CreateBridgeDeviceResources(IDXGIAdapter1* dxg
 
 	Logger::Get().Info("已创建 D3D12 设备");
 
+#ifdef _DEBUG
+	// 调试层汇报错误或警告时中断
+	if (winrt::com_ptr<ID3D12InfoQueue> infoQueue = _bridgeDevice.try_as<ID3D12InfoQueue>()) {
+		infoQueue->SetBreakOnSeverity(D3D12_MESSAGE_SEVERITY_CORRUPTION, TRUE);
+		infoQueue->SetBreakOnSeverity(D3D12_MESSAGE_SEVERITY_ERROR, TRUE);
+		infoQueue->SetBreakOnSeverity(D3D12_MESSAGE_SEVERITY_WARNING, TRUE);
+	}
+#endif
+
 	// 不应使用集成显卡捕获，集成显卡没有高速的专用显存，捕获延迟很高
 	{
 		D3D12_FEATURE_DATA_ARCHITECTURE1 value{};

src/Magpie.Core/GraphicsContext.cpp

@@ -25,6 +25,15 @@ bool GraphicsContext::Initialize(
 		return false;
 	}
 
+#ifdef _DEBUG
+	// 调试层汇报错误或警告时中断
+	if (winrt::com_ptr<ID3D12InfoQueue> infoQueue = _device.try_as<ID3D12InfoQueue>()) {
+		infoQueue->SetBreakOnSeverity(D3D12_MESSAGE_SEVERITY_CORRUPTION, TRUE);
+		infoQueue->SetBreakOnSeverity(D3D12_MESSAGE_SEVERITY_ERROR, TRUE);
+		infoQueue->SetBreakOnSeverity(D3D12_MESSAGE_SEVERITY_WARNING, TRUE);
+	}
+#endif
+
 	// 检查根签名版本
 	{
 		D3D12_FEATURE_DATA_ROOT_SIGNATURE featureData = { .HighestVersion = D3D_ROOT_SIGNATURE_VERSION_1_1 };

src/Magpie.Core/Magpie.Core.vcxproj

@@ -50,6 +50,7 @@
     <ClInclude Include="BackendDescriptorStore.h" />
     <ClInclude Include="CatmullRomEffectDrawer.h" />
     <ClInclude Include="CompSwapchainPresenter.h" />
+    <ClInclude Include="CursorDrawer2.h" />
     <ClInclude Include="CursorManager.h" />
     <ClInclude Include="CursorDrawer.h" />
     <ClInclude Include="DDS.h" />
@@ -104,6 +105,7 @@
     <ClCompile Include="BackendDescriptorStore.cpp" />
     <ClCompile Include="CatmullRomEffectDrawer.cpp" />
     <ClCompile Include="CompSwapchainPresenter.cpp" />
+    <ClCompile Include="CursorDrawer2.cpp" />
     <ClCompile Include="CursorManager.cpp" />
     <ClCompile Include="CursorDrawer.cpp" />
     <ClCompile Include="DDSHelper.cpp" />

src/Magpie.Core/Magpie.Core.vcxproj.filters

@@ -168,6 +168,9 @@
     <ClInclude Include="EffectsDrawer.h">
       <Filter>Render</Filter>
     </ClInclude>
+    <ClInclude Include="CursorDrawer2.h">
+      <Filter>Render</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="ScalingRuntime.cpp" />
@@ -286,6 +289,9 @@
     <ClCompile Include="EffectsDrawer.cpp">
       <Filter>Render</Filter>
     </ClCompile>
+    <ClCompile Include="CursorDrawer2.cpp">
+      <Filter>Render</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <FxCompile Include="shaders\SimpleVS.hlsl">

src/Magpie.Core/Renderer.cpp

@@ -24,7 +24,6 @@
 #endif
 #include <dispatcherqueue.h>
 #include <d3dkmthk.h>
-#include "Renderer2.h"
 
 namespace Magpie {
 

src/Magpie.Core/Renderer2.cpp

@@ -96,6 +96,11 @@ ScalingError Renderer2::Initialize(
 	_frameProducer.InitializeAsync(
 		_graphicsContext, _colorInfo, hMonitor, srcRect, size, outputSize, task);
 
+	if (!_cursorDrawer.Initialize(_graphicsContext)) {
+		Logger::Get().Error("CursorDrawer2::Initialize 失败");
+		return ScalingError::ScalingFailedGeneral;
+	}
+
 	_presenter = std::make_unique<SwapChainPresenter>();
 	if (!_presenter->Initialize(_graphicsContext, hwndAttach, size, _colorInfo)) {
 		Logger::Get().Error("SwapChainPresenter::Initialize 失败");
@@ -172,6 +177,11 @@ void Renderer2::OnResized(Size size) noexcept {
 		return;
 	}
 
+	// 确保消费者不再使用环形缓冲区
+	if (!_CheckResult(_graphicsContext.WaitForGpu(), "GraphicsContext::WaitForGpu 失败")) {
+		return;
+	}
+
 	Size outputSize;
 	SimpleTask<HRESULT> task;
 	_frameProducer.OnResizedAsync(size, outputSize, task);
@@ -186,8 +196,6 @@ void Renderer2::OnResized(Size size) noexcept {
 	}
 
 	_UpdateOutputRect(outputSize);
-
-	_CheckResult(_RenderImpl(true), "_RenderImpl 失败");
 }
 
 void Renderer2::OnMsgDisplayChanged() noexcept {
@@ -339,22 +347,29 @@ HRESULT Renderer2::_UpdateColorSpace() noexcept {
 		return S_OK;
 	}
 
+	// 确保消费者不再使用环形缓冲区
+	HRESULT hr = _graphicsContext.WaitForGpu();
+	if (FAILED(hr)) {
+		Logger::Get().ComError("GraphicsContext::WaitForGpu 失败", hr);
+		return hr;
+	}
+
 	SimpleTask<HRESULT> task;
 	_frameProducer.OnColorInfoChangedAsync(_colorInfo, task);
 
-	HRESULT hr = _presenter->OnColorInfoChanged(_colorInfo);
+	hr = _presenter->OnColorInfoChanged(_colorInfo);
 	if (FAILED(hr)) {
 		Logger::Get().ComError("SwapChainPresenter::OnColorInfoChanged 失败", hr);
 		return hr;
 	}
 
 	hr = task.GetResult();
-	if (!_CheckResult(hr, "FrameProducer::OnColorInfoChangedAsync 失败")) {
+	if (FAILED(hr)) {
+		Logger::Get().ComError("FrameProducer::OnColorInfoChangedAsync 失败", hr);
 		return hr;
 	}
 
-	_CheckResult(_RenderImpl(true), "_RenderImpl 失败");
-
+	ScalingWindow::Get().Render();
 	return S_OK;
 }
 
@@ -383,41 +398,77 @@ HRESULT Renderer2::_RenderImpl(bool waitForGpu) noexcept {
 
 	ID3D12GraphicsCommandList* commandList = _graphicsContext.GetCommandList();
 
-	if (const Size size = _presenter->GetSize(); _outputRect == RECT{ 0,0,(LONG)size.width,(LONG)size.height }) {
+	{
+		CD3DX12_RESOURCE_BARRIER barrier = CD3DX12_RESOURCE_BARRIER::Transition(
+			frameTex, D3D12_RESOURCE_STATE_PRESENT, D3D12_RESOURCE_STATE_COPY_DEST, 0);
+		commandList->ResourceBarrier(1, &barrier);
+	}
+
+	if (Size size = _presenter->GetSize(); _outputRect == Rect{ 0,0,size.width,size.height }) {
+		commandList->CopyResource(frameTex, curBuffer);
+
 		{
 			CD3DX12_RESOURCE_BARRIER barrier = CD3DX12_RESOURCE_BARRIER::Transition(
-				frameTex, D3D12_RESOURCE_STATE_PRESENT, D3D12_RESOURCE_STATE_COPY_DEST, 0);
+				frameTex, D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_PRESENT, 0);
 			commandList->ResourceBarrier(1, &barrier);
 		}
-
-		commandList->CopyResource(frameTex, curBuffer);
 	} else {
+		CD3DX12_TEXTURE_COPY_LOCATION src(curBuffer, 0);
+		CD3DX12_TEXTURE_COPY_LOCATION dest(frameTex, 0);
+		commandList->CopyTextureRegion(&dest, _outputRect.left, _outputRect.top, 0, &src, nullptr);
+
 		{
 			D3D12_RESOURCE_BARRIER barrier = CD3DX12_RESOURCE_BARRIER::Transition(
-				frameTex, D3D12_RESOURCE_STATE_PRESENT, D3D12_RESOURCE_STATE_RENDER_TARGET, 0);
+				frameTex, D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_RENDER_TARGET, 0);
 			commandList->ResourceBarrier(1, &barrier);
 		}
 
 		// 存在黑边时应填充背景。使用交换链呈现时需要这个操作，因为我们指定了 
 		// DXGI_SWAP_EFFECT_FLIP_DISCARD，同时也是为了和 RTSS 兼容。
-		static constexpr FLOAT BLACK[4] = { 0.0f,0.0f,0.0f,1.0f };
-		commandList->ClearRenderTargetView(rtvHandle, BLACK, 0, nullptr);
+		{
+			SmallVector<D3D12_RECT, 4> rects;
+			if (_outputRect.left > 0) {
+				rects.push_back({
+					0,
+					0,
+					(LONG)_outputRect.left,
+					(LONG)size.height
+				});
+			}
+			if (_outputRect.top > 0) {
+				rects.push_back({
+					(LONG)_outputRect.left,
+					0,
+					(LONG)_outputRect.right,
+					(LONG)_outputRect.top
+				});
+			}
+			if (_outputRect.right < size.width) {
+				rects.push_back({
+					(LONG)_outputRect.right,
+					0,
+					(LONG)size.width,
+					(LONG)size.height
+				});
+			}
+			if (_outputRect.bottom < size.height) {
+				rects.push_back({
+					(LONG)_outputRect.left,
+					(LONG)_outputRect.bottom,
+					(LONG)_outputRect.right,
+					(LONG)size.height
+				});
+			}
+
+			static constexpr FLOAT BLACK[4] = { 0.0f,0.0f,0.0f,1.0f };
+			commandList->ClearRenderTargetView(rtvHandle, BLACK, (UINT)rects.size(), rects.data());
+		}
 
 		{
 			CD3DX12_RESOURCE_BARRIER barrier = CD3DX12_RESOURCE_BARRIER::Transition(
-				frameTex, D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_DEST, 0);
+				frameTex, D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_PRESENT, 0);
 			commandList->ResourceBarrier(1, &barrier);
 		}
-
-		CD3DX12_TEXTURE_COPY_LOCATION src(curBuffer, 0);
-		CD3DX12_TEXTURE_COPY_LOCATION dest(frameTex, 0);
-		commandList->CopyTextureRegion(&dest, _outputRect.left, _outputRect.top, 0, &src, nullptr);
-	}
-
-	{
-		CD3DX12_RESOURCE_BARRIER barrier = CD3DX12_RESOURCE_BARRIER::Transition(
-			frameTex, D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_PRESENT, 0);
-		commandList->ResourceBarrier(1, &barrier);
 	}
 
 	hr = commandList->Close();
@@ -480,8 +531,8 @@ void Renderer2::_UpdateOutputRect(Size outputSize) noexcept {
 		_outputRect.bottom = rendererSize.height;
 	}
 
-	assert(_outputRect.left + (LONG)outputSize.width == _outputRect.right);
-	assert(_outputRect.top + (LONG)outputSize.height == _outputRect.bottom);
+	assert(_outputRect.left + outputSize.width == _outputRect.right);
+	assert(_outputRect.top + outputSize.height == _outputRect.bottom);
 }
 
 bool Renderer2::_CheckResult(bool success, std::string_view errorMsg) noexcept {