zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-11-28 06:53:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

Mark portals in scene alpha channel for the SSAO pass

Browse source
This commit is contained in:
Magnus Norddahl 2016-09-04 08:15:29 +02:00
parent c7c0ffadb5
commit e025f6e54b
6 changed files with 18 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -170,8 +170,13 @@ void FGLRenderer::AmbientOccludeScene()
mBuffers->BindSceneDepthTexture(0); mBuffers->BindSceneDepthTexture(0);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
mBuffers->BindSceneColorTexture(1);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
glActiveTexture(GL_TEXTURE0);
mLinearDepthShader->Bind(multisample); mLinearDepthShader->Bind(multisample);
mLinearDepthShader->DepthTexture[multisample].Set(0); mLinearDepthShader->DepthTexture[multisample].Set(0);
mLinearDepthShader->ColorTexture[multisample].Set(1);
if (multisample) mLinearDepthShader->SampleCount[multisample].Set(gl_multisample); if (multisample) mLinearDepthShader->SampleCount[multisample].Set(gl_multisample);
mLinearDepthShader->LinearizeDepthA[multisample].Set(1.0f / GetZFar() - 1.0f / GetZNear()); mLinearDepthShader->LinearizeDepthA[multisample].Set(1.0f / GetZFar() - 1.0f / GetZNear());
mLinearDepthShader->LinearizeDepthB[multisample].Set(MAX(1.0f / GetZNear(), 1.e-8f)); mLinearDepthShader->LinearizeDepthB[multisample].Set(MAX(1.0f / GetZNear(), 1.e-8f));

8
src/gl/scene/gl_portal.cpp
View file

@ -423,14 +423,16 @@ void GLPortal::End(bool usestencil)
glDepthFunc(GL_LEQUAL); glDepthFunc(GL_LEQUAL);
glDepthRange(0, 1); glDepthRange(0, 1);
{ {
ScopedColorMask colorMask(0, 0, 0, 0); ScopedColorMask colorMask(0, 0, 0, 1); // mark portal in alpha channel but don't touch color
// glColorMask(0,0,0,0); // no graphics
gl_RenderState.SetEffect(EFF_STENCIL); gl_RenderState.SetEffect(EFF_STENCIL);
gl_RenderState.EnableTexture(false); gl_RenderState.EnableTexture(false);
gl_RenderState.BlendFunc(GL_ONE, GL_ZERO);
gl_RenderState.BlendEquation(GL_FUNC_ADD);
gl_RenderState.Apply();
DrawPortalStencil(); DrawPortalStencil();
gl_RenderState.SetEffect(EFF_NONE); gl_RenderState.SetEffect(EFF_NONE);
gl_RenderState.EnableTexture(true); gl_RenderState.EnableTexture(true);
} // glColorMask(1, 1, 1, 1); }
glDepthFunc(GL_LESS); glDepthFunc(GL_LESS);
} }
PortalAll.Unclock(); PortalAll.Unclock();

1
src/gl/shaders/gl_ambientshader.cpp
View file

@ -60,6 +60,7 @@ void FLinearDepthShader::Bind(bool multisample)
shader.Link("shaders/glsl/lineardepth"); shader.Link("shaders/glsl/lineardepth");
shader.SetAttribLocation(0, "PositionInProjection"); shader.SetAttribLocation(0, "PositionInProjection");
DepthTexture[multisample].Init(shader, "DepthTexture"); DepthTexture[multisample].Init(shader, "DepthTexture");
ColorTexture[multisample].Init(shader, "ColorTexture");
SampleCount[multisample].Init(shader, "SampleCount"); SampleCount[multisample].Init(shader, "SampleCount");
LinearizeDepthA[multisample].Init(shader, "LinearizeDepthA"); LinearizeDepthA[multisample].Init(shader, "LinearizeDepthA");
LinearizeDepthB[multisample].Init(shader, "LinearizeDepthB"); LinearizeDepthB[multisample].Init(shader, "LinearizeDepthB");

1
src/gl/shaders/gl_ambientshader.h
View file

@ -9,6 +9,7 @@ public:
void Bind(bool multisample); void Bind(bool multisample);
FBufferedUniformSampler DepthTexture[2]; FBufferedUniformSampler DepthTexture[2];
FBufferedUniformSampler ColorTexture[2];
FBufferedUniform1i SampleCount[2]; FBufferedUniform1i SampleCount[2];
FBufferedUniform1f LinearizeDepthA[2]; FBufferedUniform1f LinearizeDepthA[2];
FBufferedUniform1f LinearizeDepthB[2]; FBufferedUniform1f LinearizeDepthB[2];

8
wadsrc/static/shaders/glsl/lineardepth.fp
View file

@ -4,9 +4,11 @@ out vec4 FragColor;
#if defined(MULTISAMPLE) #if defined(MULTISAMPLE)
uniform sampler2DMS DepthTexture; uniform sampler2DMS DepthTexture;
uniform sampler2DMS ColorTexture;
uniform int SampleCount; uniform int SampleCount;
#else #else
uniform sampler2D DepthTexture; uniform sampler2D DepthTexture;
uniform sampler2D ColorTexture;
#endif #endif
uniform float LinearizeDepthA; uniform float LinearizeDepthA;
@ -25,15 +27,15 @@ void main()
ivec2 ipos = ivec2(uv * vec2(texSize)); ivec2 ipos = ivec2(uv * vec2(texSize));
float depth = 0.0; float depth = 0.0;
for (int i = 0; i < SampleCount; i++) for (int i = 0; i < SampleCount; i++)
depth += texelFetch(DepthTexture, ipos, i).x; depth += texelFetch(ColorTexture, ipos, i).a != 0.0 ? texelFetch(DepthTexture, ipos, i).x : 1.0;
depth /= float(SampleCount); depth /= float(SampleCount);
#else #else
/*ivec2 texSize = textureSize(DepthTexture, 0); /*ivec2 texSize = textureSize(DepthTexture, 0);
ivec2 ipos = ivec2(uv * vec2(texSize)); ivec2 ipos = ivec2(uv * vec2(texSize));
if (ipos.x < 0) ipos.x += texSize.x; if (ipos.x < 0) ipos.x += texSize.x;
if (ipos.y < 0) ipos.y += texSize.y; if (ipos.y < 0) ipos.y += texSize.y;
float depth = texelFetch(DepthTexture, ipos, 0).x;*/ float depth = texelFetch(ColorTexture, ipos, 0).a != 0.0 ? texelFetch(DepthTexture, ipos, 0).x : 1.0;*/
float depth = texture(DepthTexture, uv).x; float depth = texture(ColorTexture, uv).a != 0.0 ? texture(DepthTexture, uv).x : 1.0;
#endif #endif
float normalizedDepth = clamp(InverseDepthRangeA * depth + InverseDepthRangeB, 0.0, 1.0); float normalizedDepth = clamp(InverseDepthRangeA * depth + InverseDepthRangeB, 0.0, 1.0);

2
wadsrc/static/shaders/glsl/stencil.fp
View file

@ -3,6 +3,6 @@ out vec4 FragColor;
void main() void main()
{ {
FragColor = vec4(1.0); FragColor = vec4(1.0, 1.0, 1.0, 0.0);
} }