zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-11-10 23:02:08 +00:00
Code Issues Projects Releases Packages Wiki Activity

- switch OpenGLSWFrameBuffer to use m_Lock instead of LockCount

Browse source
This commit is contained in:
Magnus Norddahl 2017-04-02 00:47:18 +02:00
parent 4a9dffa70d
commit 4268090738
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/gl/system/gl_swframebuffer.cpp
View file

@ -1095,7 +1095,7 @@ bool OpenGLSWFrameBuffer::IsValid()
bool OpenGLSWFrameBuffer::Lock(bool buffered) bool OpenGLSWFrameBuffer::Lock(bool buffered)
{ {
if (LockCount++ > 0) if (m_Lock++ > 0)
{ {
return false; return false;
} }
@ -1130,16 +1130,16 @@ bool OpenGLSWFrameBuffer::Lock(bool buffered)
void OpenGLSWFrameBuffer::Unlock() void OpenGLSWFrameBuffer::Unlock()
{ {
if (LockCount == 0) if (m_Lock == 0)
{ {
return; return;
} }
if (UpdatePending && LockCount == 1) if (UpdatePending && m_Lock == 1)
{ {
Update(); Update();
} }
else if (--LockCount == 0) else if (--m_Lock == 0)
{ {
Buffer = nullptr; Buffer = nullptr;
} }
@ -1171,13 +1171,13 @@ void OpenGLSWFrameBuffer::Update()
return; return;
} }
if (LockCount != 1) if (m_Lock != 1)
{ {
I_FatalError("Framebuffer must have exactly 1 lock to be updated"); I_FatalError("Framebuffer must have exactly 1 lock to be updated");
if (LockCount > 0) if (m_Lock > 0)
{ {
UpdatePending = true; UpdatePending = true;
--LockCount; --m_Lock;
} }
return; return;
} }
@ -1220,7 +1220,7 @@ void OpenGLSWFrameBuffer::Update()
BlitCycles.Clock(); BlitCycles.Clock();
#endif #endif
LockCount = 0; m_Lock = 0;
Draw3DPart(In2D <= 1); Draw3DPart(In2D <= 1);
if (In2D == 0) if (In2D == 0)
{ {
@ -1276,7 +1276,7 @@ void OpenGLSWFrameBuffer::Flip()
bool OpenGLSWFrameBuffer::PaintToWindow() bool OpenGLSWFrameBuffer::PaintToWindow()
{ {
if (LockCount != 0) if (m_Lock != 0)
{ {
return false; return false;
} }
@ -1662,7 +1662,7 @@ void OpenGLSWFrameBuffer::GetScreenshotBuffer(const uint8_t *&buffer, int &pitch
void OpenGLSWFrameBuffer::ReleaseScreenshotBuffer() void OpenGLSWFrameBuffer::ReleaseScreenshotBuffer()
{ {
if (LockCount > 0) if (m_Lock > 0)
{ {
Super::ReleaseScreenshotBuffer(); Super::ReleaseScreenshotBuffer();
} }