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

Merge branch 'v0.9' of https://github.com/optiscaler/OptiScaler into v0.9

Browse Source
This commit is contained in:
cdozdil
2025-09-02 01:35:33 +03:00
parent 6439e654df 22a68f1a3d
commit 620161bbbc
8 changed files with 13 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files
OptiScaler/inputs/FG/Streamline_Inputs_Dx12.cpp
+2
View File
@@ -484,6 +484,8 @@ bool Sl_Inputs_Dx12::dispatchFG()
fgOutput->SetReset(slConstsRef.reset == sl::Boolean::eTrue);
fgOutput->SetFrameTimeDelta(State::Instance().lastFrameTime);
fgOutput->SetInterpolationRect(interpolationWidth, interpolationHeight);
interpolationWidth = 0;
interpolationHeight = 0;
OptiScaler/upscalers/IFeature.h
+1
View File
@@ -5,6 +5,7 @@
#include <nvsdk_ngx_defs.h>
#include <unordered_set>
#include <Util.h>
#define DLSS_MOD_ID_OFFSET 1000000
OptiScaler/upscalers/fsr2/FSR2Feature.cpp
+1 -21
View File
@@ -5,32 +5,12 @@
double FSR2Feature::GetDeltaTime()
{
double currentTime = MillisecondsNow();
double currentTime = Util::MillisecondsNow();
double deltaTime = (currentTime - _lastFrameTime);
_lastFrameTime = currentTime;
return deltaTime;
}
double FSR2Feature::MillisecondsNow()
{
static LARGE_INTEGER s_frequency;
static BOOL s_use_qpc = QueryPerformanceFrequency(&s_frequency);
double milliseconds = 0;
if (s_use_qpc)
{
LARGE_INTEGER now;
QueryPerformanceCounter(&now);
milliseconds = double(1000.0 * now.QuadPart) / s_frequency.QuadPart;
}
else
{
milliseconds = double(GetTickCount64());
}
return milliseconds;
}
FSR2Feature::~FSR2Feature()
{
if (!IsInited())
OptiScaler/upscalers/fsr2/FSR2Feature.h
+1 -2
View File
@@ -70,7 +70,6 @@ class FSR2Feature : public virtual IFeature
virtual bool InitFSR2(const NVSDK_NGX_Parameter* InParameters) = 0;
double MillisecondsNow();
double GetDeltaTime();
public:
@@ -81,7 +80,7 @@ class FSR2Feature : public virtual IFeature
{
_initParameters = SetInitParameters(InParameters);
_moduleLoaded = true;
_lastFrameTime = MillisecondsNow();
_lastFrameTime = Util::MillisecondsNow();
}
~FSR2Feature();
OptiScaler/upscalers/fsr2_212/FSR2Feature_212.cpp
+1 -21
View File
@@ -4,32 +4,12 @@
double FSR2Feature212::GetDeltaTime()
{
double currentTime = MillisecondsNow();
double currentTime = Util::MillisecondsNow();
double deltaTime = (currentTime - _lastFrameTime);
_lastFrameTime = currentTime;
return deltaTime;
}
double FSR2Feature212::MillisecondsNow()
{
static LARGE_INTEGER s_frequency;
static BOOL s_use_qpc = QueryPerformanceFrequency(&s_frequency);
double milliseconds = 0;
if (s_use_qpc)
{
LARGE_INTEGER now;
QueryPerformanceCounter(&now);
milliseconds = double(1000.0 * now.QuadPart) / s_frequency.QuadPart;
}
else
{
milliseconds = double(GetTickCount64());
}
return milliseconds;
}
FSR2Feature212::~FSR2Feature212()
{
if (!IsInited())
OptiScaler/upscalers/fsr2_212/FSR2Feature_212.h
+1 -2
View File
@@ -58,7 +58,6 @@ class FSR2Feature212 : public virtual IFeature
virtual bool InitFSR2(const NVSDK_NGX_Parameter* InParameters) = 0;
double MillisecondsNow();
double GetDeltaTime();
public:
@@ -69,7 +68,7 @@ class FSR2Feature212 : public virtual IFeature
{
_initParameters = SetInitParameters(InParameters);
_moduleLoaded = true;
_lastFrameTime = MillisecondsNow();
_lastFrameTime = Util::MillisecondsNow();
}
~FSR2Feature212();
OptiScaler/upscalers/fsr31/FSR31Feature.cpp
+5 -18
View File
@@ -4,30 +4,17 @@
double FSR31Feature::GetDeltaTime()
{
double currentTime = MillisecondsNow();
double currentTime = Util::MillisecondsNow();
double deltaTime = (currentTime - _lastFrameTime);
_lastFrameTime = currentTime;
return deltaTime;
}
double FSR31Feature::MillisecondsNow()
FSR31Feature::FSR31Feature(unsigned int InHandleId, NVSDK_NGX_Parameter* InParameters)
: IFeature(InHandleId, InParameters)
{
static LARGE_INTEGER s_frequency;
static BOOL s_use_qpc = QueryPerformanceFrequency(&s_frequency);
double milliseconds = 0;
if (s_use_qpc)
{
LARGE_INTEGER now;
QueryPerformanceCounter(&now);
milliseconds = double(1000.0 * now.QuadPart) / s_frequency.QuadPart;
}
else
{
milliseconds = double(GetTickCount64());
}
return milliseconds;
_initParameters = SetInitParameters(InParameters);
_lastFrameTime = Util::MillisecondsNow();
}
FSR31Feature::~FSR31Feature()
OptiScaler/upscalers/fsr31/FSR31Feature.h
+1 -6
View File
@@ -26,7 +26,6 @@ class FSR31Feature : public virtual IFeature
virtual bool InitFSR3(const NVSDK_NGX_Parameter* InParameters) = 0;
double MillisecondsNow();
double GetDeltaTime();
static inline void parse_version(const char* version_str)
@@ -99,11 +98,7 @@ class FSR31Feature : public virtual IFeature
feature_version Version() final { return _version; }
std::string Name() const { return _name.c_str(); }
FSR31Feature(unsigned int InHandleId, NVSDK_NGX_Parameter* InParameters) : IFeature(InHandleId, InParameters)
{
_initParameters = SetInitParameters(InParameters);
_lastFrameTime = MillisecondsNow();
}
FSR31Feature(unsigned int InHandleId, NVSDK_NGX_Parameter* InParameters);
~FSR31Feature();
};