R5Reloaded/r5sdk
1
0
Fork 0
mirror of https://github.com/Mauler125/r5sdk.git synced 2025-02-09 19:15:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Force 'CMaterialSystem::IsMaterialInternal' no inline

Browse Source 
This seems to work a lot better for our crash handler. 'CMaterialSystem::IsMaterialInternal' still needs to be removed entirely in the future!
This commit is contained in:
Kawe Mazidjatari 2023-02-17 23:56:56 +01:00
parent 1e0248a442
commit fb00aa5c37
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
r5dev/bsplib/bsplib.cpp
View File

@ -400,7 +400,7 @@ void* __fastcall BuildPropStaticFrustumCullMap(int64_t a1, int64_t a2, unsigned
if (reinterpret_cast<uintptr_t>(v68) < g_GameDll.m_RunTimeData.m_pSectionBase || // Check bounds (data is mostly within the '.data' segment.
reinterpret_cast<uintptr_t>(v68) > g_GameDll.m_ExceptionTable.m_pSectionBase || error)
{
if (!IsMaterialInternal(reinterpret_cast<void**>(v68))) // Last chance.
if (!CMaterialSystem::IsMaterialInternal(reinterpret_cast<void**>(v68))) // Last chance.
{
error = true;
continue;

4
r5dev/materialsystem/cmaterialsystem.cpp
View File

@ -68,7 +68,7 @@ void* __fastcall DispatchDrawCall(int64_t a1, uint64_t a2, int a3, int a4, int64
// Input : **pCandidate -
// Output : true if valid and material, false otherwise
//-----------------------------------------------------------------------------
__declspec(noinline) bool IsMaterialInternal(void** pCandidate)
FORCENOINLINE bool CMaterialSystem::IsMaterialInternal(void** pCandidate)
{
// NOTE: this is a dirty fix, but for running technically broken BSP's, this is the only fix
// besides going bare metal inline assembly (which on its own isn't directly the problem, but
@ -134,7 +134,7 @@ void VMaterialSystem::Attach() const
{
// TODO: This has to be removed!!!
#ifndef _DEBUG
vector<CMemory> find_IMI_ref = CMemory(IsMaterialInternal).FindAllCallReferences(reinterpret_cast<uintptr_t>(BuildPropStaticFrustumCullMap), 1000);
vector<CMemory> find_IMI_ref = CMemory(CMaterialSystem::IsMaterialInternal).FindAllCallReferences(reinterpret_cast<uintptr_t>(BuildPropStaticFrustumCullMap), 1000);
if (!find_IMI_ref.empty())
{
void* imiRetAddr = find_IMI_ref.at(0).Offset(0x5).RCast<void*>();

3
r5dev/materialsystem/cmaterialsystem.h
View File

@ -7,6 +7,7 @@
class CMaterialSystem
{
public:
FORCENOINLINE static bool IsMaterialInternal(void** pCandidate);
#ifndef DEDICATED
static CMaterialGlue* FindMaterialEx(CMaterialSystem* pMatSys, const char* pMaterialName, uint8_t nMaterialType, int nUnk, bool bComplain);
static Vector2D GetScreenSize(CMaterialSystem* pMatSys = nullptr);
@ -43,8 +44,6 @@ inline int* g_nUnfreeStreamingTextureMemory = nullptr;
inline int* g_nUnusableStreamingTextureMemory = nullptr;
#endif // !DEDICATED
__declspec(noinline) bool IsMaterialInternal(void** pCandidate);
///////////////////////////////////////////////////////////////////////////////
class VMaterialSystem : public IDetour
{