Skip to content

Handle "out of memory" situation in Tr2CurveLineSet #127

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
filipppavlov wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Handle "out of memory" situation in Tr2CurveLineSet #127

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
307c4e8
Handle "out of memory" scenario in Tr2CurveLineSet
filipppavlov Oct 19, 2026
4a40ddc
Handle a case when the buffer is about to grow
filipppavlov Oct 19, 2026
82ce452
Address PR comments; formatting
filipppavlov Oct 21, 2026
33f2645
Handle the issue differently
filipppavlov Oct 21, 2026
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
13 changes: 10 additions & 3 deletions trinity/Tr2CurveLineSet.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -371,8 +371,17 @@ bool Tr2CurveLineSet::FillVertexBuffer()
// catch zero size, so we don't need to worry about empty arrays
if( m_lines.size() )
{
// can the big vertexbuffer handle this?
int currentNumOfLines = GetNumOfLines();

size_t byteSize = size_t( currentNumOfLines ) * 6 * sizeof( LineVertex );
auto buffer = Tr2Renderer::GetPoolAllocator()->Allocate( byteSize );
if( !buffer )
{
m_vertexBuffer = {};
return false;
}

// can the big vertexbuffer handle this?
if( !m_vertexBuffer.IsValid() || ( currentNumOfLines > m_vertexBufferSize ) )
{
// release old and create new
Expand All @@ -392,8 +401,6 @@ bool Tr2CurveLineSet::FillVertexBuffer()
m_vertexBufferSize = currentNumOfLines;
}

size_t byteSize = m_vertexBufferSize * 6 * sizeof( LineVertex );
auto buffer = Tr2Renderer::GetPoolAllocator()->Allocate( byteSize );
LineVertex* vertexBuffer = reinterpret_cast<LineVertex*>( buffer );

for( unsigned int i = 0; i < m_lines.size(); ++i )
Expand Down
Loading