OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Merge https://github.com/coelckers/gzdoom

Browse source 
# Conflicts:
#	src/v_video.cpp
This commit is contained in:
Rachael Alexanderson 2016-12-06 18:19:08 -05:00
commit a78b713f4b
701 changed files with 75679 additions and 59327 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/gl/system/gl_framebuffer.cpp
View file

@ -53,7 +53,7 @@
#include "gl/renderer/gl_2ddrawer.h"
#include "gl_debug.h"
IMPLEMENT_CLASS(OpenGLFrameBuffer)
IMPLEMENT_CLASS(OpenGLFrameBuffer, false, false)
EXTERN_CVAR (Float, vid_brightness)
EXTERN_CVAR (Float, vid_contrast)
EXTERN_CVAR (Bool, vid_vsync)
@ -207,17 +207,20 @@ void OpenGLFrameBuffer::Update()
//
//==========================================================================
CVAR(Bool, gl_finishbeforeswap, false, 0);
void OpenGLFrameBuffer::Swap()
{
Finish.Reset();
Finish.Clock();
if (needsetgamma)
if (gl_finishbeforeswap) glFinish();
if (needsetgamma)
{
//DoSetGamma();
needsetgamma = false;
}
SwapBuffers();
glFinish();
if (!gl_finishbeforeswap) glFinish();
Finish.Unclock();
swapped = true;
FHardwareTexture::UnbindAll();