Some D3d12 safety checks.

simul · Dec 17, 2024 · 460a4da · 460a4da
1 parent dbf9c2a
commit 460a4da
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/DirectX12/RenderPlatform.cpp b/DirectX12/RenderPlatform.cpp
@@ -2833,7 +2833,8 @@ void RenderPlatform::DeactivateRenderTargets(crossplatform::GraphicsDeviceContex
 void RenderPlatform::SetViewports(crossplatform::GraphicsDeviceContext &deviceContext, int num, const crossplatform::Viewport *vps)
 {
 	ID3D12GraphicsCommandList *commandList = deviceContext.asD3D12Context();
-
+	if(!commandList)
+		return;
 	D3D12_VIEWPORT viewports[D3D12_SIMULTANEOUS_RENDER_TARGET_COUNT] = {};
 	D3D12_RECT scissors[D3D12_SIMULTANEOUS_RENDER_TARGET_COUNT] = {};
 

diff --git a/DirectX12/Texture.cpp b/DirectX12/Texture.cpp
@@ -1037,6 +1037,8 @@ void Texture::RestoreExternalTextureState(crossplatform::DeviceContext& deviceCo
 {
 	if ((crossplatform::ResourceState)mExternalLayout == crossplatform::ResourceState::UNKNOWN)
 		return;
+	if(!IsValid())
+		return;
 	auto rPlat = (dx12::RenderPlatform*)(renderPlatform);
 	SetLayout(deviceContext, mExternalLayout);
 }