From 43c3821993cb3d6ec3025fa7156da8544d2a1dac Mon Sep 17 00:00:00 2001 From: azhirnov Date: Mon, 16 Nov 2020 20:30:23 +0300 Subject: D3D12 resource binding refactoring, rename LinearAllocator to FixedLinearAllocator. --- Graphics/GraphicsEngineOpenGL/include/PipelineStateGLImpl.hpp | 2 +- Graphics/GraphicsEngineOpenGL/src/PipelineStateGLImpl.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'Graphics/GraphicsEngineOpenGL') diff --git a/Graphics/GraphicsEngineOpenGL/include/PipelineStateGLImpl.hpp b/Graphics/GraphicsEngineOpenGL/include/PipelineStateGLImpl.hpp index 93180774..0635313d 100644 --- a/Graphics/GraphicsEngineOpenGL/include/PipelineStateGLImpl.hpp +++ b/Graphics/GraphicsEngineOpenGL/include/PipelineStateGLImpl.hpp @@ -112,7 +112,7 @@ private: void Initialize(const PSOCreateInfoType& CreateInfo, const std::vector& ShaderStages); void InitResourceLayouts(const std::vector& ShaderStages, - LinearAllocator& MemPool); + FixedLinearAllocator& MemPool); void Destruct(); diff --git a/Graphics/GraphicsEngineOpenGL/src/PipelineStateGLImpl.cpp b/Graphics/GraphicsEngineOpenGL/src/PipelineStateGLImpl.cpp index 32be5dfc..b8c0a7c0 100644 --- a/Graphics/GraphicsEngineOpenGL/src/PipelineStateGLImpl.cpp +++ b/Graphics/GraphicsEngineOpenGL/src/PipelineStateGLImpl.cpp @@ -40,7 +40,7 @@ namespace Diligent template void PipelineStateGLImpl::Initialize(const PSOCreateInfoType& CreateInfo, const std::vector& ShaderStages) { - LinearAllocator MemPool{GetRawAllocator()}; + FixedLinearAllocator MemPool{GetRawAllocator()}; VERIFY_EXPR(m_NumShaderStages > 0 && m_NumShaderStages == ShaderStages.size()); if (!GetDevice()->GetDeviceCaps().Features.SeparablePrograms) m_NumShaderStages = 1; @@ -190,7 +190,7 @@ IMPLEMENT_QUERY_INTERFACE(PipelineStateGLImpl, IID_PipelineStateGL, TPipelineSta void PipelineStateGLImpl::InitResourceLayouts(const std::vector& ShaderStages, - LinearAllocator& MemPool) + FixedLinearAllocator& MemPool) { auto* const pDeviceGL = GetDevice(); const auto& deviceCaps = pDeviceGL->GetDeviceCaps(); -- cgit v1.2.3