Skip to content

Commit

Permalink
Fix render states spillover (PR multitheftauto#3412)
Browse files Browse the repository at this point in the history
Fixes issue reported in comment: multitheftauto#3402 (comment)
  • Loading branch information
tederis authored May 29, 2024
1 parent f88d313 commit 06d1f1d
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 4 deletions.
18 changes: 14 additions & 4 deletions Client/core/CCore.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2012,11 +2012,21 @@ void CCore::OnPreHUDRender()
{
IDirect3DDevice9* pDevice = CGraphics::GetSingleton().GetDevice();

CGraphics::GetSingleton().EnteringMTARenderZone();
if (CGraphics::GetSingleton().HasLine3DPostFXQueueItems() || CGraphics::GetSingleton().HasPrimitive3DPostFXQueueItems())
{
/*
Although MTA render zones are expensive, we should use them twice in the bounds of the function
because some of render states from PostFX drain to the 2D part of the frame.
*/
CGraphics::GetSingleton().EnteringMTARenderZone();

CGraphics::GetSingleton().DrawPrimitive3DPostFXQueue();
CGraphics::GetSingleton().DrawLine3DPostFXQueue();

CGraphics::GetSingleton().LeavingMTARenderZone();
}

// Draw post-fx 3D primitives
CGraphics::GetSingleton().DrawPrimitive3DPostFXQueue();
CGraphics::GetSingleton().DrawLine3DPostFXQueue();
CGraphics::GetSingleton().EnteringMTARenderZone();

// Maybe capture screen and other stuff
CGraphics::GetSingleton().GetRenderItemManager()->DoPulse();
Expand Down
10 changes: 10 additions & 0 deletions Client/core/Graphics/CGraphics.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1651,6 +1651,11 @@ bool CGraphics::HasLine3DPreGUIQueueItems(void)
return m_pLine3DBatcherPreGUI->HasItems() || m_pMaterialLine3DBatcherPreGUI->HasItems();
}

bool CGraphics::HasLine3DPostFXQueueItems()
{
return m_pLine3DBatcherPostFX->HasItems() || m_pMaterialLine3DBatcherPostFX->HasItems();
}

void CGraphics::DrawPrimitive3DPostFXQueue(void)
{
m_pPrimitive3DBatcherPostFX->Flush();
Expand All @@ -1662,6 +1667,11 @@ bool CGraphics::HasPrimitive3DPreGUIQueueItems(void)
return m_pMaterialPrimitive3DBatcherPreGUI->HasItems() || m_pPrimitive3DBatcherPreGUI->HasItems();
}

bool CGraphics::HasPrimitive3DPostFXQueueItems()
{
return m_pMaterialPrimitive3DBatcherPostFX->HasItems() || m_pPrimitive3DBatcherPostFX->HasItems();
}

void CGraphics::DrawQueue(std::vector<sDrawQueueItem>& Queue)
{
BeginDrawBatch();
Expand Down
2 changes: 2 additions & 0 deletions Client/core/Graphics/CGraphics.h
Original file line number Diff line number Diff line change
Expand Up @@ -190,9 +190,11 @@ class CGraphics : public CGraphicsInterface, public CSingleton<CGraphics>
void DrawLine3DPreGUIQueue(void);
void DrawLine3DPostFXQueue(void);
bool HasLine3DPreGUIQueueItems(void);
bool HasLine3DPostFXQueueItems();
void DrawPrimitive3DPostFXQueue(void);
void DrawPrimitive3DPreGUIQueue(void);
bool HasPrimitive3DPreGUIQueueItems(void);
bool HasPrimitive3DPostFXQueueItems();

void DidRenderScene();
void SetProgressMessage(const SString& strMessage);
Expand Down

0 comments on commit 06d1f1d

Please sign in to comment.