Skip to content

Commit 5e96f57

Browse files
committed
Allow SK's ReShade AddOn to enable itself when RenoDX is present by default
1 parent b534edc commit 5e96f57

4 files changed

Lines changed: 18 additions & 6 deletions

File tree

CHANGELOG.txt

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,11 @@
1-
26.3.17.3
1+
26.3.17.4
2+
=========
3+
+ Allow SK's ReShade AddOn to enable itself when RenoDX is present by default.
4+
* Helps keep SK from post-processing ReShade's UI or being post-processed.
5+
+ Allow "Show OSD in Video Capture" option to be set from the control panel
6+
when SK's ReShade AddOn is active (was removed due to lack of space).
7+
8+
26.3.17.3
29
=========
310
+ Re-order ReShade unwrap code in D3D12 games to ensure that Reflex status
411
does not warn about "no draw calls captured."

include/SpecialK/DLL_VERSION.H

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
#define SK_YEAR 26
44
#define SK_MONTH 3
55
#define SK_DATE 17
6-
#define SK_REV_N 3
7-
#define SK_REV 3
6+
#define SK_REV_N 4
7+
#define SK_REV 4
88

99
#ifndef _A2
1010
#define _A2(a) #a

src/config.cpp

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7596,8 +7596,12 @@ SK_SaveConfig ( std::wstring name,
75967596
}
75977597

75987598
reshade_cfg.draw_first->store (config.reshade.draw_first);
7599-
reshade_cfg.unsafe_addons->store (config.reshade.allow_unsafe_addons);
7600-
reshade_cfg.allow_sk_addon_and_reno->store (config.reshade.allow_addon_with_reno);
7599+
7600+
if (SK_ReShade_HasRenoDX ())
7601+
{
7602+
reshade_cfg.unsafe_addons->store (config.reshade.allow_unsafe_addons);
7603+
reshade_cfg.allow_sk_addon_and_reno->store(config.reshade.allow_addon_with_reno);
7604+
}
76017605

76027606
notifications.location->store (config.notifications.location);
76037607
notifications.silent->store (config.notifications.silent);

src/control_panel/cfg_d3d11.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1576,7 +1576,8 @@ SK::ControlPanel::D3D11::Draw (void)
15761576

15771577
if (config.reshade.is_addon)
15781578
{
1579-
if (d3d11 && !indirect)
1579+
if (d3d11 && !indirect || ( ReadAcquire (&SK_DXGI_LiveWrappedSwapChains) != 0 ||
1580+
ReadAcquire (&SK_DXGI_LiveWrappedSwapChain1s) != 0 ))
15801581
ImGui::SameLine ();
15811582

15821583
if (ImGui::Checkbox ("Draw ReShade First", &config.reshade.draw_first))

0 commit comments

Comments
 (0)