1
0
mirror of https://github.com/FunkyFr3sh/cnc-ddraw.git synced 2025-03-15 06:04:49 +01:00

remove d3d9_adapter setting

This commit is contained in:
FunkyFr3sh 2023-07-31 07:46:19 +02:00
parent e42d000366
commit ef9d5c350f
3 changed files with 3 additions and 6 deletions

View File

@ -143,7 +143,6 @@ typedef struct CNCDDRAW
BOOL fpupreserve;
BOOL dinput_show_cursor;
BOOL allow_wmactivate;
int d3d9_adapter;
BOOL opengl_core;
BOOL accurate_timers;
BOOL resizable;

View File

@ -50,7 +50,6 @@ void cfg_load()
g_ddraw->fpupreserve = cfg_get_bool("fpupreserve", TRUE);
g_ddraw->dinput_show_cursor = cfg_get_bool("dinput_show_cursor", FALSE);
g_ddraw->allow_wmactivate = cfg_get_bool("allow_wmactivate", FALSE);
g_ddraw->d3d9_adapter = cfg_get_int("d3d9_adapter", 0);
g_ddraw->guard_lines = cfg_get_int("guard_lines", 200);
g_ddraw->max_resolutions = cfg_get_int("max_resolutions", 0);
g_ddraw->limit_bltfast = cfg_get_bool("limit_bltfast", FALSE);
@ -360,7 +359,6 @@ static void cfg_create_ini()
"\n"
"\n"
"; Undocumented settings\n"
"d3d9_adapter=0\n"
"opengl_core=false\n"
"d3d9on12=false\n"
"guard_lines=200\n"

View File

@ -81,8 +81,8 @@ BOOL d3d9_create()
#if _DEBUG
D3DADAPTER_IDENTIFIER9 ai = {0};
D3DCAPS9 caps = { 0 };
HRESULT hr = IDirect3D9_GetAdapterIdentifier(g_d3d9.instance, g_ddraw->d3d9_adapter, 0, &ai);
HRESULT hr2 = IDirect3D9_GetDeviceCaps(g_d3d9.instance, g_ddraw->d3d9_adapter, D3DDEVTYPE_HAL, &caps);
HRESULT hr = IDirect3D9_GetAdapterIdentifier(g_d3d9.instance, D3DADAPTER_DEFAULT, 0, &ai);
HRESULT hr2 = IDirect3D9_GetDeviceCaps(g_d3d9.instance, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, &caps);
if (SUCCEEDED(hr))
{
@ -145,7 +145,7 @@ BOOL d3d9_create()
if (SUCCEEDED(
IDirect3D9_CreateDevice(
g_d3d9.instance,
g_ddraw->d3d9_adapter,
D3DADAPTER_DEFAULT,
D3DDEVTYPE_HAL,
g_ddraw->hwnd,
behavior_flags[i] | (g_ddraw->fpupreserve ? D3DCREATE_FPU_PRESERVE : 0),