Skip to content

RenderStateCache: takes pArchiverFactory as input in CreateInfo, let user decide how to get pArchiverFactory #700

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 5 commits into from
Closed

RenderStateCache: takes pArchiverFactory as input in CreateInfo, let user decide how to get pArchiverFactory #700

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
bc4e7bb
Archiver DLL: bring CreateRenderStateCache in
hzqst Aug 18, 2025
b672de0
Fix unittest
hzqst Aug 18, 2025
72633aa
Restore Archiver modification
hzqst Aug 18, 2025
7d9b851
RenderStateCacheCreateInfo takes IArchiverFactory *pArchiverFactory a…
hzqst Aug 18, 2025
6a99883
Fix compile error on linux
hzqst Aug 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions Graphics/GraphicsTools/interface/RenderStateCache.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
/// Defines Diligent::IRenderStateCache interface

#include "../../GraphicsEngine/interface/RenderDevice.h"
#include "../../Archiver/interface/ArchiverFactory.h"

DILIGENT_BEGIN_NAMESPACE(Diligent)

Expand Down Expand Up @@ -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
{}
Expand Down
19 changes: 7 additions & 12 deletions Graphics/GraphicsTools/src/RenderStateCacheImpl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,6 @@

#include "Archiver.h"
#include "Dearchiver.h"
#include "ArchiverFactory.h"
#include "ArchiverFactoryLoader.h"

#include "PipelineStateBase.hpp"
#include "RefCntAutoPtr.hpp"
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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)
Expand Down