stjr/UltimateZoneBuilder
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/UltimateZoneBuilder.git synced 2024-11-25 21:31:14 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix double delete bug

Browse source
This commit is contained in:
Magnus Norddahl 2019-12-26 01:09:31 +01:00
parent e68da4331a
commit 459742c840
8 changed files with 40 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
Source/Native/OpenGL/GLIndexBuffer.cpp
View file

@ -25,11 +25,18 @@
GLIndexBuffer::~GLIndexBuffer()
{
if (Device && mBuffer != 0)
Finalize();
}
void GLIndexBuffer::Finalize()
{
if (Device)
{
Device->mIndexBuffers.erase(ItBuffer);
Device = nullptr;
glDeleteBuffers(1, &mBuffer);
if (mBuffer != 0)
glDeleteBuffers(1, &mBuffer);
mBuffer = 0;
}
}

2
Source/Native/OpenGL/GLIndexBuffer.h
View file

@ -31,6 +31,8 @@ class GLIndexBuffer : public IndexBuffer
public:
~GLIndexBuffer();
void Finalize();
GLuint GetBuffer();
GLRenderDevice* Device = nullptr;

19
Source/Native/OpenGL/GLRenderDevice.cpp
View file

@ -87,7 +87,7 @@ GLRenderDevice::~GLRenderDevice()
for (GLIndexBuffer* buffer : mIndexBuffers) mDeleteList.IndexBuffers.push_back(buffer);
for (GLVertexBuffer* buffer : mSharedVertexBuffers[0]->VertexBuffers) mDeleteList.VertexBuffers.push_back(buffer);
for (GLVertexBuffer* buffer : mSharedVertexBuffers[1]->VertexBuffers) mDeleteList.VertexBuffers.push_back(buffer);
ProcessDeleteList();
ProcessDeleteList(true);
glDeleteBuffers(1, &mStreamVertexBuffer);
glDeleteVertexArrays(1, &mStreamVAO);
@ -965,13 +965,22 @@ void GLRenderDevice::DeleteObject(GLTexture* texture)
delete texture;
}
void GLRenderDevice::ProcessDeleteList()
void GLRenderDevice::ProcessDeleteList(bool finalize)
{
std::unique_lock<std::mutex> lock(GLRenderDevice::GetMutex());
for (auto buffer : mDeleteList.IndexBuffers) delete buffer;
for (auto buffer : mDeleteList.VertexBuffers) delete buffer;
for (auto texture : mDeleteList.Textures) delete texture;
if (!finalize)
{
for (auto buffer : mDeleteList.IndexBuffers) delete buffer;
for (auto buffer : mDeleteList.VertexBuffers) delete buffer;
for (auto texture : mDeleteList.Textures) delete texture;
}
else
{
for (auto buffer : mDeleteList.IndexBuffers) buffer->Finalize();
for (auto buffer : mDeleteList.VertexBuffers) buffer->Finalize();
for (auto texture : mDeleteList.Textures) texture->Finalize();
}
mDeleteList.IndexBuffers.clear();
mDeleteList.VertexBuffers.clear();

2
Source/Native/OpenGL/GLRenderDevice.h
View file

@ -106,7 +106,7 @@ public:
static void DeleteObject(GLIndexBuffer* buffer);
static void DeleteObject(GLTexture* texture);
void ProcessDeleteList();
void ProcessDeleteList(bool finalize = false);
std::unique_ptr<IOpenGLContext> Context;

5
Source/Native/OpenGL/GLTexture.cpp
View file

@ -29,6 +29,11 @@ GLTexture::GLTexture()
}
GLTexture::~GLTexture()
{
Finalize();
}
void GLTexture::Finalize()
{
if (Device)
Invalidate();

2
Source/Native/OpenGL/GLTexture.h
View file

@ -32,6 +32,8 @@ public:
GLTexture();
~GLTexture();
void Finalize();
void Set2DImage(int width, int height) override;
void SetCubeImage(int size) override;

5
Source/Native/OpenGL/GLVertexBuffer.cpp
View file

@ -72,6 +72,11 @@ void GLSharedVertexBuffer::SetupWorldVAO()
/////////////////////////////////////////////////////////////////////////////
GLVertexBuffer::~GLVertexBuffer()
{
Finalize();
}
void GLVertexBuffer::Finalize()
{
if (Device)
{

2
Source/Native/OpenGL/GLVertexBuffer.h
View file

@ -56,6 +56,8 @@ class GLVertexBuffer : public VertexBuffer
public:
~GLVertexBuffer();
void Finalize();
VertexFormat Format = VertexFormat::Flat;
GLRenderDevice* Device = nullptr;