anod/Luma3DS-autorun
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rosalina: fix rare screen filter race condition

Browse Source
This commit is contained in:
TuxSH 2023-01-21 20:32:57 +00:00
parent 8dd40158ca
commit ee9f283d4d
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sysmodules/rosalina/source/menu.c
View File

@ -255,8 +255,8 @@ void menuThreadMain(void)
if(isN3DS) if(isN3DS)
N3DSMenu_UpdateStatus(); N3DSMenu_UpdateStatus();
while (!isServiceUsable("ac:u") || !isServiceUsable("hid:USER")) while (!isServiceUsable("ac:u") || !isServiceUsable("hid:USER") || !isServiceUsable("gsp::Gpu"))
svcSleepThread(500 * 1000 * 1000LL); svcSleepThread(250 * 1000 * 1000LL);
s64 out = 0; s64 out = 0;

13
sysmodules/rosalina/source/menus/screen_filters.c
View File

@ -153,13 +153,26 @@ void ScreenFiltersMenu_Set##name(void)\
void ScreenFiltersMenu_RestoreSettings(void) void ScreenFiltersMenu_RestoreSettings(void)
{ {
// Precondition: menu has not been entered
// Not initialized/default: return // Not initialized/default: return
if (ScreenFiltersMenu_IsDefaultSettings()) if (ScreenFiltersMenu_IsDefaultSettings())
return; return;
// Wait for GSP to restore the CCT table // Wait for GSP to restore the CCT table
svcSleepThread(20 * 1000 * 1000LL); svcSleepThread(20 * 1000 * 1000LL);
// Pause GSP, then wait a bit to ensure GPU commands complete
// We need to ensure no GPU stuff is running when changing
// the gamma table (otherwise colors become and stay glitched).
svcKernelSetState(0x10000, 2);
svcSleepThread(5 * 1000 * 100LL);
ScreenFiltersMenu_ApplyColorSettings(); ScreenFiltersMenu_ApplyColorSettings();
// Unpause GSP
svcKernelSetState(0x10000, 2);
svcSleepThread(5 * 1000 * 100LL);
} }
DEF_CCT_SETTER(6500, Default) DEF_CCT_SETTER(6500, Default)