Merge branch 'master' of https://github.com/cdozdil/OptiScaler

Author: cdozdil

.github/ISSUE_TEMPLATE/crash-bug.md

@@ -13,7 +13,7 @@ assignees: ''
 *Example:* Cyberpunk 2077 (Steam), Avowed (GamePass/UWP)
 
 #### Mods and mod versions used 
-*Example:* OptiScaler_v0.7.7-pre7_20250316 + Fakenvapi 1.2.1 + Nukem 0.122 - Optiscaler version most important
+*Example:* OptiScaler_v0.7.7-pre7_20250316 + Fakenvapi 1.2.1 + Nukem 0.122 - OptiScaler version most important
 
 #### GPU
 *Example:*  RTX 4070Ti, RX 7800XT
@@ -39,6 +39,6 @@ Also please mention in description which upscaler inputs are used (which upscale
 *Example:* I am using DLSS in game settings and the game is crashing when switching to FSR4.
 
 #### I have attached
- - [ ] OptiScaler.log _(set `LogLevel=0` and `LogToFile=true` in Optiscaler.ini, zip it if too big)_
+ - [ ] OptiScaler.log _(set `LogLevel=0` and `LogToFile=true` in OptiScaler.ini, zip it if too big)_
  - [ ] Screenshot of game folder _(where you placed Opti)_
  - [ ] Screenshot of Opti overlay in-game _(opens with shortcut, default Insert)_

Config.md

@@ -65,7 +65,7 @@ For DirectX11 with `fsr21_12`, `fsr22_12` and `xess` upscaler options, OptiScale
 
 ```ini
 [Dx11withDx12]
-; Syncing meathods for Dx11 with Dx12
+; Syncing methods for Dx11 with Dx12
 ;
 ; Valid values are;
 ;	0 - No syncing                                  (fastest, most prone to errors)

OptiScaler Setup.bat

@@ -88,12 +88,71 @@ if exist %selectedFilename% (
 
     echo.
     if "!overwriteChoice!"=="y" (
-        goto completeSetup
+        goto checkWine
     )
 
     goto selectFilename
 )
 
+REM Wine doesn't support powershell
+:checkWine
+reg query HKEY_CURRENT_USER\Software\Wine >nul 2>&1
+if %errorlevel%==0 (
+    echo.
+    echo Using wine, skipping over spoofing checks.
+    echo If you need, you can disable spoofing by setting Dxgi=false in the config
+    echo.
+    pause
+    goto completeSetup
+) 
+
+if exist %windir%\system32\nvapi64.dll (
+    echo.
+    echo Nvidia driver files detected.
+    set isNvidia=true
+) else (
+    set isNvidia=false
+)
+
+REM Query user for GPU type
+echo.
+echo Are you using an Nvidia GPU or AMD/Intel GPU?
+echo [1] AMD/Intel
+echo [2] Nvidia
+if "%isNvidia%"=="true" (
+    set /p gpuChoice="Enter 1 or 2 (or press Enter for Nvidia): "
+) else (
+    set /p gpuChoice="Enter 1 or 2 (or press Enter for AMD/Intel): "
+)
+
+REM Skip spoofing if Nvidia
+if "%gpuChoice%"=="2" (
+    goto completeSetup
+)
+
+if "%gpuChoice%"=="" (
+    if "%isNvidia%"=="true" (
+        goto completeSetup
+    )
+)
+
+REM Query user for DLSS
+echo.
+echo Will you try to use DLSS inputs? (enables spoofing, required for DLSS FG, Reflex-^>AL2)
+echo [1] Yes
+echo [2] No
+set /p enablingSpoofing="Enter 1 or 2 (or press Enter for Yes): "
+
+set configFile=OptiScaler.ini
+if "%enablingSpoofing%"=="2" (
+    if not exist "%configFile%" (
+        echo Config file not found: %configFile%
+        pause
+    )
+
+    powershell -Command "(Get-Content '%configFile%') -replace 'Dxgi=auto', 'Dxgi=false' | Set-Content '%configFile%'"
+)
+
 :completeSetup
 REM Rename OptiScaler file
 echo.

OptiScaler.ini

@@ -166,15 +166,15 @@ FPTWaitForSingleObjectOnFence=auto
 ; -------------------------------------------------------
 [Inputs]
 ; -------------------------------------------------------
-; Optiscaler will hook (nvngx.dll) and use Dlss Inputs
+; OptiScaler will hook (nvngx.dll) and use Dlss Inputs
 ; true or false - Default (auto) is true
 Dlss=auto
 
-; Optiscaler will hook (libxess.dll) and use XeSS Inputs
+; OptiScaler will hook (libxess.dll) and use XeSS Inputs
 ; true or false - Default (auto) is true
 XeSS=auto
 
-; Optiscaler will hook and use Fsr2 Inputs
+; OptiScaler will hook and use Fsr2 Inputs
 ; true or false - Default (auto) is true
 Fsr2=auto
 
@@ -183,7 +183,7 @@ Fsr2=auto
 ; true or false - Default (auto) is false
 Fsr2Pattern=auto
 
-; Optiscaler will hook and use Fsr3 Inputs
+; OptiScaler will hook and use Fsr3 Inputs
 ; true or false - Default (auto) is true
 Fsr3=auto
 
@@ -192,7 +192,7 @@ Fsr3=auto
 ; true or false - Default (auto) is false
 Fsr3Pattern=auto
 
-; Optiscaler will hook (amd_fidelityfx_dx12.dll) and use FidelityFX Api Inputs
+; OptiScaler will hook (amd_fidelityfx_dx12.dll) and use FidelityFX Api Inputs
 ; true or false - Default (auto) is true
 Ffx=auto
 
@@ -229,12 +229,12 @@ CreateHeaps=auto
 NetworkModel=auto
 
 ; Override path of libxess.dll
-; Example - D:\Downloads\Optiscaler\libxess.dll
+; Example - D:\Downloads\OptiScaler\libxess.dll
 ; Default (auto) is same folder as mod dll 
 LibraryPath=auto
 
 ; Override path of libxess_dx11.dll
-; Example - D:\Downloads\Optiscaler\libxess_dx11.dll
+; Example - D:\Downloads\OptiScaler\libxess_dx11.dll
 ; Default (auto) is same folder as mod dll 
 Dx11LibraryPath=auto
 
@@ -327,7 +327,7 @@ FsrNonLinearPQ=auto
 
 ; Updates the DirectX 12 Agility SDK
 ; Enabling the use of FSR4 on Windows 10 in older titles like Cyberpunk 2077
-; You MUST copy D3D12_Optiscaler folder next to games exe!
+; You MUST copy D3D12_OptiScaler folder next to games exe!
 ; true or false - Default (auto) is false
 FsrAgilitySDKUpgrade=auto
 
@@ -337,7 +337,7 @@ FsrAgilitySDKUpgrade=auto
 FfxDx12Path=auto
 
 ; Override path of amd_fidelityfx_vk.dll
-; Example - D:\Downloads\Optiscaler\amd_fidelityfx_vk.dll
+; Example - D:\Downloads\OptiScaler\amd_fidelityfx_vk.dll
 ; Default (auto) is same folder as mod dll 
 FfxVkPath=auto
 
@@ -362,7 +362,7 @@ FeaturePath=auto
 
 
 ; Override path of nvngx_dlss.dll
-; Example - D:\Downloads\Optiscaler\nvngx_dlss.dll
+; Example - D:\Downloads\OptiScaler\nvngx_dlss.dll
 ; Default (auto) is means override disabled
 NVNGX_DLSS_Path=auto
 
@@ -555,7 +555,7 @@ LoadAsiPlugins=auto
 LoadSpecialK=auto
 
 ; Loads Reshade64.dll from game's exe folder
-; Rename Reshade dll to ReShade64.dll, put next to Optiscaler and set to true
+; Rename Reshade dll to ReShade64.dll, put next to OptiScaler and set to true
 ; true or false - Default (auto) is false
 LoadReshade=auto
 

OptiScaler/hooks/HooksDx.cpp

@@ -497,6 +497,11 @@ static HRESULT Present(IDXGISwapChain* pSwapChain, UINT SyncInterval, UINT Flags
         return presentResult;
     }
 
+    // Tick feature to let it know if it's frozen
+    if (auto currentFeature = State::Instance().currentFeature; currentFeature != nullptr)
+        currentFeature->TickFrozenCheck();
+
+    // Draw overlay
     MenuOverlayDx::Present(pSwapChain, SyncInterval, Flags, pPresentParameters, pDevice, hWnd, isUWP);
 
     if (State::Instance().activeFgType == OptiFG)

OptiScaler/hooks/HooksVk.cpp

@@ -173,6 +173,10 @@ static VkResult hkvkQueuePresentKHR(VkQueue queue, VkPresentInfoKHR* pPresentInf
 
     State::Instance().swapchainApi = Vulkan;
 
+    // Tick feature to let it know if it's frozen
+    if (auto currentFeature = State::Instance().currentFeature; currentFeature != nullptr)
+        currentFeature->TickFrozenCheck();
+
     // render menu if needed
     if (!MenuOverlayVk::QueuePresent(queue, pPresentInfo))
     {