zdoom
/
qzdoom
mirror of https://github.com/ZDoom/qzdoom.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/ssao' into qzdoom

This commit is contained in:
Magnus Norddahl 2016-10-22 21:36:29 +02:00
parent 1f8b2ebd9f 6c1c0d2972
commit d804f94a5e
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/gl/scene/gl_scene.cpp
View File

@ -478,10 +478,21 @@ void FGLRenderer::DrawScene(int drawmode)
static int recursion=0; static int recursion=0;
static int ssao_portals_available = 0; static int ssao_portals_available = 0;
bool applySSAO = false;
if (drawmode == DM_MAINVIEW) if (drawmode == DM_MAINVIEW)
ssao_portals_available = gl_ssao_portals + 1; {
ssao_portals_available = gl_ssao_portals;
applySSAO = true;
}
else if (drawmode == DM_OFFSCREEN) else if (drawmode == DM_OFFSCREEN)
{
ssao_portals_available = 0; ssao_portals_available = 0;
}
else if (ssao_portals_available > 0)
{
applySSAO = true;
ssao_portals_available--;
}
if (camera != nullptr) if (camera != nullptr)
{ {
@ -501,7 +512,7 @@ void FGLRenderer::DrawScene(int drawmode)
RenderScene(recursion); RenderScene(recursion);
if (ssao_portals_available > 0 && gl_RenderState.GetPassType() == GBUFFER_PASS) if (applySSAO && gl_RenderState.GetPassType() == GBUFFER_PASS)
{ {
gl_RenderState.EnableDrawBuffers(1); gl_RenderState.EnableDrawBuffers(1);
AmbientOccludeScene(); AmbientOccludeScene();
@ -509,7 +520,6 @@ void FGLRenderer::DrawScene(int drawmode)
gl_RenderState.EnableDrawBuffers(gl_RenderState.GetPassDrawBufferCount()); gl_RenderState.EnableDrawBuffers(gl_RenderState.GetPassDrawBufferCount());
gl_RenderState.Apply(); gl_RenderState.Apply();
gl_RenderState.ApplyMatrices(); gl_RenderState.ApplyMatrices();
ssao_portals_available--;
} }
// Handle all portals after rendering the opaque objects but before // Handle all portals after rendering the opaque objects but before