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

WIP: XeLL inputs to AL2

Browse Source
This commit is contained in:
FakeMichau
2026-06-16 22:45:37 +02:00
parent 12b321380b
commit d9f6be9acf
4 changed files with 29 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
OptiScaler/hooks/Amdxc64_Hooks.cpp
+2 -8
View File
@@ -148,7 +148,7 @@ HRESULT STDMETHODCALLTYPE Amdxc64Hooks::hkAmdExtD3DCreateInterface(IUnknown* pOu
}
#ifdef LOW_LATENCY_INPUTS
else if (riid == IID_IAmdExtAntiLagApi)
else if (riid == IID_IAmdExtAntiLagApi && disableAl2Kill)
{
if (amdExtAntiLagApi == nullptr)
amdExtAntiLagApi = new AmdExtAntiLagApi();
@@ -156,15 +156,9 @@ HRESULT STDMETHODCALLTYPE Amdxc64Hooks::hkAmdExtD3DCreateInterface(IUnknown* pOu
// Return custom one
*ppvObject = amdExtAntiLagApi;
LOG_INFO("IAmdExtAntiLagApi queried, returning custom AmdExtAntiLagApi");
LOG_INFO("Providing the game with AL2 proxy, AL2 inputs should be avaliable");
return S_OK;
// if (!disableAl2Kill)
//{
// LOG_INFO("Killing native AL2");
// return E_NOINTERFACE;
// }
}
#endif
OptiScaler/low_latency/input/input_common.cpp
+23 -9
View File
@@ -1,6 +1,7 @@
#include "pch.h"
#include "input_common.h"
#include <low_latency/low_latency_tech/ll_xell.h>
#include <low_latency/low_latency_tech/ll_antilag2.h>
// private
bool InputCommon::update_low_latency_tech(IUnknown* pDevice, std::optional<LowLatencyMode> mode)
@@ -27,19 +28,20 @@ bool InputCommon::update_low_latency_tech(IUnknown* pDevice, std::optional<LowLa
// TODO: unsure if this is good thing to do, unsupported input can be selected via the config
// TODO: add option for totally disabling specific inputs on boot
Config::Instance()->LowLatencyInput.set_volatile_value(LowLatencyInput::XeLL);
activeInput = Config::Instance()->LowLatencyInput.value_or_default();
// TODO: for testing
Config::Instance()->LowLatencyOutput.set_volatile_value(LowLatencyMode::XeLL);
Config::Instance()->LowLatencyOutput.set_volatile_value(LowLatencyMode::AntiLag2);
if (activeOutput == Config::Instance()->LowLatencyOutput.value_or_default())
return true;
// TODO: init correct currently_active_tech, desiredMode == None -> Auto
auto new_tech_xell = std::make_shared<XeLL>();
auto new_tech_xell = std::make_shared<AntiLag2>();
if (new_tech_xell->init(pDevice))
{
LOG_INFO("LowLatency algo: XeLL");
LOG_INFO("LowLatency algo: AntiLag2");
currently_active_tech.store(std::move(new_tech_xell));
}
@@ -212,7 +214,6 @@ InputResult InputCommon::set_async_marker(const InputContext& inputContext, ID3D
return InputResult::Ok;
}
// TODO: impl
InputResult InputCommon::set_sleep_mode(const InputContext& inputContext, IUnknown* pDevice, SleepMode* sleep_mode)
{
if (!update_low_latency_tech(pDevice))
@@ -494,6 +495,9 @@ bool InputCommon::get_timing_data(TimingData& timingDataOut)
xell_result_t InputCommon::pass_xellD3D12SetAppQueue(const InputContext& inputContext, ID3D12CommandQueue* appQueue)
{
// TODO: XeLL seems to be sending this early, before any markers. Because of that activeOutput is likely still None
// and we dont grab the appQueue at all
if (inputContext.caller == LowLatencyInput::XeLL && activeOutput == LowLatencyMode::XeLL)
{
if (auto current_tech = currently_active_tech.load())
@@ -501,9 +505,11 @@ xell_result_t InputCommon::pass_xellD3D12SetAppQueue(const InputContext& inputCo
auto xell_tech = std::static_pointer_cast<XeLL>(current_tech);
return xell_tech->xellD3D12SetAppQueue(appQueue);
}
return XELL_RESULT_ERROR_UNKNOWN;
}
return XELL_RESULT_ERROR_UNKNOWN;
return XELL_RESULT_SUCCESS;
}
xell_result_t InputCommon::pass_xellSetDisplayInfo(const InputContext& inputContext, void* displayInfo)
@@ -515,9 +521,11 @@ xell_result_t InputCommon::pass_xellSetDisplayInfo(const InputContext& inputCont
auto xell_tech = std::static_pointer_cast<XeLL>(current_tech);
return xell_tech->xellSetDisplayInfo(displayInfo);
}
return XELL_RESULT_ERROR_UNKNOWN;
}
return XELL_RESULT_ERROR_UNKNOWN;
return XELL_RESULT_SUCCESS;
}
xell_result_t InputCommon::pass_xellSetFgEnabled(const InputContext& inputContext, uint32_t param1, uint32_t param2)
@@ -529,9 +537,11 @@ xell_result_t InputCommon::pass_xellSetFgEnabled(const InputContext& inputContex
auto xell_tech = std::static_pointer_cast<XeLL>(current_tech);
return xell_tech->xellSetFgEnabled(param1, param2);
}
return XELL_RESULT_ERROR_UNKNOWN;
}
return XELL_RESULT_ERROR_UNKNOWN;
return XELL_RESULT_SUCCESS;
}
xell_result_t InputCommon::pass_xellSetGeneratedFramesCount(const InputContext& inputContext, uint32_t param1,
@@ -544,9 +554,11 @@ xell_result_t InputCommon::pass_xellSetGeneratedFramesCount(const InputContext&
auto xell_tech = std::static_pointer_cast<XeLL>(current_tech);
return xell_tech->xellSetGeneratedFramesCount(param1, framesCount);
}
return XELL_RESULT_ERROR_UNKNOWN;
}
return XELL_RESULT_ERROR_UNKNOWN;
return XELL_RESULT_SUCCESS;
}
xell_result_t InputCommon::pass_xellGetLastPresentStartFrameId(const InputContext& inputContext, uint32_t* p_frame_id)
@@ -558,7 +570,9 @@ xell_result_t InputCommon::pass_xellGetLastPresentStartFrameId(const InputContex
auto xell_tech = std::static_pointer_cast<XeLL>(current_tech);
return xell_tech->xellGetLastPresentStartFrameId(p_frame_id);
}
return XELL_RESULT_ERROR_UNKNOWN;
}
return XELL_RESULT_ERROR_UNKNOWN;
return XELL_RESULT_SUCCESS;
}
OptiScaler/low_latency/input/input_xell.cpp
+3
View File
@@ -1,5 +1,6 @@
#include "pch.h"
#include "input_xell.h"
#include <hooks/Xell_Hooks.h>
// Common
xell_result_t InputXeLL::DestroyContext(xell_input_handle_t context)
@@ -182,6 +183,8 @@ xell_result_t InputXeLL::D3D12CreateContext(ID3D12Device* device, xell_input_han
*out_context = newContext;
XellHooks::setOurContext((xell_context_handle_t) newContext);
return XELL_RESULT_SUCCESS;
}
OptiScaler/menu/menu_common.cpp
+1
View File
@@ -31,6 +31,7 @@
#include <type_traits>
#include <misc/IdentifyGpu.h>
#include <hooks/Xell_Hooks.h>
#include <low_latency/input/input_common.h>
#define MARK_ALL_BACKENDS_CHANGED() \
for (auto& singleChangeBackend : State::Instance().changeBackend) \