diff --git a/OptiScaler/OptiScaler.vcxproj b/OptiScaler/OptiScaler.vcxproj index acb3ee1f..b903a4a9 100644 --- a/OptiScaler/OptiScaler.vcxproj +++ b/OptiScaler/OptiScaler.vcxproj @@ -113,7 +113,7 @@ $(ProjectDir);$(ProjectDir)include\;$(SolutionDir)external\vulkan\include;$(SolutionDir)external\nvngx_dlss_sdk;$(SolutionDir)external\xess\inc\xess;$(SolutionDir)external\xess\inc\xell;$(SolutionDir)external\xess\inc\xess_fg;$(SolutionDir)external\FidelityFX-SDK\ffx-api\include\ffx_api;$(SolutionDir)external\simpleini;$(SolutionDir)external\unordered_dense\include;$(SolutionDir)external\spdlog\include;$(SolutionDir)external\freetype;$(SolutionDir)external\streamline;$(SolutionDir)external\streamline1;$(SolutionDir)external\nvapi;$(SolutionDir)external\nlohmann;$(SolutionDir)external\fakenvapi;$(SolutionDir)external\magic_enum\include\magic_enum;$(IncludePath) $(ProjectDir)library\fsr2;$(ProjectDir)library\fsr2_212;$(ProjectDir)library\fsr31;$(ProjectDir)library\vulkan;$(ProjectDir)library\d3dx;$(ProjectDir)library\detours;$(SolutionDir)external\xess\lib;$(SolutionDir)external\freetype;$(LibraryPath) - .\x64\Debug + .\x64\Debug\ .dll diff --git a/OptiScaler/framegen/ffx/FSRFG_Dx12.cpp b/OptiScaler/framegen/ffx/FSRFG_Dx12.cpp index 70839184..8f2ee2f8 100644 --- a/OptiScaler/framegen/ffx/FSRFG_Dx12.cpp +++ b/OptiScaler/framegen/ffx/FSRFG_Dx12.cpp @@ -282,7 +282,7 @@ static void fgLogCallback(uint32_t type, const wchar_t* message) bool FSRFG_Dx12::Dispatch() { - LOG_DEBUG(); + LOG_FUNC(); if (_fgContext == nullptr) { diff --git a/OptiScaler/framegen/xefg/XeFG_Dx12.cpp b/OptiScaler/framegen/xefg/XeFG_Dx12.cpp index e64776dd..da8ece0f 100644 --- a/OptiScaler/framegen/xefg/XeFG_Dx12.cpp +++ b/OptiScaler/framegen/xefg/XeFG_Dx12.cpp @@ -619,7 +619,7 @@ bool XeFG_Dx12::Shutdown() bool XeFG_Dx12::Dispatch() { - LOG_DEBUG(); + LOG_FUNC(); UINT64 willDispatchFrame = 0; auto fIndex = GetDispatchIndex(willDispatchFrame); diff --git a/OptiScaler/hooks/D3D12_Hooks.cpp b/OptiScaler/hooks/D3D12_Hooks.cpp index 28d3f2e1..c186b3dd 100644 --- a/OptiScaler/hooks/D3D12_Hooks.cpp +++ b/OptiScaler/hooks/D3D12_Hooks.cpp @@ -923,7 +923,7 @@ static void HookToDevice(ID3D12Device* InDevice) static void UnhookDevice() { - LOG_DEBUG(); + LOG_FUNC(); DetourTransactionBegin(); DetourUpdateThread(GetCurrentThread()); diff --git a/OptiScaler/hooks/DxgiFactory_Hooks.cpp b/OptiScaler/hooks/DxgiFactory_Hooks.cpp index 6f8143cf..834a5f6e 100644 --- a/OptiScaler/hooks/DxgiFactory_Hooks.cpp +++ b/OptiScaler/hooks/DxgiFactory_Hooks.cpp @@ -42,7 +42,7 @@ void DxgiFactoryHooks::HookToFactory(IDXGIFactory* pFactory) if (pFactory == nullptr) return; - LOG_DEBUG(); + LOG_FUNC(); IDXGIFactory* real = nullptr; if (!Util::CheckForRealObject(__FUNCTION__, pFactory, (IUnknown**) &real)) diff --git a/OptiScaler/hooks/LibraryLoad_Hooks.cpp b/OptiScaler/hooks/LibraryLoad_Hooks.cpp index fe382dbf..08b8949f 100644 --- a/OptiScaler/hooks/LibraryLoad_Hooks.cpp +++ b/OptiScaler/hooks/LibraryLoad_Hooks.cpp @@ -567,7 +567,7 @@ std::optional LibraryLoadHooks::FreeLibrary(PVOID lpLibrary) HMODULE LibraryLoadHooks::LoadNvApi() { - LOG_DEBUG(); + LOG_FUNC(); HMODULE nvapi = nullptr; diff --git a/OptiScaler/hooks/Ntdll_Hooks.h b/OptiScaler/hooks/Ntdll_Hooks.h index c0f603fe..63bee793 100644 --- a/OptiScaler/hooks/Ntdll_Hooks.h +++ b/OptiScaler/hooks/Ntdll_Hooks.h @@ -159,7 +159,7 @@ class NtdllHooks public: static void Hook() { - LOG_DEBUG(); + LOG_FUNC(); if (!Config::Instance()->UseNtdllHooks.value_or_default()) return; diff --git a/OptiScaler/inputs/FG/FSR3_Dx12_FG.cpp b/OptiScaler/inputs/FG/FSR3_Dx12_FG.cpp index 24302c27..54805758 100644 --- a/OptiScaler/inputs/FG/FSR3_Dx12_FG.cpp +++ b/OptiScaler/inputs/FG/FSR3_Dx12_FG.cpp @@ -459,7 +459,7 @@ static Fsr3::FfxErrorCode hkffxGetFrameinterpolationCommandlistDX12(Fsr3::FfxSwa static Fsr3::FfxResource hkffxGetFrameinterpolationTextureDX12(Fsr3::FfxSwapchain gameSwapChain) { - LOG_DEBUG(); + LOG_FUNC(); auto fg = State::Instance().currentFG; diff --git a/OptiScaler/inputs/FG/FfxApi_Dx12_FG.cpp b/OptiScaler/inputs/FG/FfxApi_Dx12_FG.cpp index 67623849..a45016e1 100644 --- a/OptiScaler/inputs/FG/FfxApi_Dx12_FG.cpp +++ b/OptiScaler/inputs/FG/FfxApi_Dx12_FG.cpp @@ -761,7 +761,7 @@ ffxReturnCode_t ffxQuery_Dx12FG(ffxContext* context, ffxQueryDescHeader* desc) return PASSTHRU_RETURN_CODE; #endif - LOG_DEBUG(); + LOG_FUNC(); if (desc->type == FFX_API_QUERY_DESC_TYPE_FRAMEGENERATION_GPU_MEMORY_USAGE) { diff --git a/OptiScaler/inputs/FG/Streamline_Inputs_Dx12.cpp b/OptiScaler/inputs/FG/Streamline_Inputs_Dx12.cpp index efb7b70f..73dd9de6 100644 --- a/OptiScaler/inputs/FG/Streamline_Inputs_Dx12.cpp +++ b/OptiScaler/inputs/FG/Streamline_Inputs_Dx12.cpp @@ -257,7 +257,7 @@ bool Sl_Inputs_Dx12::evaluateState(ID3D12Device* device) if (fgOutput == nullptr) return false; - LOG_DEBUG(); + LOG_FUNC(); static UINT64 lastFrameCount = 0; static UINT64 repeatsInRow = 0; @@ -426,7 +426,7 @@ bool Sl_Inputs_Dx12::reportResource(const sl::ResourceTag& tag, ID3D12GraphicsCo bool Sl_Inputs_Dx12::dispatchFG() { - LOG_DEBUG(); + LOG_FUNC(); return true; } diff --git a/OptiScaler/inputs/XeSS_Vulkan.cpp b/OptiScaler/inputs/XeSS_Vulkan.cpp index 3fb56e17..949e7705 100644 --- a/OptiScaler/inputs/XeSS_Vulkan.cpp +++ b/OptiScaler/inputs/XeSS_Vulkan.cpp @@ -398,7 +398,7 @@ xess_result_t hk_xessVKGetResourcesToDump(xess_context_handle_t hContext, xess_result_t hk_xessVKGetRequiredInstanceExtensions(uint32_t* instanceExtensionsCount, const char* const** instanceExtensions, uint32_t* minVkApiVersion) { - LOG_DEBUG(); + LOG_FUNC(); ScopedSkipSpoofing skipSpoofing {}; @@ -412,7 +412,7 @@ xess_result_t hk_xessVKGetRequiredDeviceExtensions(VkInstance instance, VkPhysic uint32_t* deviceExtensionsCount, const char* const** deviceExtensions) { - LOG_DEBUG(); + LOG_FUNC(); ScopedSkipSpoofing skipSpoofing {}; @@ -424,7 +424,7 @@ xess_result_t hk_xessVKGetRequiredDeviceExtensions(VkInstance instance, VkPhysic xess_result_t hk_xessVKGetRequiredDeviceFeatures(VkInstance instance, VkPhysicalDevice physicalDevice, void** features) { - LOG_DEBUG(); + LOG_FUNC(); ScopedSkipSpoofing skipSpoofing {}; diff --git a/OptiScaler/resource_tracking/ResTrack_dx12.cpp b/OptiScaler/resource_tracking/ResTrack_dx12.cpp index 884ef849..0cdfe8fe 100644 --- a/OptiScaler/resource_tracking/ResTrack_dx12.cpp +++ b/OptiScaler/resource_tracking/ResTrack_dx12.cpp @@ -1720,7 +1720,7 @@ void ResTrack_Dx12::hkDrawIndexedInstanced(ID3D12GraphicsCommandList* This, UINT void ResTrack_Dx12::hkExecuteBundle(ID3D12GraphicsCommandList* This, ID3D12GraphicsCommandList* pCommandList) { - LOG_WARN(); + LOG_FUNC(); IFGFeature_Dx12* fg = State::Instance().currentFG; auto index = fg != nullptr ? fg->GetIndex() : 0; diff --git a/OptiScaler/shaders/output_scaling/OS_Vk.cpp b/OptiScaler/shaders/output_scaling/OS_Vk.cpp index bb3ed2bf..d7bbc93a 100644 --- a/OptiScaler/shaders/output_scaling/OS_Vk.cpp +++ b/OptiScaler/shaders/output_scaling/OS_Vk.cpp @@ -28,7 +28,7 @@ OS_Vk::OS_Vk(std::string InName, VkDevice InDevice, VkPhysicalDevice InPhysicalD return; } - LOG_DEBUG(); + LOG_FUNC(); VkSamplerCreateInfo samplerInfo {}; samplerInfo.sType = VK_STRUCTURE_TYPE_SAMPLER_CREATE_INFO; diff --git a/OptiScaler/shaders/rcas/RCAS_Vk.cpp b/OptiScaler/shaders/rcas/RCAS_Vk.cpp index 54341b7d..2616cb87 100644 --- a/OptiScaler/shaders/rcas/RCAS_Vk.cpp +++ b/OptiScaler/shaders/rcas/RCAS_Vk.cpp @@ -12,7 +12,7 @@ RCAS_Vk::RCAS_Vk(std::string InName, VkDevice InDevice, VkPhysicalDevice InPhysi return; } - LOG_DEBUG(); + LOG_FUNC(); CreateDescriptorSetLayout(); CreateConstantBuffer();