From cbce1bc421c176dd9e0288ae84da256ce21fe0e1 Mon Sep 17 00:00:00 2001 From: FakeMichau <49685661+FakeMichau@users.noreply.github.com> Date: Thu, 16 Jan 2025 23:29:52 +0100 Subject: [PATCH] Add support for mingw in al2 --- OptiScaler/nvapi/fakenvapi/fakenvapi.cpp | 2 +- OptiScaler/nvapi/fakenvapi/fakenvapi.h | 2 +- OptiScaler/nvapi/fakenvapi/lowlatency.h | 16 ++++++++-------- OptiScaler/nvapi/fakenvapi/main.cpp | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/OptiScaler/nvapi/fakenvapi/fakenvapi.cpp b/OptiScaler/nvapi/fakenvapi/fakenvapi.cpp index 6629998d..de5becf5 100644 --- a/OptiScaler/nvapi/fakenvapi/fakenvapi.cpp +++ b/OptiScaler/nvapi/fakenvapi/fakenvapi.cpp @@ -729,7 +729,7 @@ namespace nvd { return OK(); } -#if _MSC_VER && _WIN64 +#if _WIN64 NvAPI_Status __cdecl Fake_GetAntiLagCtx(AMD::AntiLag2DX12::Context** al2_context) { if (al2_context == nullptr) return ERROR_VALUE(NVAPI_INVALID_ARGUMENT); diff --git a/OptiScaler/nvapi/fakenvapi/fakenvapi.h b/OptiScaler/nvapi/fakenvapi/fakenvapi.h index 0c1b6c97..c3d4dabd 100644 --- a/OptiScaler/nvapi/fakenvapi/fakenvapi.h +++ b/OptiScaler/nvapi/fakenvapi/fakenvapi.h @@ -96,7 +96,7 @@ namespace nvd { NvAPI_Status __cdecl Fake_GetLatency(uint64_t* call_spot, uint64_t* wait_target, uint64_t* latency, uint64_t* frame_time); NvAPI_Status __cdecl Fake_InformFGState(bool fg_state); NvAPI_Status __cdecl Fake_InformPresentFG(bool frame_interpolated, uint64_t reflex_frame_id); -#if _MSC_VER && _WIN64 +#if _WIN64 NvAPI_Status __cdecl Fake_GetAntiLagCtx(AMD::AntiLag2DX12::Context** al2_context); #endif } \ No newline at end of file diff --git a/OptiScaler/nvapi/fakenvapi/lowlatency.h b/OptiScaler/nvapi/fakenvapi/lowlatency.h index 33bd84c6..41f163a8 100644 --- a/OptiScaler/nvapi/fakenvapi/lowlatency.h +++ b/OptiScaler/nvapi/fakenvapi/lowlatency.h @@ -7,7 +7,7 @@ #include "../external/d3d12.h" #endif -#if _MSC_VER && _WIN64 +#if _WIN64 #include "../external/ffx_antilag2_dx12.h" #include "../external/ffx_antilag2_dx11.h" #endif @@ -57,7 +57,7 @@ struct FrameReport { }; class LowLatency { -#if _MSC_VER && _WIN64 +#if _WIN64 Mode mode = Mode::AntiLag2; #else Mode mode = Mode::LatencyFlex; @@ -118,7 +118,7 @@ class LowLatency { } public: -#if _MSC_VER && _WIN64 +#if _WIN64 AMD::AntiLag2DX12::Context al2_dx12_ctx = {}; AMD::AntiLag2DX11::Context al2_dx11_ctx = {}; #endif @@ -132,7 +132,7 @@ public: bool active = true; inline void init_al2(IUnknown *pDevice) { -#if _MSC_VER && _WIN64 +#if _WIN64 if (mode == Mode::AntiLag2 && !al2_dx12_ctx.m_pAntiLagAPI && !al2_dx11_ctx.m_pAntiLagAPI) { ID3D12Device* device = nullptr; HRESULT hr = pDevice->QueryInterface(__uuidof(ID3D12Device), reinterpret_cast(&device)); @@ -211,7 +211,7 @@ public: spdlog::debug("FG status: {}", effective_fg_state ? "enabled" : "disabled"); if (mode == Mode::AntiLag2) { -#if _MSC_VER && _WIN64 +#if _WIN64 if (lfx_stats.frame_id != 1) lfx_stats.needs_reset = true; int max_fps = 0; if ((fg || forced_fg) && min_interval_us != 0) { @@ -288,7 +288,7 @@ public: } inline HRESULT set_fg_type(bool interpolated, uint64_t reflex_frame_id) { -#if _MSC_VER && _WIN64 +#if _WIN64 if (fg || forced_fg) { log_event("al2_set_fg_type", "{}", reflex_frame_id); return AMD::AntiLag2DX12::SetFrameGenFrameType(&al2_dx12_ctx, interpolated); @@ -298,7 +298,7 @@ public: } inline HRESULT mark_end_of_rendering(uint64_t reflex_frame_id) { -#if _MSC_VER && _WIN64 +#if _WIN64 if (fg || forced_fg) { log_event("al2_end_of_rendering", "{}", reflex_frame_id); return AMD::AntiLag2DX12::MarkEndOfFrameRendering(&al2_dx12_ctx); @@ -375,7 +375,7 @@ public: } inline void unload() { -#if _MSC_VER && _WIN64 +#if _WIN64 if (al2_dx12_ctx.m_pAntiLagAPI && !AMD::AntiLag2DX12::DeInitialize(&al2_dx12_ctx)) spdlog::info("AntiLag 2 DX12 deinitialized"); if (al2_dx11_ctx.m_pAntiLagAPI && !AMD::AntiLag2DX11::DeInitialize(&al2_dx11_ctx)) diff --git a/OptiScaler/nvapi/fakenvapi/main.cpp b/OptiScaler/nvapi/fakenvapi/main.cpp index 4ce30de8..9fb1b880 100755 --- a/OptiScaler/nvapi/fakenvapi/main.cpp +++ b/OptiScaler/nvapi/fakenvapi/main.cpp @@ -159,7 +159,7 @@ namespace nvd { INSERT_AND_RETURN_WHEN_EQUALS(Fake_GetLatency) INSERT_AND_RETURN_WHEN_EQUALS(Fake_InformFGState) INSERT_AND_RETURN_WHEN_EQUALS(Fake_InformPresentFG) -#if _MSC_VER && _WIN64 +#if _WIN64 INSERT_AND_RETURN_WHEN_EQUALS(Fake_GetAntiLagCtx) #endif