diff options
| author | assiduous <assiduous@diligentgraphics.com> | 2020-01-27 20:34:52 +0000 |
|---|---|---|
| committer | assiduous <assiduous@diligentgraphics.com> | 2020-01-27 20:34:52 +0000 |
| commit | 2a0f9a6b4c4e71a21711f794b864ecb0f27f300d (patch) | |
| tree | 8bb08842a4972f9dcbcf98d82ba85962435033a8 /Graphics/GraphicsEngineD3D12 | |
| parent | Guarded interface definitions by define-undef macro helper include pairs to a... (diff) | |
| download | DiligentCore-2a0f9a6b4c4e71a21711f794b864ecb0f27f300d.tar.gz DiligentCore-2a0f9a6b4c4e71a21711f794b864ecb0f27f300d.zip | |
Fixed class vs struct issues. Implemented HLSL2GLSL Convertor C interfaces
Diffstat (limited to 'Graphics/GraphicsEngineD3D12')
4 files changed, 3 insertions, 7 deletions
diff --git a/Graphics/GraphicsEngineD3D12/include/BufferViewD3D12Impl.hpp b/Graphics/GraphicsEngineD3D12/include/BufferViewD3D12Impl.hpp index 62cb6294..e88ba682 100644 --- a/Graphics/GraphicsEngineD3D12/include/BufferViewD3D12Impl.hpp +++ b/Graphics/GraphicsEngineD3D12/include/BufferViewD3D12Impl.hpp @@ -50,7 +50,7 @@ public: BufferViewD3D12Impl(IReferenceCounters* pRefCounters, RenderDeviceD3D12Impl* pDevice, const BufferViewDesc& ViewDesc, - class IBuffer* pBuffer, + IBuffer* pBuffer, DescriptorHeapAllocation&& HandleAlloc, bool bIsDefaultView); diff --git a/Graphics/GraphicsEngineD3D12/include/SwapChainD3D12Impl.hpp b/Graphics/GraphicsEngineD3D12/include/SwapChainD3D12Impl.hpp index 0c45d915..30c6577e 100644 --- a/Graphics/GraphicsEngineD3D12/include/SwapChainD3D12Impl.hpp +++ b/Graphics/GraphicsEngineD3D12/include/SwapChainD3D12Impl.hpp @@ -37,9 +37,6 @@ namespace Diligent { -class ITextureViewD3D12; -class IMemoryAllocator; - /// Swap chain implementation in Direct3D12 backend. class SwapChainD3D12Impl final : public SwapChainD3DBase<ISwapChainD3D12, IDXGISwapChain3> { diff --git a/Graphics/GraphicsEngineD3D12/include/TextureViewD3D12Impl.hpp b/Graphics/GraphicsEngineD3D12/include/TextureViewD3D12Impl.hpp index 2c2529ae..fe69179b 100644 --- a/Graphics/GraphicsEngineD3D12/include/TextureViewD3D12Impl.hpp +++ b/Graphics/GraphicsEngineD3D12/include/TextureViewD3D12Impl.hpp @@ -50,7 +50,7 @@ public: TextureViewD3D12Impl(IReferenceCounters* pRefCounters, RenderDeviceD3D12Impl* pDevice, const TextureViewDesc& ViewDesc, - class ITexture* pTexture, + ITexture* pTexture, DescriptorHeapAllocation&& Descriptor, DescriptorHeapAllocation&& TexArraySRVDescriptor, DescriptorHeapAllocation&& MipLevelUAVDescriptors, diff --git a/Graphics/GraphicsEngineD3D12/interface/BufferD3D12.h b/Graphics/GraphicsEngineD3D12/interface/BufferD3D12.h index 399d078c..12e3175b 100644 --- a/Graphics/GraphicsEngineD3D12/interface/BufferD3D12.h +++ b/Graphics/GraphicsEngineD3D12/interface/BufferD3D12.h @@ -31,12 +31,11 @@ /// Definition of the Diligent::IBufferD3D12 interface #include "../../GraphicsEngine/interface/Buffer.h" +#include "../../GraphicsEngine/interface/DeviceContext.h" namespace Diligent { -class IDeviceContext; - // {3E9B15ED-A289-48DC-8214-C6E3E6177378} static constexpr INTERFACE_ID IID_BufferD3D12 = {0x3e9b15ed, 0xa289, 0x48dc, {0x82, 0x14, 0xc6, 0xe3, 0xe6, 0x17, 0x73, 0x78}}; |