Merge branch 'ssao' into qzdoom

# Conflicts:
#	src/gl/renderer/gl_postprocess.cpp
#	src/gl/renderer/gl_renderer.cpp
#	src/gl/scene/gl_scene.cpp
#	src/gl/shaders/gl_ambientshader.cpp
#	src/gl/shaders/gl_ambientshader.h
#	src/gl/system/gl_cvars.h
#	wadsrc/static/language.enu
#	wadsrc/static/menudef.zz
This commit is contained in:
Magnus Norddahl 2016-10-03 23:47:09 +02:00
commit bcb64a3445
8 changed files with 120 additions and 81 deletions

View file

@ -123,7 +123,6 @@ FGLRenderer::FGLRenderer(OpenGLFrameBuffer *fb)
mDepthBlurShader = nullptr;
mSSAOShader = nullptr;
mSSAOCombineShader = nullptr;
}
void gl_LoadModels();