RenderStateCacheCreateInfo takes IArchiverFactory *pArchiverFactory as input.

Author: hzqst

Graphics/GraphicsTools/interface/RenderStateCache.h

@@ -30,6 +30,7 @@
 /// Defines Diligent::IRenderStateCache interface
 
 #include "../../GraphicsEngine/interface/RenderDevice.h"
+#include "ArchiverFactory.h"
 
 DILIGENT_BEGIN_NAMESPACE(Diligent)
 
@@ -76,6 +77,9 @@ struct RenderStateCacheCreateInfo
     /// shaders. If null, original source factory will be used.
     IShaderSourceInputStreamFactory* pReloadSource DEFAULT_INITIALIZER(nullptr);
 
+    /// Let user decide how to get archiver factory, either Load DLL or static link
+    IArchiverFactory* pArchiverFactory DEFAULT_INITIALIZER(nullptr);
+
 #if DILIGENT_CPP_INTERFACE
     constexpr RenderStateCacheCreateInfo() noexcept
     {}

Graphics/GraphicsTools/src/RenderStateCacheImpl.cpp

@@ -38,8 +38,6 @@
 
 #include "Archiver.h"
 #include "Dearchiver.h"
-#include "ArchiverFactory.h"
-#include "ArchiverFactoryLoader.h"
 
 #include "PipelineStateBase.hpp"
 #include "RefCntAutoPtr.hpp"
@@ -179,16 +177,8 @@ RenderStateCacheImpl::RenderStateCacheImpl(IReferenceCounters*               pRe
     if (CreateInfo.pDevice == nullptr)
         LOG_ERROR_AND_THROW("CreateInfo.pDevice must not be null");
 
-    IArchiverFactory* pArchiverFactory = nullptr;
-#if EXPLICITLY_LOAD_ARCHIVER_FACTORY_DLL
-    auto GetArchiverFactory = LoadArchiverFactory();
-    if (GetArchiverFactory != nullptr)
-    {
-        pArchiverFactory = GetArchiverFactory();
-    }
-#else
-    pArchiverFactory       = GetArchiverFactory();
-#endif
+    IArchiverFactory* pArchiverFactory = CreateInfo.pArchiverFactory;
+
     VERIFY_EXPR(pArchiverFactory != nullptr);
 
     SerializationDeviceCreateInfo SerializationDeviceCI;
@@ -964,6 +954,11 @@ Uint32 RenderStateCacheImpl::Reload(ReloadGraphicsPipelineCallbackType ReloadGra
 
 static constexpr char RenderStateCacheFileExtension[] = ".diligentcache";
 
+//Fix <Windows.h> conflict
+#ifdef CreateDirectory
+#    undef CreateDirectory
+#endif
+
 std::string GetRenderStateCacheFilePath(const char* CacheLocation, const char* AppName, RENDER_DEVICE_TYPE DeviceType)
 {
     if (CacheLocation == nullptr)