reshade: Add gamescope_always_paint flag

ValveSoftware · Jan 2, 2025 · f873ec7 · f873ec7
1 parent 22b0ec8
commit f873ec7
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 2 deletions.
diff --git a/src/rendervulkan.cpp b/src/rendervulkan.cpp
@@ -3856,12 +3856,15 @@ std::optional<uint64_t> vulkan_screenshot( const struct FrameInfo_t *frameInfo,
 extern std::string g_reshade_effect;
 extern uint32_t g_reshade_technique_idx;
 
+ReshadeEffectPipeline *g_pLastReshadeEffect = nullptr;
+
 std::optional<uint64_t> vulkan_composite( struct FrameInfo_t *frameInfo, gamescope::Rc<CVulkanTexture> pPipewireTexture, bool partial, gamescope::Rc<CVulkanTexture> pOutputOverride, bool increment, std::unique_ptr<CVulkanCmdBuffer> pInCommandBuffer )
 {
 	EOTF outputTF = frameInfo->outputEncodingEOTF;
 	if (!frameInfo->applyOutputColorMgmt)
 		outputTF = EOTF_Count; //Disable blending stuff.
 
+	g_pLastReshadeEffect = nullptr;
 	if (!g_reshade_effect.empty())
 	{
 		if (frameInfo->layers[0].tex)
@@ -3877,6 +3880,8 @@ std::optional<uint64_t> vulkan_composite( struct FrameInfo_t *frameInfo, gamesco
 			};
 
 			ReshadeEffectPipeline* pipeline = g_reshadeManager.pipeline(key);
+			g_pLastReshadeEffect = pipeline;
+
 			if (pipeline != nullptr)
 			{
 				uint64_t seq = pipeline->execute(frameInfo->layers[0].tex, &frameInfo->layers[0].tex);

diff --git a/src/reshade_effect_manager.cpp b/src/reshade_effect_manager.cpp
@@ -641,7 +641,7 @@ DataUniform::~DataUniform()
 {
 }
 
-static std::vector<std::shared_ptr<ReshadeUniform>> createReshadeUniforms(const reshadefx::module& module)
+static std::vector<std::shared_ptr<ReshadeUniform>> createReshadeUniforms(const reshadefx::module& module, uint32_t *pFlags)
 {
     std::vector<std::shared_ptr<ReshadeUniform>> uniforms;
     for (auto& uniform : module.uniforms)
@@ -703,6 +703,10 @@ static std::vector<std::shared_ptr<ReshadeUniform>> createReshadeUniforms(const
             {
                 uniforms.push_back(std::make_shared<DepthUniform>(uniform));
             }
+            else if (source == "gamescope_always_paint")
+            {
+                ( *pFlags ) |= ReshadeEffectFlag::AlwaysScanout;
+            }
             else if (!source.empty())
             {
                 uniforms.push_back(std::make_shared<RuntimeUniform>(uniform));
@@ -1089,7 +1093,7 @@ bool ReshadeEffectPipeline::init(CVulkanDevice *device, const ReshadeEffectKey &
     }
 
     // Create Uniforms
-    m_uniforms = createReshadeUniforms(*m_module);
+    m_uniforms = createReshadeUniforms(*m_module, &m_flags);
 
     // Create Textures
     {

diff --git a/src/reshade_effect_manager.hpp b/src/reshade_effect_manager.hpp
@@ -40,6 +40,12 @@ enum ReshadeDescriptorSets
     GAMESCOPE_RESHADE_DESCRIPTOR_SET_COUNT,
 };
 
+namespace ReshadeEffectFlag
+{
+    static constexpr uint32_t AlwaysScanout = 1u << 0;
+}
+using ReshadeEffectFlags = uint32_t;
+
 class ReshadeEffectPipeline
 {
 public:
@@ -53,6 +59,8 @@ class ReshadeEffectPipeline
     const ReshadeEffectKey& key() const { return m_key; }
     reshadefx::module *module() { return m_module.get(); }
 
+    ReshadeEffectFlags flags() const { return m_flags; }
+
     gamescope::Rc<CVulkanTexture> findTexture(std::string_view name);
 
 private:
@@ -76,6 +84,8 @@ class ReshadeEffectPipeline
 
     VkDescriptorSetLayout m_descriptorSetLayouts[GAMESCOPE_RESHADE_DESCRIPTOR_SET_COUNT] = {};
     VkDescriptorSet m_descriptorSets[GAMESCOPE_RESHADE_DESCRIPTOR_SET_COUNT] = {};
+
+    ReshadeEffectFlags m_flags = 0;
 };
 
 class ReshadeEffectManager

diff --git a/src/steamcompmgr.cpp b/src/steamcompmgr.cpp
@@ -91,6 +91,7 @@
 #include "convar.h"
 #include "refresh_rate.h"
 #include "commit.h"
+#include "reshade_effect_manager.hpp"
 #include "BufferMemo.h"
 #include "Utils/Process.h"
 #include "Utils/Algorithm.h"
@@ -159,6 +160,7 @@ std::string clipboard;
 std::string primarySelection;
 
 std::string g_reshade_effect{};
+extern ReshadeEffectPipeline *g_pLastReshadeEffect;
 uint32_t g_reshade_technique_idx = 0;
 
 bool g_bSteamIsActiveWindow = false;
@@ -7936,6 +7938,11 @@ steamcompmgr_main(int argc, char **argv)
 		else
 			eFlipType = FlipType::Normal;
 
+		if ( g_pLastReshadeEffect && ( g_pLastReshadeEffect->flags() & ReshadeEffectFlag::AlwaysScanout ) )
+		{
+			eFlipType = FlipType::Normal;
+		}
+
 		bool bShouldPaint = false;
 
 		if ( GetBackend()->IsVisible() )
@@ -7996,6 +8003,11 @@ steamcompmgr_main(int argc, char **argv)
 			bShouldPaint = false;
 		}
 
+		if ( g_pLastReshadeEffect && ( g_pLastReshadeEffect->flags() & ReshadeEffectFlag::AlwaysScanout ) )
+		{
+			bShouldPaint = true;
+		}
+
 		if ( bShouldPaint )
 		{
 			paint_all( eFlipType == FlipType::Async );