From 48ef1ae8ca7cd133bc35bc1b81027f4d44508311 Mon Sep 17 00:00:00 2001 From: "Unknown W. Brackets" Date: Tue, 5 Jan 2016 23:08:20 -0800 Subject: [PATCH] Change Win UI constants to use D3D9 not DX. --- Windows/MainWindowMenu.cpp | 10 +++++----- Windows/ppsspp.rc | 2 +- Windows/resource.h | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Windows/MainWindowMenu.cpp b/Windows/MainWindowMenu.cpp index 9e87c9d83d..d628ad048b 100644 --- a/Windows/MainWindowMenu.cpp +++ b/Windows/MainWindowMenu.cpp @@ -270,7 +270,7 @@ namespace MainWindow { TranslateSubMenu(menu, "Window Size", MENU_OPTIONS, SUBMENU_WINDOW_SIZE); // Skip window size 1x-4x.. TranslateSubMenu(menu, "Backend", MENU_OPTIONS, SUBMENU_RENDERING_BACKEND); - TranslateMenuItem(menu, ID_OPTIONS_DIRECTX); + TranslateMenuItem(menu, ID_OPTIONS_DIRECT3D9); TranslateMenuItem(menu, ID_OPTIONS_OPENGL); TranslateSubMenu(menu, "Rendering Mode", MENU_OPTIONS, SUBMENU_RENDERING_MODE); TranslateMenuItem(menu, ID_OPTIONS_NONBUFFEREDRENDERING); @@ -665,7 +665,7 @@ namespace MainWindow { NativeMessageReceived("gpu clear cache", ""); break; - case ID_OPTIONS_DIRECTX: + case ID_OPTIONS_DIRECT3D9: g_Config.iGPUBackend = GPU_BACKEND_DIRECT3D9; // TODO: Remove once software renderer supports D3D9. g_Config.bSoftwareRendering = false; @@ -1108,13 +1108,13 @@ namespace MainWindow { } if (g_Config.iGPUBackend == GPU_BACKEND_DIRECT3D9) { - EnableMenuItem(menu, ID_OPTIONS_DIRECTX, MF_GRAYED); - CheckMenuItem(menu, ID_OPTIONS_DIRECTX, MF_CHECKED); + EnableMenuItem(menu, ID_OPTIONS_DIRECT3D9, MF_GRAYED); + CheckMenuItem(menu, ID_OPTIONS_DIRECT3D9, MF_CHECKED); EnableMenuItem(menu, ID_OPTIONS_OPENGL, MF_ENABLED); } else { EnableMenuItem(menu, ID_OPTIONS_OPENGL, MF_GRAYED); CheckMenuItem(menu, ID_OPTIONS_OPENGL, MF_CHECKED); - EnableMenuItem(menu, ID_OPTIONS_DIRECTX, MF_ENABLED); + EnableMenuItem(menu, ID_OPTIONS_DIRECT3D9, MF_ENABLED); } UpdateDynamicMenuCheckmarks(menu); diff --git a/Windows/ppsspp.rc b/Windows/ppsspp.rc index 0fa59884a4..40928a86e8 100644 --- a/Windows/ppsspp.rc +++ b/Windows/ppsspp.rc @@ -471,7 +471,7 @@ BEGIN POPUP "Backend" BEGIN - MENUITEM "Direct3D9" ID_OPTIONS_DIRECTX + MENUITEM "Direct3D9" ID_OPTIONS_DIRECT3D9 MENUITEM "OpenGL" ID_OPTIONS_OPENGL END diff --git a/Windows/resource.h b/Windows/resource.h index fdd01bde79..e097d0327c 100644 --- a/Windows/resource.h +++ b/Windows/resource.h @@ -316,7 +316,7 @@ #define ID_DEBUG_SAVESYMFILE 40151 #define ID_OPTIONS_BUFLINEARFILTER 40152 #define ID_OPTIONS_BUFNEARESTFILTER 40153 -#define ID_OPTIONS_DIRECTX 40154 +#define ID_OPTIONS_DIRECT3D9 40154 #define ID_OPTIONS_OPENGL 40155 // Dummy option to let the buffered rendering hotkey cycle through all the options.