From c9b41e3c538076fafcad2a1e39b0bd66b5782cc7 Mon Sep 17 00:00:00 2001 From: SuuperW Date: Sat, 18 Aug 2018 11:22:15 -0500 Subject: [PATCH] Fix regression from commit 2acfdbe; setting display method to DDraw HW/SW did not actually set ddraw.systemMemory --- desmume/src/frontend/windows/main.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/desmume/src/frontend/windows/main.cpp b/desmume/src/frontend/windows/main.cpp index 2f100c695..94fb1c6f2 100755 --- a/desmume/src/frontend/windows/main.cpp +++ b/desmume/src/frontend/windows/main.cpp @@ -5106,6 +5106,7 @@ DOKEYDOWN: { Lock lock (win_backbuffer_sync); displayMethod = DISPMETHOD_DDRAW_HW; + ddraw.systemMemory = false; WritePrivateProfileInt("Video","Display Method", DISPMETHOD_DDRAW_HW, IniName); ddraw.createSurfaces(hwnd); } @@ -5115,6 +5116,7 @@ DOKEYDOWN: { Lock lock (win_backbuffer_sync); displayMethod = DISPMETHOD_DDRAW_SW; + ddraw.systemMemory = true; WritePrivateProfileInt("Video","Display Method", DISPMETHOD_DDRAW_SW, IniName); ddraw.createSurfaces(hwnd); } @@ -6723,5 +6725,4 @@ void SetStyle(u32 dws) gldisplay.filter = GetStyle()&DWS_FILTER; gldisplay.setvsync(!!(GetStyle()&DWS_VSYNC)); ddraw.vSync = GetStyle()&DWS_VSYNC; - ddraw.systemMemory = GetStyle()&DWS_DDRAW_SW; }