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

# Conflicts:
#	src/gl/renderer/gl_postprocess.cpp
This commit is contained in:
Magnus Norddahl 2016-08-02 10:00:53 +02:00
commit 43e577ce79

View file

@ -358,7 +358,7 @@ void FGLRenderer::CopyToBackbuffer(const GL_IRECT *bounds, bool applyGamma)
}
mBuffers->BindHudTexture(0);
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)
glEnable(GL_BLEND);