feat(swapchain): prevent exclusive fullscreen

clshortfuse · Mar 16, 2024 · ae56ff6 · ae56ff6
1 parent af8905f
commit ae56ff6
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 16 deletions.
diff --git a/external/reshade b/external/reshade
diff --git a/src/common/swapChainUpgradeMod.hpp b/src/common/swapChainUpgradeMod.hpp
@@ -60,7 +60,6 @@ namespace SwapChainUpgradeMod {
     switch (desc.back_buffer.texture.format) {
       case reshade::api::format::r8g8b8a8_unorm:
       case reshade::api::format::r10g10b10a2_unorm:
-        needsSRGBPostProcess = true;
       case reshade::api::format::r8g8b8a8_unorm_srgb:
         desc.back_buffer.texture.format = targetFormat;
         break;
@@ -386,7 +385,7 @@ namespace SwapChainUpgradeMod {
     }
   }
 
-  void on_init_effect_runtime(reshade::api::effect_runtime* runtime) {
+  static void on_init_effect_runtime(reshade::api::effect_runtime* runtime) {
     currentEffectRuntime = runtime;
     reshade::log_message(reshade::log_level::info, "Effect runtime created.");
     if (currentColorSpace != reshade::api::color_space::unknown) {
@@ -395,22 +394,31 @@ namespace SwapChainUpgradeMod {
     }
   }
 
-  void on_destroy_effect_runtime(reshade::api::effect_runtime* runtime) {
+  static void on_destroy_effect_runtime(reshade::api::effect_runtime* runtime) {
     if (currentEffectRuntime = runtime) {
       currentEffectRuntime = nullptr;
     }
   }
 
-  static void on_present(
-    reshade::api::command_queue* queue,
-    reshade::api::swapchain* swapchain,
-    const reshade::api::rect* source_rect,
-    const reshade::api::rect* dest_rect,
-    uint32_t dirty_rect_count,
-    const reshade::api::rect* dirty_rects
-  ) {
-    if (!needsSRGBPostProcess) return;
-    // Enable RenoDXHelper
+  static bool on_set_fullscreen_state(reshade::api::swapchain* swapchain, bool fullscreen, void* hmonitor) {
+    if (!fullscreen) return false;
+    HWND outputWindow = (HWND)swapchain->get_hwnd();
+    if (outputWindow) {
+      auto backBufferDesc = swapchain->get_device()->get_resource_desc(swapchain->get_back_buffer(0));
+      // HMONITOR monitor = (HMONITOR)hmonitor;
+      uint32_t screenWidth = GetSystemMetrics(SM_CXSCREEN);
+      uint32_t screenHeight = GetSystemMetrics(SM_CYSCREEN);
+      uint32_t textureWidth = backBufferDesc.texture.width;
+      uint32_t textureHeight = backBufferDesc.texture.height;
+      uint32_t top = floor((screenHeight - textureHeight) / 2.f);
+      uint32_t left = floor((screenWidth - textureWidth) / 2.f);
+      reshade::log_message(reshade::log_level::info, "Preventing fullscreen");
+      SetWindowLongPtr(outputWindow, GWL_STYLE, WS_VISIBLE | WS_POPUP);
+      SetWindowPos(outputWindow, HWND_TOP, left, top, textureWidth, textureHeight, SWP_FRAMECHANGED);
+      SetForegroundWindow(outputWindow);
+    }
+
+    return true;
   }
 
   static void setUseHDR10(bool value = true) {
@@ -442,7 +450,8 @@ namespace SwapChainUpgradeMod {
         reshade::register_event<reshade::addon_event::destroy_device>(on_destroy_device);
         reshade::register_event<reshade::addon_event::init_effect_runtime>(on_init_effect_runtime);
         reshade::register_event<reshade::addon_event::destroy_effect_runtime>(on_destroy_effect_runtime);
-        reshade::register_event<reshade::addon_event::present>(on_present);
+
+        reshade::register_event<reshade::addon_event::set_fullscreen_state>(on_set_fullscreen_state);
 
         break;
       case DLL_PROCESS_DETACH:
@@ -453,7 +462,6 @@ namespace SwapChainUpgradeMod {
         reshade::unregister_event<reshade::addon_event::destroy_device>(on_destroy_device);
         reshade::unregister_event<reshade::addon_event::init_effect_runtime>(on_init_effect_runtime);
         reshade::unregister_event<reshade::addon_event::destroy_effect_runtime>(on_destroy_effect_runtime);
-        reshade::unregister_event<reshade::addon_event::present>(on_present);
         break;
     }
   }
+16 −11		examples/09-depth/generic_depth.cpp
+17 −2		include/reshade_events.hpp
+33 −5		setup/MainWindow.xaml.cs
+2 −0		setup/Pages/SelectAddonsPage.xaml.cs
+2 −2		setup/Pages/SelectEffectsPage.xaml.cs
+1 −0		source/addon_manager.cpp
+1 −0		source/d3d11/d3d11_device_context.hpp
+1 −0		source/d3d11/d3d11_impl_swapchain.hpp
+1 −0		source/d3d11/d3d11on12_device.hpp
+1 −1		source/d3d12/d3d12_device.cpp
+1 −0		source/d3d12/d3d12_impl_swapchain.hpp
+1 −1		source/d3d9/d3d9_impl_device.hpp
+2 −1		source/d3d9/d3d9_resource.hpp
+4 −0		source/d3d9/d3d9_swapchain.cpp
+1 −0		source/d3d9/d3d9on12_device.hpp
+43 −3		source/dxgi/dxgi_swapchain.cpp
+2 −1		source/dxgi/dxgi_swapchain.hpp
+2 −4		source/effect_codegen.hpp
+54 −40		source/effect_codegen_glsl.cpp
+84 −72		source/effect_codegen_hlsl.cpp
+18 −18		source/effect_codegen_spirv.cpp
+6 −3		source/effect_module.hpp
+2 −2		source/effect_parser.hpp
+132 −22		source/effect_parser_stmt.cpp
+73 −30		source/effect_preprocessor.cpp
+1 −1		source/lockfree_linear_map.hpp
+7 −7		source/runtime.cpp
+2 −2		source/runtime_gui.cpp
+4 −0		source/vulkan/vulkan_hooks.cpp
+73 −32		source/vulkan/vulkan_hooks_device.cpp
+14 −13		source/vulkan/vulkan_impl_device.hpp
+6 −4		source/vulkan/vulkan_impl_swapchain.hpp