zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2024-11-28 15:02:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'gzdoom_upstream/master' into postprocess_vbo_bind_fix

Browse source 
# Conflicts:
#	src/gl/renderer/gl_postprocess.cpp
This commit is contained in:
Magnus Norddahl 2016-08-02 10:00:53 +02:00
commit 43e577ce79
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/gl/renderer/gl_postprocess.cpp
View file

@ -358,7 +358,7 @@ void FGLRenderer::CopyToBackbuffer(const GL_IRECT *bounds, bool applyGamma)
} }
mBuffers->BindHudTexture(0); mBuffers->BindHudTexture(0);
mVBO->BindVBO(); mVBO->BindVBO();
mVBO->RenderScreenQuad(width / (float)mBuffers->GetWidth(), height / (float)mBuffers->GetHeight()); mVBO->RenderScreenQuad(mScreenViewport.width / (float)mBuffers->GetWidth(), mScreenViewport.height / (float)mBuffers->GetHeight());
if (blendEnabled) if (blendEnabled)
glEnable(GL_BLEND); glEnable(GL_BLEND);