Merge branch 'master' into feature_openxr_stereo

This commit is contained in:
Lubos committed 2022-09-01 18:09:21 +02:00
commit 00aaf9e1a6
62 files changed
+1034 -550

No files matched your search

+1 -1
View File
@@ -508,7 +508,7 @@ void GameSettingsScreen::CreateViews() {
});
texSecondary_->SetDisabledPtr(&g_Config.bSoftwareRendering);
CheckBox *framebufferSlowEffects = graphicsSettings->Add(new CheckBox(&g_Config.bDisableSlowFramebufEffects, gr->T("Disable slower effects (speedup)")));
CheckBox *framebufferSlowEffects = graphicsSettings->Add(new CheckBox(&g_Config.bDisableShaderBlending, gr->T("Disable slower effects (speedup)")));
framebufferSlowEffects->SetDisabledPtr(&g_Config.bSoftwareRendering);
// Seems solid, so we hide the setting.