diff options
| author | azhirnov <zh1dron@gmail.com> | 2020-11-16 17:30:23 +0000 |
|---|---|---|
| committer | azhirnov <zh1dron@gmail.com> | 2020-11-16 17:53:02 +0000 |
| commit | 43c3821993cb3d6ec3025fa7156da8544d2a1dac (patch) | |
| tree | fa5b7cc5774c7f72a307f2b0cd250e64a7abecf0 /Graphics/GraphicsEngineD3D11 | |
| parent | bug fix for ray tracing, fixed KHR via NV emulation. (diff) | |
| download | DiligentCore-43c3821993cb3d6ec3025fa7156da8544d2a1dac.tar.gz DiligentCore-43c3821993cb3d6ec3025fa7156da8544d2a1dac.zip | |
D3D12 resource binding refactoring, rename LinearAllocator to FixedLinearAllocator.
Diffstat (limited to 'Graphics/GraphicsEngineD3D11')
| -rw-r--r-- | Graphics/GraphicsEngineD3D11/src/PipelineStateD3D11Impl.cpp | 2 | ||||
| -rw-r--r-- | Graphics/GraphicsEngineD3D11/src/ShaderResourceBindingD3D11Impl.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Graphics/GraphicsEngineD3D11/src/PipelineStateD3D11Impl.cpp b/Graphics/GraphicsEngineD3D11/src/PipelineStateD3D11Impl.cpp index 1c03690e..dd3566b8 100644 --- a/Graphics/GraphicsEngineD3D11/src/PipelineStateD3D11Impl.cpp +++ b/Graphics/GraphicsEngineD3D11/src/PipelineStateD3D11Impl.cpp @@ -46,7 +46,7 @@ void PipelineStateD3D11Impl::InitInternalObjects(const PSOCreateInfoType& Create const auto NumShaderStages = GetNumShaderStages(); VERIFY_EXPR(NumShaderStages > 0 && NumShaderStages == ShaderStages.size()); - LinearAllocator MemPool{GetRawAllocator()}; + FixedLinearAllocator MemPool{GetRawAllocator()}; MemPool.AddSpace<ShaderResourceCacheD3D11>(NumShaderStages); MemPool.AddSpace<ShaderResourceLayoutD3D11>(NumShaderStages); diff --git a/Graphics/GraphicsEngineD3D11/src/ShaderResourceBindingD3D11Impl.cpp b/Graphics/GraphicsEngineD3D11/src/ShaderResourceBindingD3D11Impl.cpp index 46833c81..c33ba26e 100644 --- a/Graphics/GraphicsEngineD3D11/src/ShaderResourceBindingD3D11Impl.cpp +++ b/Graphics/GraphicsEngineD3D11/src/ShaderResourceBindingD3D11Impl.cpp @@ -31,7 +31,7 @@ #include "DeviceContextD3D11Impl.hpp" #include "RenderDeviceD3D11Impl.hpp" #include "ShaderD3D11Impl.hpp" -#include "LinearAllocator.hpp" +#include "FixedLinearAllocator.hpp" namespace Diligent { @@ -55,7 +55,7 @@ ShaderResourceBindingD3D11Impl::ShaderResourceBindingD3D11Impl(IReferenceCounter m_ResourceLayoutIndex.fill(-1); m_NumActiveShaders = static_cast<Uint8>(pPSO->GetNumShaderStages()); - LinearAllocator MemPool{GetRawAllocator()}; + FixedLinearAllocator MemPool{GetRawAllocator()}; MemPool.AddSpace<ShaderResourceCacheD3D11>(m_NumActiveShaders); MemPool.AddSpace<ShaderResourceLayoutD3D11>(m_NumActiveShaders); |