lee/OptiScaler
1
0
Fork 0
mirror of https://github.com/optiscaler/OptiScaler.git synced 2026-07-09 00:42:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add FFX FG logging when using trace log

Browse Source
This commit is contained in:
FakeMichau
2025-12-11 12:50:50 +01:00
parent e5ce05c4e5
commit 52da51d4b2
2 changed files with 24 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
OptiScaler/Config.h
+5 -6
View File
@@ -102,13 +102,12 @@ template <class T, HasDefaultValue defaultState = WithDefault> class CustomOptio
}
constexpr T value_or_default() &&
requires(defaultState != NoDefault)
{
return this->has_value() ? std::move(this->value()) : std::move(_defaultValue);
}
requires(defaultState != NoDefault) {
return this->has_value() ? std::move(this->value()) : std::move(_defaultValue);
}
constexpr std::optional<T> value_for_config(bool forceSave = false)
requires(defaultState == WithDefault)
constexpr std::optional<T> value_for_config(bool forceSave = false)
requires(defaultState == WithDefault)
{
if (_volatile)
{
OptiScaler/framegen/ffx/FSRFG_Dx12.cpp
+19
View File
@@ -210,6 +210,16 @@ HWND FSRFG_Dx12::Hwnd() { return _hwnd; }
const char* FSRFG_Dx12::Name() { return "FSR-FG"; }
static void fgLogCallback(uint32_t type, const wchar_t* message)
{
auto message_str = wstring_to_string(std::wstring(message));
if (type == FFX_API_MESSAGE_TYPE_ERROR)
spdlog::error("FFX FG Callback: {}", message_str);
else if (type == FFX_API_MESSAGE_TYPE_WARNING)
spdlog::warn("FFX FG Callback: {}", message_str);
}
bool FSRFG_Dx12::Dispatch()
{
LOG_DEBUG();
@@ -374,6 +384,12 @@ bool FSRFG_Dx12::Dispatch()
ffxReturnCode_t retCode = FfxApiProxy::D3D12_Configure(&_fgContext, &fgConfig.header);
LOG_DEBUG("D3D12_Configure result: {0:X}, frame: {1}, fIndex: {2}", retCode, willDispatchFrame, fIndex);
ffxConfigureDescGlobalDebug1 fgLogging = {};
fgLogging.header.type = FFX_API_CONFIGURE_DESC_TYPE_GLOBALDEBUG1;
fgLogging.fpMessage = &fgLogCallback;
fgLogging.debugLevel = FFX_API_CONFIGURE_GLOBALDEBUG_LEVEL_VERBOSE;
retCode = FfxApiProxy::D3D12_Configure(&_fgContext, &fgLogging.header);
bool dispatchResult = false;
if (retCode == FFX_API_RETURN_OK && _isActive)
{
@@ -800,6 +816,9 @@ void FSRFG_Dx12::CreateContext(ID3D12Device* device, FG_Constants& fgConstants)
if (fgConstants.flags & FG_Flags::InfiniteDepth)
createFg.flags |= FFX_FRAMEGENERATION_ENABLE_DEPTH_INFINITE;
if (spdlog::default_logger()->level() == SPDLOG_LEVEL_TRACE)
createFg.flags |= FFX_FRAMEGENERATION_ENABLE_DEBUG_CHECKING;
createFg.backBufferFormat = ffxApiGetSurfaceFormatDX12(desc.BufferDesc.Format);
if (_lastHudlessFormat != FFX_API_SURFACE_FORMAT_UNKNOWN)