From 24a3fa36ddc99037bdeb4e843ddfa845f7186cd7 Mon Sep 17 00:00:00 2001 From: Neloreck <Neloreck@gmail.com> Date: Sat, 25 Jan 2025 19:20:55 +0200 Subject: [PATCH 1/2] Respect luajit prefixes for file sources. --- Externals/tracy/public/tracy/TracyLua.hpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Externals/tracy/public/tracy/TracyLua.hpp b/Externals/tracy/public/tracy/TracyLua.hpp index 51dead51f91..ba15dafc4e2 100644 --- a/Externals/tracy/public/tracy/TracyLua.hpp +++ b/Externals/tracy/public/tracy/TracyLua.hpp @@ -190,8 +190,11 @@ static tracy_force_inline void SendLuaCallstack( lua_State* L, uint32_t depth ) static inline void LuaShortenSrc( char* dst, const char* src ) { - size_t l = std::min( (size_t)255, strlen( src ) ); - memcpy( dst, src, l ); + // OpenXray - remove '@' prefix from luaJIT to allow directly working with file source with tracy application. + const char* src_trimmed = src && *src == '@' ? src + 1 : src; + + size_t l = std::min( (size_t)255, strlen( src_trimmed ) ); + memcpy( dst, src_trimmed, l ); dst[l] = 0; } From adf1db19e30185c0aa7b85882a25687b50c2ac60 Mon Sep 17 00:00:00 2001 From: Syrotenko Igor <Neloreck@gmail.com> Date: Thu, 6 Feb 2025 04:01:58 +0200 Subject: [PATCH 2/2] Update TracyLua.hpp MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Lumière Lucezarnii <Xottab-DUTY@users.noreply.github.com> --- Externals/tracy/public/tracy/TracyLua.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Externals/tracy/public/tracy/TracyLua.hpp b/Externals/tracy/public/tracy/TracyLua.hpp index ba15dafc4e2..e908b873f0d 100644 --- a/Externals/tracy/public/tracy/TracyLua.hpp +++ b/Externals/tracy/public/tracy/TracyLua.hpp @@ -190,7 +190,7 @@ static tracy_force_inline void SendLuaCallstack( lua_State* L, uint32_t depth ) static inline void LuaShortenSrc( char* dst, const char* src ) { - // OpenXray - remove '@' prefix from luaJIT to allow directly working with file source with tracy application. + // OpenXRay - remove '@' prefix from LuaJIT to allow directly working with file source with Tracy application. const char* src_trimmed = src && *src == '@' ? src + 1 : src; size_t l = std::min( (size_t)255, strlen( src_trimmed ) );