ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2025-12-13 12:14:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

fix: revert d3d11 GShade workaround, not reliable

Browse source
This commit is contained in:
goat 2021-10-10 19:27:41 +02:00
parent ca7d051c39
commit fcf7140293
No known key found for this signature in database
GPG key ID: 7773BB5B43BA52E5
2 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Dalamud/Game/Framework.cs
View file

@ -176,6 +176,7 @@ namespace Dalamud.Game
if (!dalamud.IsReady) if (!dalamud.IsReady)
dalamud.LoadTier2(); dalamud.LoadTier2();
// Plugins expect the interface to be available and ready, so we need to wait with plugins until we have init'd ImGui
if (!dalamud.IsLoadedPluginSystem && Service<InterfaceManager>.GetNullable()?.IsReady == true) if (!dalamud.IsLoadedPluginSystem && Service<InterfaceManager>.GetNullable()?.IsReady == true)
dalamud.LoadTier3(); dalamud.LoadTier3();

2
Dalamud/Game/Internal/DXGI/SwapChainVtableResolver.cs
View file

@ -39,7 +39,7 @@ namespace Dalamud.Game.Internal.DXGI
var modules = Process.GetCurrentProcess().Modules; var modules = Process.GetCurrentProcess().Modules;
foreach (ProcessModule processModule in modules) foreach (ProcessModule processModule in modules)
{ {
if (processModule.FileName != null && (processModule.FileName.EndsWith("game\\dxgi.dll") || processModule.FileName.EndsWith("game\\d3d11.dll"))) if (processModule.FileName != null && processModule.FileName.EndsWith("game\\dxgi.dll"))
{ {
// reshade master@4232872 RVA // reshade master@4232872 RVA
// var p = processModule.BaseAddress + 0x82C7E0; // DXGISwapChain::Present // var p = processModule.BaseAddress + 0x82C7E0; // DXGISwapChain::Present