Update to spice2x-25-10-07 (pre-apply)
> broken commit
This commit is contained in:
@@ -19,12 +19,14 @@
|
||||
#include "hooks/graphics/graphics.h"
|
||||
#include "launcher/launcher.h"
|
||||
#include "launcher/options.h"
|
||||
#include "launcher/signal.h"
|
||||
#include "launcher/shutdown.h"
|
||||
#include "misc/clipboard.h"
|
||||
#include "misc/eamuse.h"
|
||||
#include "misc/wintouchemu.h"
|
||||
#include "overlay/overlay.h"
|
||||
#include "util/detour.h"
|
||||
#include "util/deferlog.h"
|
||||
#include "util/flags_helper.h"
|
||||
#include "util/libutils.h"
|
||||
#include "util/logging.h"
|
||||
@@ -203,6 +205,38 @@ static std::string presentation_interval2s(UINT presentation_interval) {
|
||||
|
||||
static void update_backbuffer_dimensions(D3DPRESENT_PARAMETERS *params);
|
||||
|
||||
static void log_create_device_failure(HRESULT hresult) {
|
||||
// only print once since some games will try CreateDevice multiple times on failure
|
||||
static std::once_flag printed;
|
||||
std::call_once(printed, [hresult]() {
|
||||
// special case for popn
|
||||
if (avs::game::is_model("M39")) {
|
||||
deferredlogs::defer_error_messages({
|
||||
fmt::format("D3D9 CreateDevice/CreateDeviceEx failed with {:#x}!", (UINT)hresult),
|
||||
" possible popn music HD mode resolution issue",
|
||||
" popn HD mode launches at 1360x768 (and NOT 1366x768) which is often",
|
||||
" unsupported by many monitors; here are some possible workarounds:",
|
||||
" * enable GPU resolution scaling in your GPU settings",
|
||||
" * use Force Full Screen Resolution option, combined with image scaling (F11)",
|
||||
" * run in windowed mode",
|
||||
" * run in SD mode"
|
||||
});
|
||||
} else {
|
||||
deferredlogs::defer_error_messages({
|
||||
fmt::format("D3D9 CreateDevice/CreateDeviceEx failed with {:#x}!", (UINT)hresult),
|
||||
" this is a common graphics / monitor issue",
|
||||
" * double check any graphics options you configured in spicecfg",
|
||||
" * double check that your monitor supports the resolution + refresh rate",
|
||||
" combination that the game requires",
|
||||
" * enable GPU-side resolution scaling in your GPU options as needed",
|
||||
" * if you have three or more monitors, try unplugging them down to one or two,",
|
||||
" or enable -graphics-force-single-adapter option",
|
||||
" * failing all that, see if enabling windowed mode helps"
|
||||
});
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
static bool is_dx9_on_12_enabled() {
|
||||
switch (GRAPHICS_9_ON_12_STATE) {
|
||||
case DX9ON12_FORCE_OFF:
|
||||
@@ -775,6 +809,7 @@ HRESULT STDMETHODCALLTYPE WrappedIDirect3D9::CreateDevice(
|
||||
|
||||
// log error
|
||||
log_info("graphics::d3d9", "IDirect3D9::CreateDevice failed, hr={}", FMT_HRESULT(ret));
|
||||
log_create_device_failure(ret);
|
||||
} else if (!D3D9_DEVICE_HOOK_DISABLE) {
|
||||
graphics_hook_window(hFocusWindow, pPresentationParameters);
|
||||
|
||||
@@ -994,6 +1029,8 @@ HRESULT STDMETHODCALLTYPE WrappedIDirect3D9::CreateDeviceEx(
|
||||
|
||||
// log error
|
||||
log_warning("graphics::d3d9", "CreateDeviceEx failed, hr={}", FMT_HRESULT(result));
|
||||
log_create_device_failure(result);
|
||||
|
||||
} else if (!D3D9_DEVICE_HOOK_DISABLE) {
|
||||
graphics_hook_window(hFocusWindow, pPresentationParameters);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user