Merge branch '1.2' of https://github.com/FlaxEngine/FlaxEngine into indirect-vulkan

2021-04-24 14:29:51 +02:00
parent 3fc7073046 b73ff9aaf6
commit 4c130bcba1
44 changed files with 853 additions and 245 deletions
--- a/Source/Engine/Renderer/DepthOfFieldPass.cpp
+++ b/Source/Engine/Renderer/DepthOfFieldPass.cpp
@@ -34,6 +34,8 @@ bool DepthOfFieldPass::Init()
    _platformSupportsDoF = limits.HasCompute;
    _platformSupportsBokeh = _platformSupportsDoF && limits.HasGeometryShaders && limits.HasDrawIndirect && limits.HasAppendConsumeBuffers;

+    _platformSupportsBokeh &= GPUDevice::Instance->GetRendererType() != RendererType::DirectX12; // TODO: fix bokeh crash on d3d12 (driver issue probably - started to happen recently)
+
    // Create pipeline states
    if (_platformSupportsDoF)
    {