merge fix

cdozdil · Feb 17, 2024 · 9a7eef7 · 9a7eef7
1 parent 8397aa0
commit 9a7eef7
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 0 deletions.
diff --git a/CyberXeSS/Config.cpp b/CyberXeSS/Config.cpp
@@ -80,6 +80,7 @@ void Config::Reload()
 		}
 
 		DisableReactiveMask = readBool("Hotfix", "DisableReactiveMask");
+		ColorResourceBarrier = readBool("Hotfix", "ColorResourceBarrier");
 	}
 }
 

diff --git a/CyberXeSS/Config.h b/CyberXeSS/Config.h
@@ -48,6 +48,7 @@ class Config
 
 	//Hotfix for Steam Deck
 	std::optional<bool> DisableReactiveMask;
+	std::optional<bool> ColorResourceBarrier;
 
 	void Reload();
 

diff --git a/CyberXeSS/CyberXess.h b/CyberXeSS/CyberXess.h
@@ -752,6 +752,17 @@ class FeatureContext
 		if (params.pColorTexture)
 		{
 			spdlog::debug("FeatureContext::XeSSExecuteDx12 Color exist..");
+
+			if (instance->MyConfig->ColorResourceBarrier.value_or(false))
+			{
+				D3D12_RESOURCE_BARRIER barrier = {};
+				barrier.Type = D3D12_RESOURCE_BARRIER_TYPE_TRANSITION;
+				barrier.Transition.pResource = params.pColorTexture;
+				barrier.Transition.StateBefore = D3D12_RESOURCE_STATE_COMMON;
+				barrier.Transition.StateBefore = D3D12_RESOURCE_STATE_NON_PIXEL_SHADER_RESOURCE;
+				barrier.Transition.Subresource = 0;
+				commandList->ResourceBarrier(1, &barrier);
+			}
 		}
 		else
 		{
-Original file line number
+Diff line change
@@ Expand Up / @@ -80,6 +80,7 @@ void Config::Reload() @@
     		}
     		DisableReactiveMask = readBool("Hotfix", "DisableReactiveMask");
+    		ColorResourceBarrier = readBool("Hotfix", "ColorResourceBarrier");
     	}
     }
@@ Expand Down @@