diff options
| author | Egor Yusov <egor.yusov@gmail.com> | 2018-07-31 03:50:15 +0000 |
|---|---|---|
| committer | Egor Yusov <egor.yusov@gmail.com> | 2018-07-31 03:50:15 +0000 |
| commit | c3c38e981fe078d2a83d23283c54f0a0f113ce93 (patch) | |
| tree | b99e049dbb8fc66a6f4e20e395504a4c582002b7 /Graphics/GraphicsEngineD3D12 | |
| parent | Fixed initialization of DebugMessageCallback to work in Release mode (diff) | |
| download | DiligentCore-c3c38e981fe078d2a83d23283c54f0a0f113ce93.tar.gz DiligentCore-c3c38e981fe078d2a83d23283c54f0a0f113ce93.zip | |
Reworked dynamic resource management in Vulkan to not rely on RingBuffer; added FinishFrame() to device context
Diffstat (limited to 'Graphics/GraphicsEngineD3D12')
3 files changed, 8 insertions, 2 deletions
diff --git a/Graphics/GraphicsEngineD3D12/include/DeviceContextD3D12Impl.h b/Graphics/GraphicsEngineD3D12/include/DeviceContextD3D12Impl.h index 2dfdfacf..4c65e1c2 100644 --- a/Graphics/GraphicsEngineD3D12/include/DeviceContextD3D12Impl.h +++ b/Graphics/GraphicsEngineD3D12/include/DeviceContextD3D12Impl.h @@ -85,6 +85,8 @@ public: virtual void ClearRenderTarget( ITextureView *pView, const float *RGBA )override final; virtual void Flush()override final; + + virtual void FinishFrame(bool ForceRelease)override final; virtual void FinishCommandList(class ICommandList **ppCommandList)override final; diff --git a/Graphics/GraphicsEngineD3D12/src/DeviceContextD3D12Impl.cpp b/Graphics/GraphicsEngineD3D12/src/DeviceContextD3D12Impl.cpp index eccdcb1d..b7d41c82 100644 --- a/Graphics/GraphicsEngineD3D12/src/DeviceContextD3D12Impl.cpp +++ b/Graphics/GraphicsEngineD3D12/src/DeviceContextD3D12Impl.cpp @@ -531,6 +531,10 @@ namespace Diligent Flush(true); } + void DeviceContextD3D12Impl::FinishFrame(bool ForceRelease) + { + } + void DeviceContextD3D12Impl::SetVertexBuffers( Uint32 StartSlot, Uint32 NumBuffersSet, IBuffer** ppBuffers, Uint32* pOffsets, Uint32 Flags ) { TDeviceContextBase::SetVertexBuffers( StartSlot, NumBuffersSet, ppBuffers, pOffsets, Flags ); diff --git a/Graphics/GraphicsEngineD3D12/src/DynamicUploadHeap.cpp b/Graphics/GraphicsEngineD3D12/src/DynamicUploadHeap.cpp index b16b62b8..232c5f8e 100644 --- a/Graphics/GraphicsEngineD3D12/src/DynamicUploadHeap.cpp +++ b/Graphics/GraphicsEngineD3D12/src/DynamicUploadHeap.cpp @@ -81,14 +81,14 @@ namespace Diligent m_pBuffer->Map(0, nullptr, &m_CpuVirtualAddress); } - LOG_INFO_MESSAGE("GPU ring buffer created. Size: ", MaxSize, "; GPU virtual address 0x", std::hex, m_GpuVirtualAddress); + LOG_INFO_MESSAGE("GPU ring buffer created. Size: ", FormatMemorySize(MaxSize,2), "; GPU virtual address 0x", std::hex, m_GpuVirtualAddress); } void GPURingBuffer::Destroy() { if(m_pBuffer) { - LOG_INFO_MESSAGE("Destroying GPU ring buffer. Size: ", m_pBuffer->GetDesc().Width, "; GPU virtual address 0x", std::hex, m_GpuVirtualAddress); + LOG_INFO_MESSAGE("Destroying GPU ring buffer. Size: ", FormatMemorySize(m_pBuffer->GetDesc().Width,2), "; GPU virtual address 0x", std::hex, m_GpuVirtualAddress); } if (m_CpuVirtualAddress) |