From ef9d5c350f1057e14d124158e76b0a3c3e7c41ae Mon Sep 17 00:00:00 2001 From: FunkyFr3sh Date: Mon, 31 Jul 2023 07:46:19 +0200 Subject: [PATCH] remove d3d9_adapter setting --- inc/dd.h | 1 - src/config.c | 2 -- src/render_d3d9.c | 6 +++--- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/inc/dd.h b/inc/dd.h index 0b19dd9..dd4f411 100644 --- a/inc/dd.h +++ b/inc/dd.h @@ -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; diff --git a/src/config.c b/src/config.c index ff2a259..f8870dc 100644 --- a/src/config.c +++ b/src/config.c @@ -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" diff --git a/src/render_d3d9.c b/src/render_d3d9.c index 5d94b92..97277bf 100644 --- a/src/render_d3d9.c +++ b/src/render_d3d9.c @@ -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),