Merge pull request #13072 from hrydgard/fix-duplicate-frames-freeze

Disable the "Duplicate frames" feature if frameskip != 0.
hrydgard · Jun 28, 2020 · 4569ca6 · 4569ca6
2 parents 63ead85 + df6f216
commit 4569ca6
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/Core/HLE/sceDisplay.cpp b/Core/HLE/sceDisplay.cpp
@@ -754,12 +754,15 @@ void __DisplayFlip(int cyclesLate) {
 	// Also let's always flip for animated shaders.
 	const ShaderInfo *shaderInfo = g_Config.sPostShaderName == "Off" ? nullptr : GetPostShaderInfo(g_Config.sPostShaderName);
 	bool postEffectRequiresFlip = false;
+
+	bool duplicateFrames = g_Config.bRenderDuplicateFrames && g_Config.iFrameSkip == 0;
+
 	// postEffectRequiresFlip is not compatible with frameskip unthrottling, see #12325.
 	if (g_Config.iRenderingMode != FB_NON_BUFFERED_MODE && !(g_Config.bFrameSkipUnthrottle && !FrameTimingThrottled())) {
 		if (shaderInfo) {
-			postEffectRequiresFlip = (shaderInfo->requires60fps || g_Config.bRenderDuplicateFrames);
+			postEffectRequiresFlip = (shaderInfo->requires60fps || duplicateFrames);
 		} else {
-			postEffectRequiresFlip = g_Config.bRenderDuplicateFrames;
+			postEffectRequiresFlip = duplicateFrames;
 		}
 	}
 

diff --git a/UI/GameSettingsScreen.cpp b/UI/GameSettingsScreen.cpp
@@ -356,6 +356,9 @@ void GameSettingsScreen::CreateViews() {
 		settingInfo_->Show(gr->T("RenderDuplicateFrames Tip", "Can make framerate smoother in games that run at lower framerates"), e.v);
 		return UI::EVENT_CONTINUE;
 	});
+	frameDuplication->SetEnabledFunc([]() -> bool {
+		return g_Config.iFrameSkip == 0;
+	});
 
 	if (GetGPUBackend() == GPUBackend::VULKAN || GetGPUBackend() == GPUBackend::OPENGL) {
 		static const char *bufferOptions[] = { "No buffer", "Up to 1", "Up to 2" };