stjr/UltimateZoneBuilder
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/UltimateZoneBuilder.git synced 2024-11-22 20:02:48 +00:00
Code Issues Projects Releases Packages Wiki Activity

Clearing the current active OpenGL context is apparently very expensive. Only do it if we're destroying an OpenGL context.

Browse source
This commit is contained in:
Magnus Norddahl 2019-12-20 05:30:27 +01:00
parent c8237b0e64
commit 5c5633c1e7
2 changed files with 2 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Source/Native/OpenGLContext.cpp
View file

@ -141,7 +141,8 @@ OpenGLContext::~OpenGLContext()
void OpenGLContext::MakeCurrent()
{
wglMakeCurrent(dc, context);
if (!IsCurrent())
wglMakeCurrent(dc, context);
}
bool OpenGLContext::IsCurrent()

9
Source/Native/RenderDevice.cpp
View file

@ -79,7 +79,6 @@ RenderDevice::RenderDevice(void* disp, void* window)
mShaderManager = std::make_unique<ShaderManager>();
CheckGLError();
Context->ClearCurrent();
}
}
@ -400,7 +399,6 @@ bool RenderDevice::StartRendering(bool clear, int backcolor, Texture* target, bo
bool RenderDevice::FinishRendering()
{
Context->ClearCurrent();
mContextIsCurrent = false;
return true;
}
@ -439,7 +437,6 @@ bool RenderDevice::CopyTexture(Texture* dst, CubeMapFace face)
glBindTexture(GL_TEXTURE_CUBE_MAP, oldTexture);
bool result = CheckGLError();
if (!mContextIsCurrent) Context->ClearCurrent();
return result;
}
@ -485,7 +482,6 @@ bool RenderDevice::SetVertexBufferData(VertexBuffer* buffer, void* data, int64_t
glBufferSubData(GL_ARRAY_BUFFER, buffer->BufferOffset, size, data);
glBindBuffer(GL_ARRAY_BUFFER, oldbinding);
bool result = CheckGLError();
if (!mContextIsCurrent) Context->ClearCurrent();
return result;
}
@ -498,7 +494,6 @@ bool RenderDevice::SetVertexBufferSubdata(VertexBuffer* buffer, int64_t destOffs
glBufferSubData(GL_ARRAY_BUFFER, buffer->BufferOffset + destOffset, size, data);
glBindBuffer(GL_ARRAY_BUFFER, oldbinding);
bool result = CheckGLError();
if (!mContextIsCurrent) Context->ClearCurrent();
return result;
}
@ -511,7 +506,6 @@ bool RenderDevice::SetIndexBufferData(IndexBuffer* buffer, void* data, int64_t s
glBufferData(GL_ELEMENT_ARRAY_BUFFER, size, data, GL_STATIC_DRAW);
glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, oldbinding);
bool result = CheckGLError();
if (!mContextIsCurrent) Context->ClearCurrent();
return result;
}
@ -539,7 +533,6 @@ void* RenderDevice::MapPBO(Texture* texture)
glUnmapBuffer(GL_PIXEL_UNPACK_BUFFER);
buf = nullptr;
}
if (!mContextIsCurrent) Context->ClearCurrent();
return buf;
}
@ -552,7 +545,6 @@ bool RenderDevice::UnmapPBO(Texture* texture)
glBindTexture(GL_TEXTURE_2D, texture->GetTexture());
glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, texture->GetWidth(), texture->GetHeight(), 0, GL_BGRA, GL_UNSIGNED_BYTE, nullptr);
bool result = CheckGLError();
if (!mContextIsCurrent) Context->ClearCurrent();
mNeedApply = true;
mTexturesChanged = true;
return result;
@ -565,7 +557,6 @@ bool RenderDevice::InvalidateTexture(Texture* texture)
if (!mContextIsCurrent) Context->MakeCurrent();
texture->Invalidate();
bool result = CheckGLError();
if (!mContextIsCurrent) Context->ClearCurrent();
mNeedApply = true;
mTexturesChanged = true;
return result;