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

Hook up logging and fix wrong frame id

Browse Source
This commit is contained in:
FakeMichau
2025-05-27 11:27:12 +02:00
parent e850911d9f
commit 010366cfd3
2 changed files with 33 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
OptiScaler/nvapi/fakenvapi/fakenvapi.cpp
+1
View File
@@ -342,6 +342,7 @@ namespace nvd {
if (pGetLatencyParams == nullptr)
return ERROR_VALUE(NVAPI_INVALID_ARGUMENT);
// xellGetFramesReports() currently doesn't give any extra data that we can't already get
memcpy(&pGetLatencyParams->frameReport, &lowlatency_ctx.frame_reports, sizeof(lowlatency_ctx.frame_reports));
// FrameReport* frame_reports = reinterpret_cast<FrameReport*>(pGetLatencyParams->frameReport);
OptiScaler/nvapi/fakenvapi/lowlatency.h
+32 -7
View File
@@ -58,6 +58,23 @@ struct FrameReport {
NvU8 rsvd[120];
};
void xell_logging(const char* message, xell_logging_level_t loggingLevel) {
switch (loggingLevel) {
case XELL_LOGGING_LEVEL_DEBUG:
spdlog::debug("XeLL: {}", message);
break;
case XELL_LOGGING_LEVEL_INFO:
spdlog::info("XeLL: {}", message);
break;
case XELL_LOGGING_LEVEL_WARNING:
spdlog::warn("XeLL: {}", message);
break;
case XELL_LOGGING_LEVEL_ERROR:
spdlog::error("XeLL: {}", message);
break;
}
}
class LowLatency {
#if _WIN64
Mode mode = Mode::AntiLag2;
@@ -71,7 +88,6 @@ class LowLatency {
ForceReflex force_reflex = ForceReflex::InGame;
lfx::LatencyFleX *lfx_ctx = nullptr;
xell_context_handle_t xell_ctx = nullptr;
bool xell_available = false;
bool al_available = false;
bool force_latencyflex = false;
@@ -189,6 +205,7 @@ public:
AMD::AntiLag2DX12::Context al2_dx12_ctx = {};
AMD::AntiLag2DX11::Context al2_dx11_ctx = {};
#endif
xell_context_handle_t xell_ctx = nullptr;
CallSpot call_spot = CallSpot::SleepCall;
LFXStats lfx_stats = {};
LFXMode lfx_mode = {};
@@ -237,9 +254,10 @@ public:
auto result = xellD3D12CreateContext(dx12_pDevice, &xell_ctx);
if (result == XELL_RESULT_SUCCESS) {
if (result == XELL_RESULT_SUCCESS && xell_ctx) {
mode = Mode::XeLL;
xell_available = true;
xellSetLoggingCallback(xell_ctx, XELL_LOGGING_LEVEL_DEBUG, xell_logging);
}
else {
mode = Mode::LatencyFlex;
@@ -376,7 +394,8 @@ public:
return S_OK;
} else if (mode == Mode::XeLL) {
xellSleep(xell_ctx, reflex_frame_id);
if (reflex_frame_id > 0) // XeLL needs a valid frame_id but NvAPI_D3D_Sleep doesn't provide that
xellSleep(xell_ctx, reflex_frame_id);
return S_OK;
}
@@ -447,8 +466,6 @@ public:
pcl_start(pSetLatencyMarkerParams->frameID);
xellAddMarkerData(xell_ctx, pSetLatencyMarkerParams->frameID, XELL_SIMULATION_START);
simulation_start_thread = std::this_thread::get_id();
if (call_spot == CallSpot::SleepCall) {
@@ -461,6 +478,8 @@ public:
spdlog::debug("LowLatency update called on simulation start with result: {}", update(pSetLatencyMarkerParams->frameID));
xellAddMarkerData(xell_ctx, pSetLatencyMarkerParams->frameID, XELL_SIMULATION_START);
break;
case SIMULATION_END:
log_event("marker_SIMULATION_END", "{}", pSetLatencyMarkerParams->frameID);
@@ -511,12 +530,18 @@ public:
case INPUT_SAMPLE:
log_event("marker_INPUT_SAMPLE", "{}", pSetLatencyMarkerParams->frameID);
xellAddMarkerData(xell_ctx, pSetLatencyMarkerParams->frameID, XELL_INPUT_SAMPLE);
if (call_spot == CallSpot::SleepCall) {
xellAddMarkerData(xell_ctx, pSetLatencyMarkerParams->frameID, XELL_INPUT_SAMPLE);
break;
}
if (call_spot == CallSpot::SleepCall) break;
call_spot = CallSpot::InputSample;
spdlog::debug("LowLatency update called on input sample with result: {}", update(pSetLatencyMarkerParams->frameID));
// in case we are calling xell update from here, sleep needs to happen before any other markers
xellAddMarkerData(xell_ctx, pSetLatencyMarkerParams->frameID, XELL_INPUT_SAMPLE);
break;
default:
log_event("marker_other", "{}", pSetLatencyMarkerParams->frameID);