Skip to content

Fix: Prevent render list corruption during iteration #377

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
seer-by-sentry wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix: Prevent render list corruption during iteration #377

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 15 additions & 3 deletions Core/Libraries/Source/WWVegas/WW3D2/static_sort_list.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@

#include "rendobj.h"
#include "dx8renderer.h"
#include <vector>

////////////////////////////////////////////////////////////////////////////////////////////////////
// Initialization Functions ////////////////////////////////////////////////////////////////////////
Expand Down Expand Up @@ -76,9 +77,19 @@ void DefaultStaticSortListClass::Render_And_Clear(RenderInfoClass & rinfo)
// We go from higher sort level to lower, since lower sort level means higher priority (in
// front), so lower sort level meshes need to be rendered later.
for(unsigned int sort_level = MaxSort; sort_level >= MinSort; sort_level--) {
bool render=false;
for ( RenderObjClass *robj = SortLists[sort_level].Remove_Head(); robj;
robj->Release_Ref(), robj = SortLists[sort_level].Remove_Head())
// Snapshot all objects from the list into a local vector before rendering.
// This prevents render hook callbacks (Pre_Render/Post_Render) from corrupting
// the list's internal linked structure while we are iterating it, which would
// cause an access violation in Internal_Remove_List_Head.
std::vector<RenderObjClass *> render_list;
for (RenderObjClass *robj = SortLists[sort_level].Remove_Head(); robj;
robj = SortLists[sort_level].Remove_Head())
{
render_list.push_back(robj);
}

bool render = false;
for (RenderObjClass *robj : render_list)
{
if (robj->Get_Render_Hook()) {
if (robj->Get_Render_Hook()->Pre_Render(robj, rinfo)) {
Expand All @@ -90,6 +101,7 @@ void DefaultStaticSortListClass::Render_And_Clear(RenderInfoClass & rinfo)
robj->Render(rinfo);
render = true;
}
robj->Release_Ref();
}
if (render) TheDX8MeshRenderer.Flush();
}
Expand Down
Loading