diff --git a/OptiScaler/shaders/rcas/RCAS_Common.cpp b/OptiScaler/shaders/rcas/RCAS_Common.cpp index 5f468105..85211d60 100644 --- a/OptiScaler/shaders/rcas/RCAS_Common.cpp +++ b/OptiScaler/shaders/rcas/RCAS_Common.cpp @@ -30,6 +30,29 @@ void RCAS_Common::FillMotionConstants(InternalConstants& OutConstants, const Rca OutConstants.MotionTextureScale = (float) OutConstants.MotionWidth / (float) OutConstants.OutputWidth; } +void RCAS_Common::SetTimedShader(SharpenShader InShader) +{ + // Same names as the Method combo of the menu + const char* name = "RCAS"; + + switch (InShader) + { + case SharpenShader::DepthAware: + name = "Depth Aware (RCAS)"; + break; + case SharpenShader::LocalContrastDepthAware: + name = "Depth Aware (DAS)"; + break; + case SharpenShader::BabaNeural: + name = "Neural (BaBa)"; + break; + default: + break; + } + + _timedShaderName = name; +} + void RCAS_Common::FillMotionConstants(InternalConstantsDA& OutConstants, const RcasConstants& InConstants) { OutConstants.Sharpness = InConstants.Sharpness * 2.0f; diff --git a/OptiScaler/shaders/rcas/RCAS_Common.h b/OptiScaler/shaders/rcas/RCAS_Common.h index f97b9f05..bbd8b12c 100644 --- a/OptiScaler/shaders/rcas/RCAS_Common.h +++ b/OptiScaler/shaders/rcas/RCAS_Common.h @@ -7,6 +7,8 @@ #include "shaders/DA_RCAS_Shader.h" #include "shaders/RCAS_Shader.h" +#include + struct RcasConstants { float Sharpness; @@ -25,7 +27,14 @@ struct RcasConstants class RCAS_Common { + public: + // The sharpening shader that ran last, its GPU time is shown under this name + const char* TimedShaderName() const { return _timedShaderName; } + protected: + // Called by Dispatch with the shader it runs, after the fallbacks + void SetTimedShader(SharpenShader InShader); + struct alignas(256) InternalConstants { float Sharpness; @@ -121,4 +130,8 @@ class RCAS_Common void FillMotionConstants(InternalConstants& OutConstants, const RcasConstants& InConstants); void FillMotionConstants(InternalConstantsDA& OutConstants, const RcasConstants& InConstants); void FillMotionConstants(InternalConstantsBaba& OutConstants, const RcasConstants& InConstants); + + private: + // Written by Dispatch, read by the present hooks + std::atomic _timedShaderName { "RCAS" }; }; diff --git a/OptiScaler/shaders/rcas/RCAS_Dx11.cpp b/OptiScaler/shaders/rcas/RCAS_Dx11.cpp index 1769900a..ecd83bc0 100644 --- a/OptiScaler/shaders/rcas/RCAS_Dx11.cpp +++ b/OptiScaler/shaders/rcas/RCAS_Dx11.cpp @@ -337,6 +337,8 @@ bool RCAS_Dx11::Dispatch(ID3D11Device* InDevice, ID3D11DeviceContext* InContext, if (sharpnessShader == SharpenShader::BabaNeural && !EnsureBabaShader(InDevice)) sharpnessShader = SharpenShader::RCAS; + SetTimedShader(sharpnessShader); + if (sharpnessShader == SharpenShader::LocalContrastDepthAware) { return DispatchDASDepthAdaptive(InDevice, InContext, InResource, InMotionVectors, InDepth, InConstants, diff --git a/OptiScaler/shaders/rcas/RCAS_Dx12.cpp b/OptiScaler/shaders/rcas/RCAS_Dx12.cpp index 46319c0e..c18acaad 100644 --- a/OptiScaler/shaders/rcas/RCAS_Dx12.cpp +++ b/OptiScaler/shaders/rcas/RCAS_Dx12.cpp @@ -215,6 +215,8 @@ bool RCAS_Dx12::Dispatch(ID3D12GraphicsCommandList* InCmdList, ID3D12Resource* I if (sharpnessShader == SharpenShader::BabaNeural && !EnsureBabaPipeline()) sharpnessShader = SharpenShader::RCAS; + SetTimedShader(sharpnessShader); + if (sharpnessShader == SharpenShader::LocalContrastDepthAware) { return DispatchDepthAdaptive(_pipelineStateDASDA, InCmdList, InResource, InMotionVectors, InDepth, InConstants, diff --git a/OptiScaler/shaders/rcas/RCAS_Vk.cpp b/OptiScaler/shaders/rcas/RCAS_Vk.cpp index 74a012db..a1a487c1 100644 --- a/OptiScaler/shaders/rcas/RCAS_Vk.cpp +++ b/OptiScaler/shaders/rcas/RCAS_Vk.cpp @@ -226,18 +226,6 @@ bool RCAS_Vk::DispatchRCAS(VkCommandBuffer InCmdList, RcasConstants InConstants, bool RCAS_Vk::DispatchBaba(VkCommandBuffer InCmdList, RcasConstants InConstants, const VkImageInfo& InResourceInfo, const VkImageInfo& InMotionVectorsInfo, const VkImageInfo& OutResourceInfo) { - // No spir-v for it, plain RCAS instead - if (_pipelineBaba == VK_NULL_HANDLE) - { - if (!_babaFallbackLogged) - { - LOG_WARN("BaBa Neural sharpening isn't available for Vulkan in this build, using RCAS"); - _babaFallbackLogged = true; - } - - return DispatchRCAS(InCmdList, InConstants, InResourceInfo, InMotionVectorsInfo, OutResourceInfo); - } - InternalConstantsBaba constants {}; constants.OutputWidth = OutResourceInfo.Width; constants.OutputHeight = OutResourceInfo.Height; @@ -313,6 +301,21 @@ bool RCAS_Vk::Dispatch(VkDevice InDevice, VkCommandBuffer InCmdList, RcasConstan if (InDepthInfo == nullptr && (sharpnessShader == SharpenShader::LocalContrastDepthAware || sharpnessShader == SharpenShader::DepthAware)) sharpnessShader = SharpenShader::RCAS; + + // No spir-v for BaBa Neural, plain RCAS instead + if (sharpnessShader == SharpenShader::BabaNeural && _pipelineBaba == VK_NULL_HANDLE) + { + if (!_babaFallbackLogged) + { + LOG_WARN("BaBa Neural sharpening isn't available for Vulkan in this build, using RCAS"); + _babaFallbackLogged = true; + } + + sharpnessShader = SharpenShader::RCAS; + } + + SetTimedShader(sharpnessShader); + if (sharpnessShader == SharpenShader::LocalContrastDepthAware) { return DispatchDepthAdaptive(InCmdList, InConstants, InResourceInfo, InMotionVectorsInfo, OutResourceInfo, diff --git a/OptiScaler/upscalers/IFeature_Dx11.cpp b/OptiScaler/upscalers/IFeature_Dx11.cpp index a62c2ef0..e1d4d709 100644 --- a/OptiScaler/upscalers/IFeature_Dx11.cpp +++ b/OptiScaler/upscalers/IFeature_Dx11.cpp @@ -515,7 +515,7 @@ void IFeature_Dx11::ReadDetailedGpuTimes(void* deviceContextVoid, std::vectorName(), lastRcasTime.value(), true }); + detailedGpuTimes.emplace_back(DetailedGpuTime { RCAS->TimedShaderName(), lastRcasTime.value(), true }); if (lastOutputScalingTime) detailedGpuTimes.emplace_back(DetailedGpuTime { OutputScaler->Name(), lastOutputScalingTime.value(), true }); diff --git a/OptiScaler/upscalers/IFeature_Dx12.cpp b/OptiScaler/upscalers/IFeature_Dx12.cpp index 25638fdb..9ed18cae 100644 --- a/OptiScaler/upscalers/IFeature_Dx12.cpp +++ b/OptiScaler/upscalers/IFeature_Dx12.cpp @@ -755,7 +755,7 @@ void IFeature_Dx12::ReadDetailedGpuTimes(void* commandQueueVoid, std::vectorName(), lastRcasTime.value(), true }); + detailedGpuTimes.emplace_back(DetailedGpuTime { RCAS->TimedShaderName(), lastRcasTime.value(), true }); if (lastOutputScalingTime) detailedGpuTimes.emplace_back(DetailedGpuTime { OutputScaler->Name(), lastOutputScalingTime.value(), true }); diff --git a/OptiScaler/upscalers/IFeature_Vk.cpp b/OptiScaler/upscalers/IFeature_Vk.cpp index 3e1efec6..8756c91b 100644 --- a/OptiScaler/upscalers/IFeature_Vk.cpp +++ b/OptiScaler/upscalers/IFeature_Vk.cpp @@ -477,7 +477,7 @@ void IFeature_Vk::ReadDetailedGpuTimes(void* unused, std::vectorName(), lastRcasTime.value(), true }); + detailedGpuTimes.emplace_back(DetailedGpuTime { RCAS->TimedShaderName(), lastRcasTime.value(), true }); if (lastOutputScalingTime) detailedGpuTimes.emplace_back(DetailedGpuTime { OutputScaler->Name(), lastOutputScalingTime.value(), true });