Commit 06d1f1d

authored

Fix render states spillover (PR #3412)

Fixes issue reported in comment: #3402 (comment)

1 parent f88d313 commit 06d1f1dCopy full SHA for 06d1f1d

File tree

+26

-4

lines changed

+26

-4

lines changed

Lines changed: 14 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -2012,11 +2012,21 @@ void CCore::OnPreHUDRender()`
`2012`	`2012`	`{`
`2013`	`2013`	`IDirect3DDevice9* pDevice = CGraphics::GetSingleton().GetDevice();`
`2014`	`2014`
`2015`		`- CGraphics::GetSingleton().EnteringMTARenderZone();`
	`2015`	`+ if (CGraphics::GetSingleton().HasLine3DPostFXQueueItems() \|\| CGraphics::GetSingleton().HasPrimitive3DPostFXQueueItems())`
	`2016`	`+ {`
	`2017`	`+ /*`
	`2018`	`+ Although MTA render zones are expensive, we should use them twice in the bounds of the function`
	`2019`	`+ because some of render states from PostFX drain to the 2D part of the frame.`
	`2020`	`+ */`
	`2021`	`+ CGraphics::GetSingleton().EnteringMTARenderZone();`
	`2022`	`+`
	`2023`	`+ CGraphics::GetSingleton().DrawPrimitive3DPostFXQueue();`
	`2024`	`+ CGraphics::GetSingleton().DrawLine3DPostFXQueue();`
	`2025`	`+`
	`2026`	`+ CGraphics::GetSingleton().LeavingMTARenderZone();`
	`2027`	`+ }`
`2016`	`2028`
`2017`		`- // Draw post-fx 3D primitives`
`2018`		`- CGraphics::GetSingleton().DrawPrimitive3DPostFXQueue();`
`2019`		`- CGraphics::GetSingleton().DrawLine3DPostFXQueue();`
	`2029`	`+ CGraphics::GetSingleton().EnteringMTARenderZone();`
`2020`	`2030`
`2021`	`2031`	`// Maybe capture screen and other stuff`
`2022`	`2032`	`CGraphics::GetSingleton().GetRenderItemManager()->DoPulse();`

Lines changed: 10 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1651,6 +1651,11 @@ bool CGraphics::HasLine3DPreGUIQueueItems(void)`
`1651`	`1651`	`return m_pLine3DBatcherPreGUI->HasItems() \|\| m_pMaterialLine3DBatcherPreGUI->HasItems();`
`1652`	`1652`	`}`
`1653`	`1653`
	`1654`	`+bool CGraphics::HasLine3DPostFXQueueItems()`
	`1655`	`+{`
	`1656`	`+ return m_pLine3DBatcherPostFX->HasItems() \|\| m_pMaterialLine3DBatcherPostFX->HasItems();`
	`1657`	`+}`
	`1658`	`+`
`1654`	`1659`	`void CGraphics::DrawPrimitive3DPostFXQueue(void)`
`1655`	`1660`	`{`
`1656`	`1661`	`m_pPrimitive3DBatcherPostFX->Flush();`
`@@ -1662,6 +1667,11 @@ bool CGraphics::HasPrimitive3DPreGUIQueueItems(void)`
`1662`	`1667`	`return m_pMaterialPrimitive3DBatcherPreGUI->HasItems() \|\| m_pPrimitive3DBatcherPreGUI->HasItems();`
`1663`	`1668`	`}`
`1664`	`1669`
	`1670`	`+bool CGraphics::HasPrimitive3DPostFXQueueItems()`
	`1671`	`+{`
	`1672`	`+ return m_pMaterialPrimitive3DBatcherPostFX->HasItems() \|\| m_pPrimitive3DBatcherPostFX->HasItems();`
	`1673`	`+}`
	`1674`	`+`
`1665`	`1675`	`void CGraphics::DrawQueue(std::vector<sDrawQueueItem>& Queue)`
`1666`	`1676`	`{`
`1667`	`1677`	`BeginDrawBatch();`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -190,9 +190,11 @@ class CGraphics : public CGraphicsInterface, public CSingleton<CGraphics>`
`190`	`190`	`void DrawLine3DPreGUIQueue(void);`
`191`	`191`	`void DrawLine3DPostFXQueue(void);`
`192`	`192`	`bool HasLine3DPreGUIQueueItems(void);`
	`193`	`+ bool HasLine3DPostFXQueueItems();`
`193`	`194`	`void DrawPrimitive3DPostFXQueue(void);`
`194`	`195`	`void DrawPrimitive3DPreGUIQueue(void);`
`195`	`196`	`bool HasPrimitive3DPreGUIQueueItems(void);`
	`197`	`+ bool HasPrimitive3DPostFXQueueItems();`
`196`	`198`
`197`	`199`	`void DidRenderScene();`
`198`	`200`	`void SetProgressMessage(const SString& strMessage);`

Comments

(0)