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:
commit
bcb64a3445
8 changed files with 120 additions and 81 deletions
|
|
@ -123,7 +123,6 @@ FGLRenderer::FGLRenderer(OpenGLFrameBuffer *fb)
|
|||
mDepthBlurShader = nullptr;
|
||||
mSSAOShader = nullptr;
|
||||
mSSAOCombineShader = nullptr;
|
||||
|
||||
}
|
||||
|
||||
void gl_LoadModels();
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue