mirror of
https://github.com/spice2x/spice2x.github.io.git
synced 2026-08-01 22:30:42 -07:00
build: update fmt library to 12.1.0 (#449)
This commit is contained in:
@@ -35,7 +35,7 @@ std::string share_mode_str(AUDCLNT_SHAREMODE share_mode) {
|
||||
ENUM_VARIANT(AUDCLNT_SHAREMODE_SHARED);
|
||||
ENUM_VARIANT(AUDCLNT_SHAREMODE_EXCLUSIVE);
|
||||
default:
|
||||
return fmt::format("ShareMode(0x{:08x})", share_mode);
|
||||
return fmt::format("ShareMode(0x{:08x})", static_cast<uint32_t>(share_mode));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -189,7 +189,7 @@ static std::string format2s(D3DFORMAT format) {
|
||||
ENUM_VARIANT(D3DFMT_A2B10G10R10_XR_BIAS);
|
||||
ENUM_VARIANT(D3DFMT_BINARYBUFFER);
|
||||
default:
|
||||
return fmt::to_string(format);
|
||||
return fmt::to_string(static_cast<uint32_t>(format));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -696,7 +696,7 @@ HRESULT STDMETHODCALLTYPE WrappedIDirect3D9::CreateDevice(
|
||||
{
|
||||
log_misc("graphics::d3d9", "IDirect3D9::CreateDevice hook hit ({}, {}, {}, {}, {}, {})",
|
||||
Adapter,
|
||||
DeviceType,
|
||||
static_cast<uint32_t>(DeviceType),
|
||||
fmt::ptr(hFocusWindow),
|
||||
behavior2s(BehaviorFlags),
|
||||
fmt::ptr(pPresentationParameters),
|
||||
@@ -771,9 +771,9 @@ HRESULT STDMETHODCALLTYPE WrappedIDirect3D9::CreateDevice(
|
||||
params->BackBufferHeight,
|
||||
format2s(params->BackBufferFormat),
|
||||
params->BackBufferCount,
|
||||
params->MultiSampleType,
|
||||
static_cast<uint32_t>(params->MultiSampleType),
|
||||
params->MultiSampleQuality,
|
||||
params->SwapEffect,
|
||||
static_cast<uint32_t>(params->SwapEffect),
|
||||
params->Windowed,
|
||||
params->EnableAutoDepthStencil,
|
||||
format2s(params->AutoDepthStencilFormat),
|
||||
@@ -885,7 +885,7 @@ HRESULT STDMETHODCALLTYPE WrappedIDirect3D9::CreateDeviceEx(
|
||||
|
||||
log_misc("graphics::d3d9", "IDirect3D9Ex::CreateDeviceEx hook hit ({}, {}, {}, {}, {}, {})",
|
||||
Adapter,
|
||||
DeviceType,
|
||||
static_cast<uint32_t>(DeviceType),
|
||||
fmt::ptr(hFocusWindow),
|
||||
behavior2s(BehaviorFlags),
|
||||
fmt::ptr(pPresentationParameters),
|
||||
@@ -960,9 +960,9 @@ HRESULT STDMETHODCALLTYPE WrappedIDirect3D9::CreateDeviceEx(
|
||||
params->BackBufferHeight,
|
||||
format2s(params->BackBufferFormat),
|
||||
params->BackBufferCount,
|
||||
params->MultiSampleType,
|
||||
static_cast<uint32_t>(params->MultiSampleType),
|
||||
params->MultiSampleQuality,
|
||||
params->SwapEffect,
|
||||
static_cast<uint32_t>(params->SwapEffect),
|
||||
params->Windowed,
|
||||
params->EnableAutoDepthStencil,
|
||||
format2s(params->AutoDepthStencilFormat),
|
||||
@@ -991,7 +991,7 @@ HRESULT STDMETHODCALLTYPE WrappedIDirect3D9::CreateDeviceEx(
|
||||
fullscreen_display_mode->Height,
|
||||
fullscreen_display_mode->RefreshRate,
|
||||
format2s(fullscreen_display_mode->Format),
|
||||
fullscreen_display_mode->ScanLineOrdering);
|
||||
static_cast<uint32_t>(fullscreen_display_mode->ScanLineOrdering));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -36,6 +36,14 @@ constexpr bool CUSTOM_RESET = false;
|
||||
|
||||
constexpr D3DFORMAT D3DFMT_DF24 = static_cast<D3DFORMAT>(MAKEFOURCC('D', 'F', '2', '4'));
|
||||
|
||||
auto format_as(D3DPOOL f) {
|
||||
return fmt::underlying(f);
|
||||
}
|
||||
|
||||
auto format_as(D3DFORMAT f) {
|
||||
return fmt::underlying(f);
|
||||
}
|
||||
|
||||
std::string usage2s(DWORD dwUsage) {
|
||||
FLAGS_START(dwUsage);
|
||||
FLAG(dwUsage, D3DUSAGE_RENDERTARGET);
|
||||
|
||||
@@ -123,7 +123,7 @@ namespace nvenc_hook {
|
||||
log_warning(
|
||||
"nvenc_hook",
|
||||
"nvEncInitializeEncoder: unexpected rateControlMode, expected: NV_ENC_PARAMS_RC_CONSTQP, actual: {}",
|
||||
rc->rateControlMode);
|
||||
static_cast<uint32_t>(rc->rateControlMode));
|
||||
}
|
||||
|
||||
} catch (const std::exception &ex) {}
|
||||
|
||||
Reference in New Issue
Block a user