Max/djhackersdev_bemanitools
1
0
Fork 0
Code Issues 72 Pull Requests 15 Actions Packages Projects Releases 20 Wiki Activity

iidxhook/d3d9exhook: Use -1 to specify default adapter instead of 0 because the indexing starts at 0

Browse Source 
Originally thought the default monitor showed up again later, it does not
This commit is contained in:
Will Xyen
2020-01-10 17:36:34 -05:00
parent 4c805d3d47
commit ec852f2c92
23 changed files with 56 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dist/iidx/iidxhook-09.conf
Vendored
+2 -2
View File
@@ -43,8 +43,8 @@ gfx.scale_back_buffer_filter=none
# Forced refresh rate, -1 to not force any (try 59 or 60 if monitor check fails to lock on high refresh rate monitors) # Forced refresh rate, -1 to not force any (try 59 or 60 if monitor check fails to lock on high refresh rate monitors)
gfx.forced_refresh_rate=-1 gfx.forced_refresh_rate=-1
# D3D9 device adapter (monitor), 0 (D3DADAPTER_DEFAULT) to use default, 1, 2 etc. to use specified adapter # D3D9 device adapter (monitor), -1 to use default, 0, 1, 2 etc. to use specified adapter
gfx.device_adapter=0 gfx.device_adapter=-1
# Disable operator clock setting system clock time # Disable operator clock setting system clock time
misc.disable_clock_set=false misc.disable_clock_set=false
dist/iidx/iidxhook-10.conf
Vendored
+2 -2
View File
@@ -43,8 +43,8 @@ gfx.scale_back_buffer_filter=none
# Forced refresh rate, -1 to not force any (try 59 or 60 if monitor check fails to lock on high refresh rate monitors) # Forced refresh rate, -1 to not force any (try 59 or 60 if monitor check fails to lock on high refresh rate monitors)
gfx.forced_refresh_rate=-1 gfx.forced_refresh_rate=-1
# D3D9 device adapter (monitor), 0 (D3DADAPTER_DEFAULT) to use default, 1, 2 etc. to use specified adapter # D3D9 device adapter (monitor), -1 to use default, 0, 1, 2 etc. to use specified adapter
gfx.device_adapter=0 gfx.device_adapter=-1
# Disable operator clock setting system clock time # Disable operator clock setting system clock time
misc.disable_clock_set=false misc.disable_clock_set=false
dist/iidx/iidxhook-11.conf
Vendored
+2 -2
View File
@@ -43,8 +43,8 @@ gfx.scale_back_buffer_filter=none
# Forced refresh rate, -1 to not force any (try 59 or 60 if monitor check fails to lock on high refresh rate monitors) # Forced refresh rate, -1 to not force any (try 59 or 60 if monitor check fails to lock on high refresh rate monitors)
gfx.forced_refresh_rate=-1 gfx.forced_refresh_rate=-1
# D3D9 device adapter (monitor), 0 (D3DADAPTER_DEFAULT) to use default, 1, 2 etc. to use specified adapter # D3D9 device adapter (monitor), -1 to use default, 0, 1, 2 etc. to use specified adapter
gfx.device_adapter=0 gfx.device_adapter=-1
# Disable operator clock setting system clock time # Disable operator clock setting system clock time
misc.disable_clock_set=false misc.disable_clock_set=false
dist/iidx/iidxhook-12.conf
Vendored
+2 -2
View File
@@ -43,8 +43,8 @@ gfx.scale_back_buffer_filter=none
# Forced refresh rate, -1 to not force any (try 59 or 60 if monitor check fails to lock on high refresh rate monitors) # Forced refresh rate, -1 to not force any (try 59 or 60 if monitor check fails to lock on high refresh rate monitors)
gfx.forced_refresh_rate=-1 gfx.forced_refresh_rate=-1
# D3D9 device adapter (monitor), 0 (D3DADAPTER_DEFAULT) to use default, 1, 2 etc. to use specified adapter # D3D9 device adapter (monitor), -1 to use default, 0, 1, 2 etc. to use specified adapter
gfx.device_adapter=0 gfx.device_adapter=-1
# Fix broken 3D background on Happy Sky's music select (if appearing completely white) # Fix broken 3D background on Happy Sky's music select (if appearing completely white)
misc.happy_sky_ms_bg_fix=false misc.happy_sky_ms_bg_fix=false
dist/iidx/iidxhook-13.conf
Vendored
+2 -2
View File
@@ -43,8 +43,8 @@ gfx.scale_back_buffer_filter=none
# Forced refresh rate, -1 to not force any (try 59 or 60 if monitor check fails to lock on high refresh rate monitors) # Forced refresh rate, -1 to not force any (try 59 or 60 if monitor check fails to lock on high refresh rate monitors)
gfx.forced_refresh_rate=-1 gfx.forced_refresh_rate=-1
# D3D9 device adapter (monitor), 0 (D3DADAPTER_DEFAULT) to use default, 1, 2 etc. to use specified adapter # D3D9 device adapter (monitor), -1 to use default, 0, 1, 2 etc. to use specified adapter
gfx.device_adapter=0 gfx.device_adapter=-1
# Fix broken 3D background on DistorteD's music select (if appearing completely black) # Fix broken 3D background on DistorteD's music select (if appearing completely black)
misc.distorted_ms_bg_fix=false misc.distorted_ms_bg_fix=false
dist/iidx/iidxhook-14.conf
Vendored
+2 -2
View File
@@ -40,8 +40,8 @@ gfx.scale_back_buffer_filter=none
# Forced refresh rate, -1 to not force any (try 59 or 60 if monitor check fails to lock on high refresh rate monitors) # Forced refresh rate, -1 to not force any (try 59 or 60 if monitor check fails to lock on high refresh rate monitors)
gfx.forced_refresh_rate=-1 gfx.forced_refresh_rate=-1
# D3D9 device adapter (monitor), 0 (D3DADAPTER_DEFAULT) to use default, 1, 2 etc. to use specified adapter # D3D9 device adapter (monitor), -1 to use default, 0, 1, 2 etc. to use specified adapter
gfx.device_adapter=0 gfx.device_adapter=-1
# Disable operator clock setting system clock time # Disable operator clock setting system clock time
misc.disable_clock_set=false misc.disable_clock_set=false
dist/iidx/iidxhook-15.conf
Vendored
+2 -2
View File
@@ -40,8 +40,8 @@ gfx.scale_back_buffer_filter=none
# Forced refresh rate, -1 to not force any (try 59 or 60 if monitor check fails to lock on high refresh rate monitors) # Forced refresh rate, -1 to not force any (try 59 or 60 if monitor check fails to lock on high refresh rate monitors)
gfx.forced_refresh_rate=-1 gfx.forced_refresh_rate=-1
# D3D9 device adapter (monitor), 0 (D3DADAPTER_DEFAULT) to use default, 1, 2 etc. to use specified adapter # D3D9 device adapter (monitor), -1 to use default, 0, 1, 2 etc. to use specified adapter
gfx.device_adapter=0 gfx.device_adapter=-1
# Disable operator clock setting system clock time # Disable operator clock setting system clock time
misc.disable_clock_set=false misc.disable_clock_set=false
dist/iidx/iidxhook-16.conf
Vendored
+2 -2
View File
@@ -43,8 +43,8 @@ gfx.scale_back_buffer_filter=none
# Forced refresh rate, -1 to not force any (try 59 or 60 if monitor check fails to lock on high refresh rate monitors) # Forced refresh rate, -1 to not force any (try 59 or 60 if monitor check fails to lock on high refresh rate monitors)
gfx.forced_refresh_rate=-1 gfx.forced_refresh_rate=-1
# D3D9 device adapter (monitor), 0 (D3DADAPTER_DEFAULT) to use default, 1, 2 etc. to use specified adapter # D3D9 device adapter (monitor), -1 to use default, 0, 1, 2 etc. to use specified adapter
gfx.device_adapter=0 gfx.device_adapter=-1
# Disable operator clock setting system clock time # Disable operator clock setting system clock time
misc.disable_clock_set=false misc.disable_clock_set=false
dist/iidx/iidxhook-17.conf
Vendored
+2 -2
View File
@@ -43,8 +43,8 @@ gfx.scale_back_buffer_filter=none
# Forced refresh rate, -1 to not force any (try 59 or 60 if monitor check fails to lock on high refresh rate monitors) # Forced refresh rate, -1 to not force any (try 59 or 60 if monitor check fails to lock on high refresh rate monitors)
gfx.forced_refresh_rate=-1 gfx.forced_refresh_rate=-1
# D3D9 device adapter (monitor), 0 (D3DADAPTER_DEFAULT) to use default, 1, 2 etc. to use specified adapter # D3D9 device adapter (monitor), -1 to use default, 0, 1, 2 etc. to use specified adapter
gfx.device_adapter=0 gfx.device_adapter=-1
# Disable operator clock setting system clock time # Disable operator clock setting system clock time
misc.disable_clock_set=false misc.disable_clock_set=false
dist/iidx/iidxhook-18.conf
Vendored
+2 -2
View File
@@ -34,5 +34,5 @@ gfx.scale_back_buffer_filter=none
# Forced refresh rate, -1 to not force any (try 59 or 60 if monitor check fails to lock on high refresh rate monitors) # Forced refresh rate, -1 to not force any (try 59 or 60 if monitor check fails to lock on high refresh rate monitors)
gfx.forced_refresh_rate=-1 gfx.forced_refresh_rate=-1
# D3D9 device adapter (monitor), 0 (D3DADAPTER_DEFAULT) to use default, 1, 2 etc. to use specified adapter # D3D9 device adapter (monitor), -1 to use default, 0, 1, 2 etc. to use specified adapter
gfx.device_adapter=0 gfx.device_adapter=-1
dist/iidx/iidxhook-19.conf
Vendored
+2 -2
View File
@@ -31,5 +31,5 @@ gfx.scale_back_buffer_filter=none
# Forced refresh rate, -1 to not force any (try 59 or 60 if monitor check fails to lock on high refresh rate monitors) # Forced refresh rate, -1 to not force any (try 59 or 60 if monitor check fails to lock on high refresh rate monitors)
gfx.forced_refresh_rate=-1 gfx.forced_refresh_rate=-1
# D3D9 device adapter (monitor), 0 (D3DADAPTER_DEFAULT) to use default, 1, 2 etc. to use specified adapter # D3D9 device adapter (monitor), -1 to use default, 0, 1, 2 etc. to use specified adapter
gfx.device_adapter=0 gfx.device_adapter=-1
dist/iidx/iidxhook-20.conf
Vendored
+2 -2
View File
@@ -31,5 +31,5 @@ gfx.scale_back_buffer_filter=none
# Forced refresh rate, -1 to not force any (try 59 or 60 if monitor check fails to lock on high refresh rate monitors) # Forced refresh rate, -1 to not force any (try 59 or 60 if monitor check fails to lock on high refresh rate monitors)
gfx.forced_refresh_rate=-1 gfx.forced_refresh_rate=-1
# D3D9 device adapter (monitor), 0 (D3DADAPTER_DEFAULT) to use default, 1, 2 etc. to use specified adapter # D3D9 device adapter (monitor), -1 to use default, 0, 1, 2 etc. to use specified adapter
gfx.device_adapter=0 gfx.device_adapter=-1
dist/iidx/iidxhook-21.conf
Vendored
+2 -2
View File
@@ -31,5 +31,5 @@ gfx.scale_back_buffer_filter=none
# Forced refresh rate, -1 to not force any (try 59 or 60 if monitor check fails to lock on high refresh rate monitors) # Forced refresh rate, -1 to not force any (try 59 or 60 if monitor check fails to lock on high refresh rate monitors)
gfx.forced_refresh_rate=-1 gfx.forced_refresh_rate=-1
# D3D9 device adapter (monitor), 0 (D3DADAPTER_DEFAULT) to use default, 1, 2 etc. to use specified adapter # D3D9 device adapter (monitor), -1 to use default, 0, 1, 2 etc. to use specified adapter
gfx.device_adapter=0 gfx.device_adapter=-1
dist/iidx/iidxhook-22.conf
Vendored
+2 -2
View File
@@ -31,5 +31,5 @@ gfx.scale_back_buffer_filter=none
# Forced refresh rate, -1 to not force any (try 59 or 60 if monitor check fails to lock on high refresh rate monitors) # Forced refresh rate, -1 to not force any (try 59 or 60 if monitor check fails to lock on high refresh rate monitors)
gfx.forced_refresh_rate=-1 gfx.forced_refresh_rate=-1
# D3D9 device adapter (monitor), 0 (D3DADAPTER_DEFAULT) to use default, 1, 2 etc. to use specified adapter # D3D9 device adapter (monitor), -1 to use default, 0, 1, 2 etc. to use specified adapter
gfx.device_adapter=0 gfx.device_adapter=-1
dist/iidx/iidxhook-23.conf
Vendored
+2 -2
View File
@@ -31,5 +31,5 @@ gfx.scale_back_buffer_filter=none
# Forced refresh rate, -1 to not force any (try 59 or 60 if monitor check fails to lock on high refresh rate monitors) # Forced refresh rate, -1 to not force any (try 59 or 60 if monitor check fails to lock on high refresh rate monitors)
gfx.forced_refresh_rate=-1 gfx.forced_refresh_rate=-1
# D3D9 device adapter (monitor), 0 (D3DADAPTER_DEFAULT) to use default, 1, 2 etc. to use specified adapter # D3D9 device adapter (monitor), -1 to use default, 0, 1, 2 etc. to use specified adapter
gfx.device_adapter=0 gfx.device_adapter=-1
dist/iidx/iidxhook-24.conf
Vendored
+2 -2
View File
@@ -31,5 +31,5 @@ gfx.scale_back_buffer_filter=none
# Forced refresh rate, -1 to not force any (try 59 or 60 if monitor check fails to lock on high refresh rate monitors) # Forced refresh rate, -1 to not force any (try 59 or 60 if monitor check fails to lock on high refresh rate monitors)
gfx.forced_refresh_rate=-1 gfx.forced_refresh_rate=-1
# D3D9 device adapter (monitor), 0 (D3DADAPTER_DEFAULT) to use default, 1, 2 etc. to use specified adapter # D3D9 device adapter (monitor), -1 to use default, 0, 1, 2 etc. to use specified adapter
gfx.device_adapter=0 gfx.device_adapter=-1
dist/iidx/iidxhook-25.conf
Vendored
+2 -2
View File
@@ -31,8 +31,8 @@ gfx.scale_back_buffer_filter=none
# Forced refresh rate, -1 to not force any (try 59 or 60 if monitor check fails to lock on high refresh rate monitors) # Forced refresh rate, -1 to not force any (try 59 or 60 if monitor check fails to lock on high refresh rate monitors)
gfx.forced_refresh_rate=-1 gfx.forced_refresh_rate=-1
# D3D9 device adapter (monitor), 0 (D3DADAPTER_DEFAULT) to use default, 1, 2 etc. to use specified adapter # D3D9 device adapter (monitor), -1 to use default, 0, 1, 2 etc. to use specified adapter
gfx.device_adapter=0 gfx.device_adapter=-1
# Disables the camera emulation # Disables the camera emulation
cam.disable_emu=false cam.disable_emu=false
dist/iidx/iidxhook-26.conf
Vendored
+2 -2
View File
@@ -31,8 +31,8 @@ gfx.scale_back_buffer_filter=none
# Forced refresh rate, -1 to not force any (try 59 or 60 if monitor check fails to lock on high refresh rate monitors) # Forced refresh rate, -1 to not force any (try 59 or 60 if monitor check fails to lock on high refresh rate monitors)
gfx.forced_refresh_rate=-1 gfx.forced_refresh_rate=-1
# D3D9 device adapter (monitor), 0 (D3DADAPTER_DEFAULT) to use default, 1, 2 etc. to use specified adapter # D3D9 device adapter (monitor), -1 to use default, 0, 1, 2 etc. to use specified adapter
gfx.device_adapter=0 gfx.device_adapter=-1
# Disables the camera emulation # Disables the camera emulation
cam.disable_emu=false cam.disable_emu=false
src/main/d3d9exhook/config-gfx.c
+7 -17
View File
@@ -12,7 +12,7 @@
#define D3D9EXHOOK_CONFIG_GFX_WINDOWED_KEY "gfx.windowed" #define D3D9EXHOOK_CONFIG_GFX_WINDOWED_KEY "gfx.windowed"
#define D3D9EXHOOK_CONFIG_GFX_WINDOW_WIDTH_KEY "gfx.window_width" #define D3D9EXHOOK_CONFIG_GFX_WINDOW_WIDTH_KEY "gfx.window_width"
#define D3D9EXHOOK_CONFIG_GFX_WINDOW_HEIGHT_KEY "gfx.window_height" #define D3D9EXHOOK_CONFIG_GFX_WINDOW_HEIGHT_KEY "gfx.window_height"
#define D3D9EXHOOK_CONFIG_GFX_FORCED_RR_KEY "gfx.forced_refresh_rate" #define D3D9EXHOOK_CONFIG_GFX_FORCED_REFRESHRATE_KEY "gfx.forced_refresh_rate"
#define D3D9EXHOOK_CONFIG_GFX_DEVICE_ADAPTER_KEY "gfx.device_adapter" #define D3D9EXHOOK_CONFIG_GFX_DEVICE_ADAPTER_KEY "gfx.device_adapter"
#define D3D9EXHOOK_CONFIG_GFX_DEFAULT_FRAMED_VALUE false #define D3D9EXHOOK_CONFIG_GFX_DEFAULT_FRAMED_VALUE false
@@ -20,7 +20,7 @@
#define D3D9EXHOOK_CONFIG_GFX_DEFAULT_WINDOW_WIDTH_VALUE -1 #define D3D9EXHOOK_CONFIG_GFX_DEFAULT_WINDOW_WIDTH_VALUE -1
#define D3D9EXHOOK_CONFIG_GFX_DEFAULT_WINDOW_HEIGHT_VALUE -1 #define D3D9EXHOOK_CONFIG_GFX_DEFAULT_WINDOW_HEIGHT_VALUE -1
#define D3D9EXHOOK_CONFIG_GFX_DEFAULT_FORCED_RR_VALUE -1 #define D3D9EXHOOK_CONFIG_GFX_DEFAULT_FORCED_RR_VALUE -1
#define D3D9EXHOOK_CONFIG_GFX_DEFAULT_DEVICE_ADAPTER_VALUE D3DADAPTER_DEFAULT #define D3D9EXHOOK_CONFIG_GFX_DEFAULT_DEVICE_ADAPTER_VALUE -1
void d3d9exhook_config_gfx_init(struct cconfig *config) void d3d9exhook_config_gfx_init(struct cconfig *config)
{ {
@@ -50,7 +50,7 @@ void d3d9exhook_config_gfx_init(struct cconfig *config)
cconfig_util_set_int( cconfig_util_set_int(
config, config,
D3D9EXHOOK_CONFIG_GFX_FORCED_RR_KEY, D3D9EXHOOK_CONFIG_GFX_FORCED_REFRESHRATE_KEY,
D3D9EXHOOK_CONFIG_GFX_DEFAULT_FORCED_RR_VALUE, D3D9EXHOOK_CONFIG_GFX_DEFAULT_FORCED_RR_VALUE,
"Forced refresh rate, -1 to not force any (try 59 or 60 if monitor " "Forced refresh rate, -1 to not force any (try 59 or 60 if monitor "
"check fails to lock on high refresh rate monitors)"); "check fails to lock on high refresh rate monitors)");
@@ -59,8 +59,8 @@ void d3d9exhook_config_gfx_init(struct cconfig *config)
config, config,
D3D9EXHOOK_CONFIG_GFX_DEVICE_ADAPTER_KEY, D3D9EXHOOK_CONFIG_GFX_DEVICE_ADAPTER_KEY,
D3D9EXHOOK_CONFIG_GFX_DEFAULT_DEVICE_ADAPTER_VALUE, D3D9EXHOOK_CONFIG_GFX_DEFAULT_DEVICE_ADAPTER_VALUE,
"D3D9ex device adapter (monitor), 0 (D3DADAPTER_DEFAULT) to use " "D3D9ex device adapter (monitor), -1 to use default,"
"default, 1, 2 etc. to use specified adapter"); "0, 1, 2 etc. to use specified adapter");
} }
void d3d9exhook_config_gfx_get( void d3d9exhook_config_gfx_get(
@@ -116,13 +116,13 @@ void d3d9exhook_config_gfx_get(
if (!cconfig_util_get_int( if (!cconfig_util_get_int(
config, config,
D3D9EXHOOK_CONFIG_GFX_FORCED_RR_KEY, D3D9EXHOOK_CONFIG_GFX_FORCED_REFRESHRATE_KEY,
&config_gfx->forced_refresh_rate, &config_gfx->forced_refresh_rate,
D3D9EXHOOK_CONFIG_GFX_DEFAULT_FORCED_RR_VALUE)) { D3D9EXHOOK_CONFIG_GFX_DEFAULT_FORCED_RR_VALUE)) {
log_warning( log_warning(
"Invalid value for key '%s' specified, fallback " "Invalid value for key '%s' specified, fallback "
"to default '%d'", "to default '%d'",
D3D9EXHOOK_CONFIG_GFX_FORCED_RR_KEY, D3D9EXHOOK_CONFIG_GFX_FORCED_REFRESHRATE_KEY,
D3D9EXHOOK_CONFIG_GFX_DEFAULT_FORCED_RR_VALUE); D3D9EXHOOK_CONFIG_GFX_DEFAULT_FORCED_RR_VALUE);
} }
@@ -137,14 +137,4 @@ void d3d9exhook_config_gfx_get(
D3D9EXHOOK_CONFIG_GFX_DEVICE_ADAPTER_KEY, D3D9EXHOOK_CONFIG_GFX_DEVICE_ADAPTER_KEY,
D3D9EXHOOK_CONFIG_GFX_DEFAULT_DEVICE_ADAPTER_VALUE); D3D9EXHOOK_CONFIG_GFX_DEFAULT_DEVICE_ADAPTER_VALUE);
} }
if (config_gfx->device_adapter < 0) {
log_warning(
"Invalid value for key '%s' specified, fallback "
"to default '%d'",
D3D9EXHOOK_CONFIG_GFX_DEVICE_ADAPTER_KEY,
D3D9EXHOOK_CONFIG_GFX_DEFAULT_DEVICE_ADAPTER_VALUE);
config_gfx->device_adapter =
D3D9EXHOOK_CONFIG_GFX_DEFAULT_DEVICE_ADAPTER_VALUE;
}
} }
src/main/d3d9exhook/d3d9ex.c
+2 -2
View File
@@ -86,7 +86,7 @@ static int32_t d3d9ex_force_refresh_rate = -1;
static int32_t d3d9ex_window_width = -1; static int32_t d3d9ex_window_width = -1;
static int32_t d3d9ex_window_height = -1; static int32_t d3d9ex_window_height = -1;
static bool d3d9ex_window_framed; static bool d3d9ex_window_framed;
static int32_t d3d9ex_device_adapter = D3DADAPTER_DEFAULT; static int32_t d3d9ex_device_adapter = -1;
/* ------------------------------------------------------------------------- */ /* ------------------------------------------------------------------------- */
@@ -212,7 +212,7 @@ static HRESULT STDCALL my_CreateDeviceEx(
} }
} }
if (d3d9ex_device_adapter != D3DADAPTER_DEFAULT) { if (d3d9ex_device_adapter >= 0) {
log_info("Forcing adapter %d -> %d", adapter, d3d9ex_device_adapter); log_info("Forcing adapter %d -> %d", adapter, d3d9ex_device_adapter);
adapter = d3d9ex_device_adapter; adapter = d3d9ex_device_adapter;
} }
src/main/iidxhook-util/config-gfx.c
+7 -17
View File
@@ -20,7 +20,7 @@
"gfx.scale_back_buffer_height" "gfx.scale_back_buffer_height"
#define IIDXHOOK_CONFIG_GFX_SCALE_BACK_BUFFER_FILTER_KEY \ #define IIDXHOOK_CONFIG_GFX_SCALE_BACK_BUFFER_FILTER_KEY \
"gfx.scale_back_buffer_filter" "gfx.scale_back_buffer_filter"
#define IIDXHOOK_CONFIG_GFX_FORCED_RR_KEY "gfx.forced_refresh_rate" #define IIDXHOOK_CONFIG_GFX_FORCED_REFRESHRATE_KEY "gfx.forced_refresh_rate"
#define IIDXHOOK_CONFIG_GFX_DEVICE_ADAPTER_KEY "gfx.device_adapter" #define IIDXHOOK_CONFIG_GFX_DEVICE_ADAPTER_KEY "gfx.device_adapter"
#define IIDXHOOK_CONFIG_GFX_DEFAULT_BGVIDEO_UV_FIX_VALUE false #define IIDXHOOK_CONFIG_GFX_DEFAULT_BGVIDEO_UV_FIX_VALUE false
@@ -35,7 +35,7 @@
#define IIDXHOOK_CONFIG_GFX_DEFAULT_SCALE_BACK_BUFFER_HEIGHT_VALUE 0 #define IIDXHOOK_CONFIG_GFX_DEFAULT_SCALE_BACK_BUFFER_HEIGHT_VALUE 0
#define IIDXHOOK_CONFIG_GFX_DEFAULT_SCALE_BACK_BUFFER_FILTER_VALUE "none" #define IIDXHOOK_CONFIG_GFX_DEFAULT_SCALE_BACK_BUFFER_FILTER_VALUE "none"
#define IIDXHOOK_CONFIG_GFX_DEFAULT_FORCED_RR_VALUE -1 #define IIDXHOOK_CONFIG_GFX_DEFAULT_FORCED_RR_VALUE -1
#define IIDXHOOK_CONFIG_GFX_DEFAULT_DEVICE_ADAPTER_VALUE D3DADAPTER_DEFAULT #define IIDXHOOK_CONFIG_GFX_DEFAULT_DEVICE_ADAPTER_VALUE -1
void iidxhook_config_gfx_init(struct cconfig *config) void iidxhook_config_gfx_init(struct cconfig *config)
{ {
@@ -148,7 +148,7 @@ void iidxhook_config_gfx_init(struct cconfig *config)
cconfig_util_set_int( cconfig_util_set_int(
config, config,
IIDXHOOK_CONFIG_GFX_FORCED_RR_KEY, IIDXHOOK_CONFIG_GFX_FORCED_REFRESHRATE_KEY,
IIDXHOOK_CONFIG_GFX_DEFAULT_FORCED_RR_VALUE, IIDXHOOK_CONFIG_GFX_DEFAULT_FORCED_RR_VALUE,
"Forced refresh rate, -1 to not force any (try 59 or 60 if monitor " "Forced refresh rate, -1 to not force any (try 59 or 60 if monitor "
"check fails to lock on high refresh rate monitors)"); "check fails to lock on high refresh rate monitors)");
@@ -157,8 +157,8 @@ void iidxhook_config_gfx_init(struct cconfig *config)
config, config,
IIDXHOOK_CONFIG_GFX_DEVICE_ADAPTER_KEY, IIDXHOOK_CONFIG_GFX_DEVICE_ADAPTER_KEY,
IIDXHOOK_CONFIG_GFX_DEFAULT_DEVICE_ADAPTER_VALUE, IIDXHOOK_CONFIG_GFX_DEFAULT_DEVICE_ADAPTER_VALUE,
"D3D9 device adapter (monitor), 0 (D3DADAPTER_DEFAULT) to use default, " "D3D9 device adapter (monitor), -1 to use default, "
"1, 2 etc. to use specified adapter"); "0, 1, 2 etc. to use specified adapter");
} }
void iidxhook_config_gfx_get( void iidxhook_config_gfx_get(
@@ -346,13 +346,13 @@ void iidxhook_config_gfx_get(
if (!cconfig_util_get_int( if (!cconfig_util_get_int(
config, config,
IIDXHOOK_CONFIG_GFX_FORCED_RR_KEY, IIDXHOOK_CONFIG_GFX_FORCED_REFRESHRATE_KEY,
&config_gfx->forced_refresh_rate, &config_gfx->forced_refresh_rate,
IIDXHOOK_CONFIG_GFX_DEFAULT_FORCED_RR_VALUE)) { IIDXHOOK_CONFIG_GFX_DEFAULT_FORCED_RR_VALUE)) {
log_warning( log_warning(
"Invalid value for key '%s' specified, fallback " "Invalid value for key '%s' specified, fallback "
"to default '%d'", "to default '%d'",
IIDXHOOK_CONFIG_GFX_FORCED_RR_KEY, IIDXHOOK_CONFIG_GFX_FORCED_REFRESHRATE_KEY,
IIDXHOOK_CONFIG_GFX_DEFAULT_FORCED_RR_VALUE); IIDXHOOK_CONFIG_GFX_DEFAULT_FORCED_RR_VALUE);
} }
@@ -367,14 +367,4 @@ void iidxhook_config_gfx_get(
IIDXHOOK_CONFIG_GFX_DEVICE_ADAPTER_KEY, IIDXHOOK_CONFIG_GFX_DEVICE_ADAPTER_KEY,
IIDXHOOK_CONFIG_GFX_DEFAULT_DEVICE_ADAPTER_VALUE); IIDXHOOK_CONFIG_GFX_DEFAULT_DEVICE_ADAPTER_VALUE);
} }
if (config_gfx->device_adapter < 0) {
log_warning(
"Invalid value for key '%s' specified, fallback "
"to default '%d'",
IIDXHOOK_CONFIG_GFX_DEVICE_ADAPTER_KEY,
IIDXHOOK_CONFIG_GFX_DEFAULT_DEVICE_ADAPTER_VALUE);
config_gfx->device_adapter =
IIDXHOOK_CONFIG_GFX_DEFAULT_DEVICE_ADAPTER_VALUE;
}
} }
src/main/iidxhook-util/d3d9.c
+2 -2
View File
@@ -278,7 +278,7 @@ static void iidxhook_util_d3d9_fix_create_device_apply_window_mode(
} }
} }
if (iidxhook_util_d3d9_config.device_adapter != D3DADAPTER_DEFAULT) { if (iidxhook_util_d3d9_config.device_adapter >= 0) {
log_info( log_info(
"Forcing adapter %d -> %d", "Forcing adapter %d -> %d",
irp->args.ctx_create_device.adapter, irp->args.ctx_create_device.adapter,
@@ -1007,7 +1007,7 @@ void iidxhook_util_d3d9_init_config(struct iidxhook_util_d3d9_config *config)
config->scale_back_buffer_filter = config->scale_back_buffer_filter =
IIDXHOOK_UTIL_D3D9_BACK_BUFFER_SCALE_FILTER_NONE; IIDXHOOK_UTIL_D3D9_BACK_BUFFER_SCALE_FILTER_NONE;
config->forced_refresh_rate = -1; config->forced_refresh_rate = -1;
config->device_adapter = D3DADAPTER_DEFAULT; config->device_adapter = -1;
} }
void iidxhook_util_d3d9_configure( void iidxhook_util_d3d9_configure(
src/main/iidxhook-util/d3d9.h
+2 -2
View File
@@ -169,8 +169,8 @@ struct iidxhook_util_d3d9_config {
/** /**
* override device adapter (monitor) * override device adapter (monitor)
* 0 (D3DADAPTER_DEFAULT) to use default (whatever the game sends), 1, 2 * -1 to use default (whatever the game sends)
* etc. to use specified adapter * 0, 1, 2 etc. to use specified adapter
*/ */
int32_t device_adapter; int32_t device_adapter;
}; };