Skip to content

fix(extra-natives/rdr3): graphic natives flickering #4043

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Ehbw wants to merge 2 commits into
base: master
Choose a base branch
from
+50 −30
Open

fix(extra-natives/rdr3): graphic natives flickering #4043

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7fa76b7
fix(extra-natives/rdr3): graphic natives flickering
Ehbw Jun 25, 2026
b43f76b
fix(extra-natives/rdr3): SET_DRAW_ORIGIN flickering and positional issue
Ehbw Jun 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
80 changes: 50 additions & 30 deletions code/components/extra-natives-rdr3/src/GraphicsNatives.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
#include "Hooking.Stubs.h"
#include "GamePrimitives.h"
#include "scrEngine.h"
#include <nutsnbolts.h>
#include <DrawCommands.h>

enum ScriptImDrawType : uint32_t
{
Expand All @@ -28,6 +30,9 @@ struct ScriptImRequest

static constexpr int kMaxScriptImRequests = 1024;
static std::vector<ScriptImRequest> g_scriptImRequests{};
static std::vector<ScriptImRequest> g_scriptImRenderBuffer{};

static std::atomic<bool> g_scriptImReady{false};

static ScriptImRequest** g_scriptImBuffer;
static uint16_t* g_scriptImEntriesCount;
Expand All @@ -43,20 +48,27 @@ static void RenderScriptIm()
// The game never uses this buffer itself, but it *may* be changed in the future updates.
// This code isn't ready for such a scenario, so might potentially require tweaks.
// Like if something allocate script im buffer before us, we would need to resize it
// and not just rewrite everything without custom stuff.

if (g_scriptImRequests.empty())
// and not just rewrite everything without custom stuff.

// Wait until the main thread is done for this frame before pushing new requests
if (g_scriptImReady.load(std::memory_order_acquire))
{
g_scriptImRenderBuffer.clear();
std::swap(g_scriptImRequests, g_scriptImRenderBuffer);
}

if (g_scriptImRenderBuffer.empty())
{
return;
}

*g_scriptImEntriesCount = g_scriptImRequests.size();
*g_scriptImEntriesCount = g_scriptImRenderBuffer.size();

// If the buffer isn't allocated, let's do it.
if (!*g_scriptImBuffer)
{
initScriptImBuffer();
}
}

// Failed to allocate? Bail out.
if (!*g_scriptImBuffer)
Expand All @@ -66,13 +78,11 @@ static void RenderScriptIm()
}

// Move stuff from our temp vector to the in-game buffer.
std::move(g_scriptImRequests.begin(), g_scriptImRequests.end(), *g_scriptImBuffer);
std::copy(g_scriptImRenderBuffer.begin(), g_scriptImRenderBuffer.end(), *g_scriptImBuffer);

g_origRenderScriptIm();

g_scriptImRequests.clear();
*g_scriptImEntriesCount = 0;
}
}

struct DrawOriginData
{
Expand All @@ -88,12 +98,13 @@ struct DrawOriginStore
char pad_404[12];
};

static bool (*isGamePaused)();

static int* g_frameDrawIndex1;
static int* g_frameDrawIndex2;
static int* g_renderBufferIndex;
static int* g_updateBufferIndex;
static DrawOriginStore* g_drawOriginStore;
static uint32_t* g_scriptDrawOriginIndex;
static uint32_t* g_scriptDrawOriginIndex;

static int g_updateDrawOriginCount = 0;
static DrawOriginData g_updateDrawOrigin[32];

struct WorldhorizonManager
{
Expand Down Expand Up @@ -124,11 +135,9 @@ static HookFunction hookFunction([]()
{
auto location = hook::get_pattern<char>("48 69 D0 10 04 00 00 48 8D 05 ? ? ? ? 48 03");

g_frameDrawIndex1 = hook::get_address<int*>(location - 20);
g_frameDrawIndex2 = hook::get_address<int*>(location - 7);
g_renderBufferIndex = hook::get_address<int*>(location - 20);
g_updateBufferIndex = hook::get_address<int*>(location - 7);
g_drawOriginStore = hook::get_address<DrawOriginStore*>(location + 10);

hook::set_call(&isGamePaused, location - 27);
}

{
Expand All @@ -153,16 +162,28 @@ static HookFunction hookFunction([]()

g_screenWidth = hook::get_address<int*>(location + 2);
g_screenHeight = hook::get_address<int*>(location + 8);
}
}

OnMainGameFrame.Connect([]()
{
g_scriptImReady.store(false, std::memory_order_relaxed);
});

OnPostFrontendRender.Connect([]()
{
g_scriptImReady.store(true, std::memory_order_release);
if (g_updateDrawOriginCount)
{
auto drawIndex = *g_updateBufferIndex;
std::move(g_updateDrawOrigin, g_updateDrawOrigin + g_updateDrawOriginCount, g_drawOriginStore[drawIndex].m_items);
g_drawOriginStore[drawIndex].m_count = g_updateDrawOriginCount;
g_updateDrawOriginCount = 0;
}
});

fx::ScriptEngine::RegisterNativeHandler("SET_DRAW_ORIGIN", [](fx::ScriptContext& context)
{
auto drawIndex = *(isGamePaused() ? g_frameDrawIndex2 : g_frameDrawIndex1);

auto& store = g_drawOriginStore[drawIndex];
const auto index = store.m_count;

if (index >= 32)
if (g_updateDrawOriginCount >= 32)
{
return;
}
Expand All @@ -172,11 +193,10 @@ static HookFunction hookFunction([]()
data.m_pos.y = context.GetArgument<float>(1);
data.m_pos.z = context.GetArgument<float>(2);
data.m_is2d = context.GetArgument<bool>(3);

store.m_items[index] = data;
store.m_count += 1;

*g_scriptDrawOriginIndex = index;

g_updateDrawOrigin[g_updateDrawOriginCount] = data;
*g_scriptDrawOriginIndex = g_updateDrawOriginCount;
g_updateDrawOriginCount += 1;
});

fx::ScriptEngine::RegisterNativeHandler("CLEAR_DRAW_ORIGIN", [](fx::ScriptContext& context)
Expand Down
Loading