Better sampler heap checks in D3D12.

simul · Oct 29, 2024 · 08d5fae · 08d5fae
1 parent 8bd33dd
commit 08d5fae
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/DirectX12/RenderPlatform.cpp b/DirectX12/RenderPlatform.cpp
@@ -3119,13 +3119,12 @@ bool RenderPlatform::ApplyContextState(crossplatform::DeviceContext &deviceConte
 
 	// Set the frame descriptor heaps
 	Heap *currentSamplerHeap = dx12Effect->GetEffectSamplerHeap();
-	ID3D12DescriptorHeap *currentHeaps[2] = {mFrameHeap[frameHeapIndex].GetHeap(), currentSamplerHeap->GetHeap()};
 	// If we are overriding samplers, use the override heap instead:
-	if (cs->samplerStateOverrides.size() > 0)
+	if (cs->samplerStateOverrides.size() > 0 || !currentSamplerHeap)
 	{
 		currentSamplerHeap = &mFrameOverrideSamplerHeap[frameHeapIndex];
-		currentHeaps[1] = currentSamplerHeap->GetHeap();
 	}
+	ID3D12DescriptorHeap *currentHeaps[2] = {mFrameHeap[frameHeapIndex].GetHeap(), currentSamplerHeap->GetHeap()};
 	cmdList->SetDescriptorHeaps(2, currentHeaps);
 
 	// Apply the RootDescriptor tables: