Skip to content

fix: fix shadercache race condition #994

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

Merged
doodlum merged 2 commits into from
Mar 8, 2025
Merged

fix: fix shadercache race condition #994

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dc9786a
fix: fix shadercache race condition
doodlum Mar 8, 2025
f733004
style: 🎨 apply clang-format changes
doodlum Mar 8, 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
59 changes: 31 additions & 28 deletions src/Globals.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,37 @@ namespace globals
DX12SwapChain* dx12SwapChain = nullptr;
FidelityFX* fidelityFX = nullptr;

void OnInit()
{
shaderCache = &SIE::ShaderCache::Instance();
state = State::GetSingleton();
menu = Menu::GetSingleton();
deferred = Deferred::GetSingleton();
truePBR = TruePBR::GetSingleton();
streamline = Streamline::GetSingleton();
upscaling = Upscaling::GetSingleton();
dx12SwapChain = DX12SwapChain::GetSingleton();
fidelityFX = FidelityFX::GetSingleton();

features::cloudShadows = CloudShadows::GetSingleton();
features::dynamicCubemaps = DynamicCubemaps::GetSingleton();
features::extendedMaterials = ExtendedMaterials::GetSingleton();
features::grassCollision = GrassCollision::GetSingleton();
features::grassLighting = GrassLighting::GetSingleton();
features::lightLimitFix = LightLimitFix::GetSingleton();
features::screenSpaceGI = ScreenSpaceGI::GetSingleton();
features::screenSpaceShadows = ScreenSpaceShadows::GetSingleton();
features::skylighting = Skylighting::GetSingleton();
features::subsurfaceScattering = SubsurfaceScattering::GetSingleton();
features::terrainBlending = TerrainBlending::GetSingleton();
features::terrainShadows = TerrainShadows::GetSingleton();
features::volumetricLighting = VolumetricLighting::GetSingleton();
features::waterEffects = WaterEffects::GetSingleton();
features::wetnessEffects = WetnessEffects::GetSingleton();

features::llf::particleLights = ParticleLights::GetSingleton();
}

void ReInit()
{
{
Expand Down Expand Up @@ -133,34 +164,6 @@ namespace globals
d3d::device = reinterpret_cast<ID3D11Device*>(game::renderer->GetRuntimeData().forwarder);
d3d::context = reinterpret_cast<ID3D11DeviceContext*>(game::renderer->GetRuntimeData().context);
d3d::swapChain = reinterpret_cast<IDXGISwapChain*>(game::renderer->GetRuntimeData().renderWindows->swapChain);

state = State::GetSingleton();
menu = Menu::GetSingleton();
shaderCache = &SIE::ShaderCache::Instance();
deferred = Deferred::GetSingleton();
truePBR = TruePBR::GetSingleton();
streamline = Streamline::GetSingleton();
upscaling = Upscaling::GetSingleton();
dx12SwapChain = DX12SwapChain::GetSingleton();
fidelityFX = FidelityFX::GetSingleton();

features::cloudShadows = CloudShadows::GetSingleton();
features::dynamicCubemaps = DynamicCubemaps::GetSingleton();
features::extendedMaterials = ExtendedMaterials::GetSingleton();
features::grassCollision = GrassCollision::GetSingleton();
features::grassLighting = GrassLighting::GetSingleton();
features::lightLimitFix = LightLimitFix::GetSingleton();
features::screenSpaceGI = ScreenSpaceGI::GetSingleton();
features::screenSpaceShadows = ScreenSpaceShadows::GetSingleton();
features::skylighting = Skylighting::GetSingleton();
features::subsurfaceScattering = SubsurfaceScattering::GetSingleton();
features::terrainBlending = TerrainBlending::GetSingleton();
features::terrainShadows = TerrainShadows::GetSingleton();
features::volumetricLighting = VolumetricLighting::GetSingleton();
features::waterEffects = WaterEffects::GetSingleton();
features::wetnessEffects = WetnessEffects::GetSingleton();

features::llf::particleLights = ParticleLights::GetSingleton();
}

void OnDataLoaded()
Expand Down
1 change: 1 addition & 0 deletions src/Globals.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,7 @@ namespace globals
extern DX12SwapChain* dx12SwapChain;
extern FidelityFX* fidelityFX;

void OnInit();
void ReInit();
void OnDataLoaded();
}
1 change: 1 addition & 0 deletions src/XSEPlugin.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,7 @@ bool Load()
auto messaging = SKSE::GetMessagingInterface();
messaging->RegisterListener("SKSE", MessageHandler);

globals::OnInit();
globals::ReInit();

auto state = globals::state;
Expand Down