From fcf714029382b2b2e4db8f5a54466810d52227c5 Mon Sep 17 00:00:00 2001
From: goat <16760685+goaaats@users.noreply.github.com>
Date: Sun, 10 Oct 2021 19:27:41 +0200
Subject: [PATCH] fix: revert d3d11 GShade workaround, not reliable

---
 Dalamud/Game/Framework.cs                             | 1 +
 Dalamud/Game/Internal/DXGI/SwapChainVtableResolver.cs | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Dalamud/Game/Framework.cs b/Dalamud/Game/Framework.cs
index 2ba584ae1..66c4a462a 100644
--- a/Dalamud/Game/Framework.cs
+++ b/Dalamud/Game/Framework.cs
@@ -176,6 +176,7 @@ namespace Dalamud.Game
             if (!dalamud.IsReady)
                 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)
                 dalamud.LoadTier3();
 
diff --git a/Dalamud/Game/Internal/DXGI/SwapChainVtableResolver.cs b/Dalamud/Game/Internal/DXGI/SwapChainVtableResolver.cs
index 8fb9c4aec..78abae0f0 100644
--- a/Dalamud/Game/Internal/DXGI/SwapChainVtableResolver.cs
+++ b/Dalamud/Game/Internal/DXGI/SwapChainVtableResolver.cs
@@ -39,7 +39,7 @@ namespace Dalamud.Game.Internal.DXGI
             var modules = Process.GetCurrentProcess().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
                     // var p = processModule.BaseAddress + 0x82C7E0; // DXGISwapChain::Present