ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

D3D: Change it so the windows mode resolution displays all usable resolutions like full screen does. 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4435 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
death2droid 2009-10-19 12:13:35 +00:00
parent ff3d6027fa
commit 091a454c50
2 changed files with 2 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Source/Plugins/Plugin_VideoDX9/Src/DlgSettings.cpp
View File

@ -28,16 +28,6 @@
#include "TextureCache.h" #include "TextureCache.h"
// TODO: remove if/when ini files use unicode // TODO: remove if/when ini files use unicode
#define ComboBox_GetTextA(hwndCtl, lpch, cchMax) GetWindowTextA((hwndCtl), (lpch), (cchMax)) #define ComboBox_GetTextA(hwndCtl, lpch, cchMax) GetWindowTextA((hwndCtl), (lpch), (cchMax))
#define NUMWNDRES 6
int g_Res[NUMWNDRES][2] =
{
{640,480},
{800,600},
{1024,768},
{1280,960},
{1280,1024},
{1600,1200},
};
struct TabDirect3D : public W32Util::Tab struct TabDirect3D : public W32Util::Tab
{ {
@ -72,17 +62,12 @@ struct TabDirect3D : public W32Util::Tab
const D3D::Resolution &r = adapter.resolutions[i]; const D3D::Resolution &r = adapter.resolutions[i];
MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, r.name, -1, tempwstr, 2000); MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, r.name, -1, tempwstr, 2000);
ComboBox_AddString(GetDlgItem(hDlg,IDC_RESOLUTION), tempwstr); ComboBox_AddString(GetDlgItem(hDlg,IDC_RESOLUTION), tempwstr);
ComboBox_AddString(GetDlgItem(hDlg,IDC_RESOLUTIONWINDOWED),tempwstr);
} }
for (int i = 0; i <16; i++) tempwstr[i] = g_Config.cFSResolution[i]; for (int i = 0; i <16; i++) tempwstr[i] = g_Config.cFSResolution[i];
ComboBox_SelectString(GetDlgItem(hDlg,IDC_RESOLUTION), -1, tempwstr); ComboBox_SelectString(GetDlgItem(hDlg,IDC_RESOLUTION), -1, tempwstr);
for (int i = 0; i < NUMWNDRES; i++)
{
char temp[256];
sprintf(temp,"%ix%i",g_Res[i][0],g_Res[i][1]);
MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, temp, -1, tempwstr, 2000);
ComboBox_AddString(GetDlgItem(hDlg,IDC_RESOLUTIONWINDOWED),tempwstr);
}
for (int i = 0; i < 16; i++) tempwstr[i] = g_Config.cInternalRes[i]; for (int i = 0; i < 16; i++) tempwstr[i] = g_Config.cInternalRes[i];
ComboBox_SelectString(GetDlgItem(hDlg,IDC_RESOLUTIONWINDOWED), -1, tempwstr); ComboBox_SelectString(GetDlgItem(hDlg,IDC_RESOLUTIONWINDOWED), -1, tempwstr);

2
Source/Plugins/Plugin_VideoDX9/Src/Render.cpp
View File

@ -61,8 +61,6 @@ static bool s_AVIDumping;
static u32 s_blendMode; static u32 s_blendMode;
#define NUMWNDRES 6
extern int g_Res[NUMWNDRES][2];
char st[32768]; char st[32768];
// State translation lookup tables // State translation lookup tables