From aee75043883900a4952767398201066e62e68724 Mon Sep 17 00:00:00 2001 From: Egor Yusov Date: Sat, 20 May 2017 13:12:04 -0700 Subject: Merging Updates from dev branch --- Graphics/GraphicsTools/include/BasicShaderSourceStreamFactory.h | 2 +- Graphics/GraphicsTools/include/GraphicsUtilities.h | 2 +- Graphics/GraphicsTools/include/RingBuffer.h | 2 +- Graphics/GraphicsTools/include/ShaderMacroHelper.h | 2 +- Graphics/GraphicsTools/include/VariableSizeAllocationsManager.h | 6 +----- Graphics/GraphicsTools/include/VariableSizeGPUAllocationsManager.h | 2 -- Graphics/GraphicsTools/include/pch.h | 2 +- Graphics/GraphicsTools/src/BasicShaderSourceStreamFactory.cpp | 2 +- Graphics/GraphicsTools/src/GraphicsUtilities.cpp | 2 +- Graphics/GraphicsTools/src/pch.cpp | 2 +- 10 files changed, 9 insertions(+), 15 deletions(-) (limited to 'Graphics/GraphicsTools') diff --git a/Graphics/GraphicsTools/include/BasicShaderSourceStreamFactory.h b/Graphics/GraphicsTools/include/BasicShaderSourceStreamFactory.h index 24e87df5..86e2650b 100644 --- a/Graphics/GraphicsTools/include/BasicShaderSourceStreamFactory.h +++ b/Graphics/GraphicsTools/include/BasicShaderSourceStreamFactory.h @@ -1,4 +1,4 @@ -/* Copyright 2015-2017 Egor Yusov +/* Copyright 2015-2016 Egor Yusov * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/Graphics/GraphicsTools/include/GraphicsUtilities.h b/Graphics/GraphicsTools/include/GraphicsUtilities.h index f13684fd..6e6b34f6 100644 --- a/Graphics/GraphicsTools/include/GraphicsUtilities.h +++ b/Graphics/GraphicsTools/include/GraphicsUtilities.h @@ -1,4 +1,4 @@ -/* Copyright 2015-2017 Egor Yusov +/* Copyright 2015-2016 Egor Yusov * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/Graphics/GraphicsTools/include/RingBuffer.h b/Graphics/GraphicsTools/include/RingBuffer.h index 6ac15fc1..ee2b7d6c 100644 --- a/Graphics/GraphicsTools/include/RingBuffer.h +++ b/Graphics/GraphicsTools/include/RingBuffer.h @@ -1,4 +1,4 @@ -/* Copyright 2015-2017 Egor Yusov +/* Copyright 2015-2016 Egor Yusov * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/Graphics/GraphicsTools/include/ShaderMacroHelper.h b/Graphics/GraphicsTools/include/ShaderMacroHelper.h index 1beec624..f64c2349 100644 --- a/Graphics/GraphicsTools/include/ShaderMacroHelper.h +++ b/Graphics/GraphicsTools/include/ShaderMacroHelper.h @@ -1,4 +1,4 @@ -/* Copyright 2015-2017 Egor Yusov +/* Copyright 2015-2016 Egor Yusov * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/Graphics/GraphicsTools/include/VariableSizeAllocationsManager.h b/Graphics/GraphicsTools/include/VariableSizeAllocationsManager.h index 86b8f6e1..c415d82e 100644 --- a/Graphics/GraphicsTools/include/VariableSizeAllocationsManager.h +++ b/Graphics/GraphicsTools/include/VariableSizeAllocationsManager.h @@ -298,11 +298,7 @@ namespace Diligent VERIFY_EXPR(BlockIt->first >= 0 && BlockIt->first + BlockIt->second.Size <= m_MaxSize); VERIFY_EXPR(BlockIt == BlockIt->second.OrderBySizeIt->second); VERIFY_EXPR(BlockIt->second.Size == BlockIt->second.OrderBySizeIt->first); - // PrevBlock.Offset BlockIt.first - // | | - // ~ ~ |<-----PrevBlock.Size----->| ~ ~ ~ |<------Size-------->| ~ ~ ~ - // - VERIFY(PrevBlockIt == m_FreeBlocksByOffset.end() || BlockIt->first > PrevBlockIt->first + PrevBlockIt->second.Size, "Unmerged adjacent or overlapping blocks detected" ); + VERIFY(PrevBlockIt == m_FreeBlocksByOffset.end() || BlockIt->first > PrevBlockIt->first + PrevBlockIt->second.Size, "Not merged adjacent or overlapping blocks detected" ); TotalFreeSize += BlockIt->second.Size; PrevBlockIt = BlockIt; diff --git a/Graphics/GraphicsTools/include/VariableSizeGPUAllocationsManager.h b/Graphics/GraphicsTools/include/VariableSizeGPUAllocationsManager.h index 04a347d3..4804338a 100644 --- a/Graphics/GraphicsTools/include/VariableSizeGPUAllocationsManager.h +++ b/Graphics/GraphicsTools/include/VariableSizeGPUAllocationsManager.h @@ -29,8 +29,6 @@ namespace Diligent { - // Class extends basic variable-size memory block allocator by deferring deallocation - // of freed blocks untill the corresponding frame is completed class VariableSizeGPUAllocationsManager : public VariableSizeAllocationsManager { private: diff --git a/Graphics/GraphicsTools/include/pch.h b/Graphics/GraphicsTools/include/pch.h index 690233d1..41fa3c3b 100644 --- a/Graphics/GraphicsTools/include/pch.h +++ b/Graphics/GraphicsTools/include/pch.h @@ -1,4 +1,4 @@ -/* Copyright 2015-2017 Egor Yusov +/* Copyright 2015-2016 Egor Yusov * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/Graphics/GraphicsTools/src/BasicShaderSourceStreamFactory.cpp b/Graphics/GraphicsTools/src/BasicShaderSourceStreamFactory.cpp index 6c1db669..e15635e8 100644 --- a/Graphics/GraphicsTools/src/BasicShaderSourceStreamFactory.cpp +++ b/Graphics/GraphicsTools/src/BasicShaderSourceStreamFactory.cpp @@ -1,4 +1,4 @@ -/* Copyright 2015-2017 Egor Yusov +/* Copyright 2015-2016 Egor Yusov * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/Graphics/GraphicsTools/src/GraphicsUtilities.cpp b/Graphics/GraphicsTools/src/GraphicsUtilities.cpp index e0ae1dce..f3a7d873 100644 --- a/Graphics/GraphicsTools/src/GraphicsUtilities.cpp +++ b/Graphics/GraphicsTools/src/GraphicsUtilities.cpp @@ -1,4 +1,4 @@ -/* Copyright 2015-2017 Egor Yusov +/* Copyright 2015-2016 Egor Yusov * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/Graphics/GraphicsTools/src/pch.cpp b/Graphics/GraphicsTools/src/pch.cpp index d5f45c6a..997e0f4a 100644 --- a/Graphics/GraphicsTools/src/pch.cpp +++ b/Graphics/GraphicsTools/src/pch.cpp @@ -1,4 +1,4 @@ -/* Copyright 2015-2017 Egor Yusov +/* Copyright 2015-2016 Egor Yusov * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. -- cgit v1.2.3