Emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-04-02 11:01:50 -04:00
Code Issues Projects Releases Packages Wiki Activity

Add Vulkan to Win32 menu. disable gfx logging in debug by default.

Browse source
This commit is contained in:
Henrik Rydgard 2016-01-10 13:08:19 +01:00
parent 4c281f16ac
commit 52e7f06908
3 changed files with 30 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
Windows/MainWindowMenu.cpp
View file

@ -701,6 +701,12 @@ namespace MainWindow {
PostMessage(MainWindow::GetHWND(), WM_CLOSE, 0, 0); PostMessage(MainWindow::GetHWND(), WM_CLOSE, 0, 0);
break; break;
case ID_OPTIONS_VULKAN:
g_Config.iGPUBackend = GPU_BACKEND_VULKAN;
g_Config.bRestartRequired = true;
PostMessage(MainWindow::GetHWND(), WM_CLOSE, 0, 0);
break;
case ID_OPTIONS_NONBUFFEREDRENDERING: setRenderingMode(FB_NON_BUFFERED_MODE); break; case ID_OPTIONS_NONBUFFEREDRENDERING: setRenderingMode(FB_NON_BUFFERED_MODE); break;
case ID_OPTIONS_BUFFEREDRENDERING: setRenderingMode(FB_BUFFERED_MODE); break; case ID_OPTIONS_BUFFEREDRENDERING: setRenderingMode(FB_BUFFERED_MODE); break;
case ID_OPTIONS_READFBOTOMEMORYCPU: setRenderingMode(FB_READFBOMEMORY_CPU); break; case ID_OPTIONS_READFBOTOMEMORYCPU: setRenderingMode(FB_READFBOMEMORY_CPU); break;
@ -1144,14 +1150,31 @@ namespace MainWindow {
CheckMenuItem(menu, savestateSlot[i], MF_BYCOMMAND | ((i == g_Config.iCurrentStateSlot) ? MF_CHECKED : MF_UNCHECKED)); CheckMenuItem(menu, savestateSlot[i], MF_BYCOMMAND | ((i == g_Config.iCurrentStateSlot) ? MF_CHECKED : MF_UNCHECKED));
} }
if (g_Config.iGPUBackend == GPU_BACKEND_DIRECT3D9) { switch (g_Config.iGPUBackend) {
case GPU_BACKEND_DIRECT3D9:
EnableMenuItem(menu, ID_OPTIONS_DIRECT3D9, MF_GRAYED); EnableMenuItem(menu, ID_OPTIONS_DIRECT3D9, MF_GRAYED);
CheckMenuItem(menu, ID_OPTIONS_DIRECT3D9, MF_CHECKED);
EnableMenuItem(menu, ID_OPTIONS_OPENGL, MF_ENABLED); EnableMenuItem(menu, ID_OPTIONS_OPENGL, MF_ENABLED);
} else { EnableMenuItem(menu, ID_OPTIONS_VULKAN, MF_ENABLED);
EnableMenuItem(menu, ID_OPTIONS_OPENGL, MF_GRAYED); CheckMenuItem(menu, ID_OPTIONS_DIRECT3D9, MF_CHECKED);
CheckMenuItem(menu, ID_OPTIONS_OPENGL, MF_CHECKED); CheckMenuItem(menu, ID_OPTIONS_OPENGL, MF_UNCHECKED);
CheckMenuItem(menu, ID_OPTIONS_VULKAN, MF_UNCHECKED);
break;
case GPU_BACKEND_OPENGL:
EnableMenuItem(menu, ID_OPTIONS_DIRECT3D9, MF_ENABLED); EnableMenuItem(menu, ID_OPTIONS_DIRECT3D9, MF_ENABLED);
EnableMenuItem(menu, ID_OPTIONS_OPENGL, MF_GRAYED);
EnableMenuItem(menu, ID_OPTIONS_VULKAN, MF_ENABLED);
CheckMenuItem(menu, ID_OPTIONS_DIRECT3D9, MF_UNCHECKED);
CheckMenuItem(menu, ID_OPTIONS_OPENGL, MF_CHECKED);
CheckMenuItem(menu, ID_OPTIONS_VULKAN, MF_UNCHECKED);
break;
case GPU_BACKEND_VULKAN:
EnableMenuItem(menu, ID_OPTIONS_DIRECT3D9, MF_ENABLED);
EnableMenuItem(menu, ID_OPTIONS_OPENGL, MF_ENABLED);
EnableMenuItem(menu, ID_OPTIONS_VULKAN, MF_GRAYED);
CheckMenuItem(menu, ID_OPTIONS_DIRECT3D9, MF_UNCHECKED);
CheckMenuItem(menu, ID_OPTIONS_OPENGL, MF_UNCHECKED);
CheckMenuItem(menu, ID_OPTIONS_VULKAN, MF_CHECKED);
break;
} }
UpdateDynamicMenuCheckmarks(menu); UpdateDynamicMenuCheckmarks(menu);

1
Windows/ppsspp.rc
View file

@ -481,6 +481,7 @@ BEGIN
BEGIN BEGIN
MENUITEM "Direct3D9" ID_OPTIONS_DIRECT3D9 MENUITEM "Direct3D9" ID_OPTIONS_DIRECT3D9
MENUITEM "OpenGL" ID_OPTIONS_OPENGL MENUITEM "OpenGL" ID_OPTIONS_OPENGL
MENUITEM "Vulkan" ID_OPTIONS_VULKAN
END END
POPUP "Rendering Mode" POPUP "Rendering Mode"

1
Windows/resource.h
View file

@ -323,6 +323,7 @@
#define ID_EMULATION_ROTATION_H_R 40158 #define ID_EMULATION_ROTATION_H_R 40158
#define ID_EMULATION_ROTATION_V_R 40159 #define ID_EMULATION_ROTATION_V_R 40159
#define ID_OPTIONS_DISPLAY_LAYOUT 40160 #define ID_OPTIONS_DISPLAY_LAYOUT 40160
#define ID_OPTIONS_VULKAN 40161
// Dummy option to let the buffered rendering hotkey cycle through all the options. // Dummy option to let the buffered rendering hotkey cycle through all the options.
#define ID_OPTIONS_BUFFEREDRENDERINGDUMMY 40500 #define ID_OPTIONS_BUFFEREDRENDERINGDUMMY 40500