diff options
| author | azhirnov <zh1dron@gmail.com> | 2020-09-08 21:11:20 +0000 |
|---|---|---|
| committer | azhirnov <zh1dron@gmail.com> | 2020-09-08 21:11:20 +0000 |
| commit | f556d61c7360b2dd850ac8712d293d8b2be02bc5 (patch) | |
| tree | 3926acb2e9c41df14957ca6a8a287ac8d20b60d4 /Graphics | |
| parent | removed m_isDXIL flag, detect DXIL by bytecode (diff) | |
| parent | Updated third-party modules (diff) | |
| download | DiligentCore-f556d61c7360b2dd850ac8712d293d8b2be02bc5.tar.gz DiligentCore-f556d61c7360b2dd850ac8712d293d8b2be02bc5.zip | |
Merge branch 'master' into mesh_shader
Diffstat (limited to 'Graphics')
| -rw-r--r-- | Graphics/GLSLTools/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | Graphics/GraphicsEngineD3D12/src/DeviceContextD3D12Impl.cpp | 1 | ||||
| -rw-r--r-- | Graphics/GraphicsEngineVulkan/include/DeviceContextVkImpl.hpp | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/Graphics/GLSLTools/CMakeLists.txt b/Graphics/GLSLTools/CMakeLists.txt index 442c0d97..4cc1ecf9 100644 --- a/Graphics/GLSLTools/CMakeLists.txt +++ b/Graphics/GLSLTools/CMakeLists.txt @@ -71,6 +71,7 @@ if(VULKAN_SUPPORTED) PRIVATE glslang SPIRV + SPIRV-Tools-opt ) target_include_directories(Diligent-GLSLTools diff --git a/Graphics/GraphicsEngineD3D12/src/DeviceContextD3D12Impl.cpp b/Graphics/GraphicsEngineD3D12/src/DeviceContextD3D12Impl.cpp index 7d8dd348..35539eb2 100644 --- a/Graphics/GraphicsEngineD3D12/src/DeviceContextD3D12Impl.cpp +++ b/Graphics/GraphicsEngineD3D12/src/DeviceContextD3D12Impl.cpp @@ -2142,6 +2142,7 @@ void DeviceContextD3D12Impl::TransitionBufferState(IBuffer* pBuffer, D3D12_RESOU ID3D12GraphicsCommandList* DeviceContextD3D12Impl::GetD3D12CommandList() { auto& CmdCtx = GetCmdContext(); + CmdCtx.FlushResourceBarriers(); return CmdCtx.GetCommandList(); } diff --git a/Graphics/GraphicsEngineVulkan/include/DeviceContextVkImpl.hpp b/Graphics/GraphicsEngineVulkan/include/DeviceContextVkImpl.hpp index 01630417..e01178a5 100644 --- a/Graphics/GraphicsEngineVulkan/include/DeviceContextVkImpl.hpp +++ b/Graphics/GraphicsEngineVulkan/include/DeviceContextVkImpl.hpp @@ -324,6 +324,7 @@ public: __forceinline VulkanUtilities::VulkanCommandBuffer& GetCommandBuffer() { EnsureVkCmdBuffer(); + m_CommandBuffer.FlushBarriers(); return m_CommandBuffer; } |