Moved EngineMemory.h/cpp from GraphicsEngine to Common

Author: TheMostDiligent

Common/CMakeLists.txt

@@ -26,6 +26,7 @@ set(INTERFACE
     interface/LRUCache.hpp
     interface/FixedLinearAllocator.hpp
     interface/DynamicLinearAllocator.hpp
+    interface/EngineMemory.h
     interface/MemoryFileStream.hpp
     interface/ObjectBase.hpp
     interface/ObjectsRegistry.hpp
@@ -56,6 +57,7 @@ set(SOURCE
     src/BasicFileStream.cpp
     src/DataBlobImpl.cpp
     src/DefaultRawMemoryAllocator.cpp
+    src/EngineMemory.cpp
     src/FileWrapper.cpp
     src/FixedBlockMemoryAllocator.cpp
     src/GeometryPrimitives.cpp

Graphics/GraphicsEngine/include/EngineMemory.h renamed to Common/interface/EngineMemory.h

@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019-2022 Diligent Graphics LLC
+ *  Copyright 2019-2025 Diligent Graphics LLC
  *  Copyright 2015-2019 Egor Yusov
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
@@ -28,9 +28,9 @@
 #pragma once
 
 /// \file
-/// Implementation of the Diligent::BufferBase template class
+/// Implementation of the IMemoryAllocator interface and global memory allocation functions
 
-#include "MemoryAllocator.h"
+#include "../../Primitives/interface/MemoryAllocator.h"
 
 DILIGENT_BEGIN_NAMESPACE(Diligent)
 

Graphics/GraphicsEngine/src/EngineMemory.cpp renamed to Common/src/EngineMemory.cpp

@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019-2022 Diligent Graphics LLC
+ *  Copyright 2019-2025 Diligent Graphics LLC
  *  Copyright 2015-2019 Egor Yusov
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
@@ -25,10 +25,6 @@
  *  of the possibility of such damages.
  */
 
-// stdafx.cpp : source file that includes just the standard includes
-// RenderEngine.pch will be the pre-compiled header
-// stdafx.obj will contain the pre-compiled type information
-
 #include "EngineMemory.h"
 #include "DefaultRawMemoryAllocator.hpp"
 #include "DebugUtilities.hpp"

Graphics/GraphicsEngine/CMakeLists.txt

@@ -15,7 +15,6 @@ set(INCLUDE
     include/DeviceObjectBase.hpp
     include/DeviceObjectArchive.hpp
     include/EngineFactoryBase.hpp
-    include/EngineMemory.h
     include/FenceBase.hpp
     include/FramebufferBase.hpp
     include/IndexWrapper.hpp
@@ -92,7 +91,6 @@ set(SOURCE
     src/DeviceContextBase.cpp
     src/DeviceMemoryBase.cpp
     src/DeviceObjectArchive.cpp
-    src/EngineMemory.cpp
     src/EngineFactoryBase.cpp
     src/FramebufferBase.cpp
     src/GraphicsTypesX.cpp

Graphics/GraphicsEngineVulkan/src/PipelineResourceSignatureVkImpl.cpp

@@ -169,7 +169,7 @@ PipelineResourceSignatureVkImpl::PipelineResourceSignatureVkImpl(IReferenceCount
 void PipelineResourceSignatureVkImpl::CreateSetLayouts(const bool IsSerialized)
 {
     // Initialize static resource cache first
-    if (Uint32 NumStaticResStages = GetNumStaticResStages())
+    if (GetNumStaticResStages() > 0)
     {
         Uint32 StaticResourceCount = 0; // The total number of static resources in all stages
                                         // accounting for array sizes.

Tests/DiligentCoreTest/src/GraphicsEngine/PSOSerializerTest.cpp

@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019-2024 Diligent Graphics LLC
+ *  Copyright 2019-2025 Diligent Graphics LLC
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -25,14 +25,14 @@
  */
 
 #include "../../../../Graphics/GraphicsEngine/include/PSOSerializer.hpp"
-#include "../../../../Graphics/GraphicsEngine/include/EngineMemory.h"
 
 #include <algorithm>
 #include <array>
 #include <cstring>
 
 #include "gtest/gtest.h"
 
+#include "EngineMemory.h"
 #include "PipelineState.h"
 #include "Serializer.hpp"