simplify and fix depth of field

Author: malytomas

data/cage/shader/effects/dofApply.glsl

@@ -3,12 +3,38 @@ $include vertex.glsl
 
 $define shader fragment
 
-$include dofParams.glsl
+layout(std140, binding = 2) uniform Dof
+{
+	mat4 projInv;
+	vec4 dofNear; // near, far
+	vec4 dofFar; // near, far
+};
+
+vec3 s2w(vec2 p, float d)
+{
+	vec4 p4 = vec4(p, d, 1.0);
+	p4 = projInv * p4;
+	return p4.xyz / p4.w;
+}
+
+float interpFactor(float a, float b, float d)
+{
+	if (a < b)
+		return smoothstep(a, b, d);
+	return d < a ? 0.0 : 1.0;
+}
+
+void dofContribution(vec2 uv, float depth, out float near, out float far)
+{
+	vec3 wp = s2w(uv * 2.0 - 1.0, depth * 2.0 - 1.0);
+	float d = length(wp);
+	near = 1.0 - interpFactor(dofNear[0], dofNear[1], d);
+	far = interpFactor(dofFar[0], dofFar[1], d);
+}
 
 layout(binding = 0) uniform sampler2D texColor;
 layout(binding = 1) uniform sampler2D texDepth;
-layout(binding = 2) uniform sampler2D texDofNear;
-layout(binding = 3) uniform sampler2D texDofFar;
+layout(binding = 2) uniform sampler2D texDof;
 
 out vec3 outColor;
 
@@ -23,10 +49,9 @@ void main()
 		outColor = color;
 		return;
 	}
-	vec3 colorNear = textureLod(texDofNear, uv, 0).rgb;
-	vec3 colorFar = textureLod(texDofFar, uv, 0).rgb;
+	vec3 colorDof = textureLod(texDof, uv, 0).rgb;
 	float near;
 	float far;
 	dofContribution(uv, depth, near, far);
-	outColor = color * (1 - near - far) + colorNear * near + colorFar * far;
+	outColor = color * (1 - near - far) + colorDof * (near + far);
 }

data/cage/shader/effects/dofCollect.glsl

@@ -3,12 +3,7 @@ $include vertex.glsl
 
 $define shader fragment
 
-$include dofParams.glsl
-
-layout(location = 0) uniform int uniPass;
-
 layout(binding = 0) uniform sampler2D texColor;
-layout(binding = 1) uniform sampler2D texDepth;
 
 out vec3 outDof;
 
@@ -24,8 +19,5 @@ void main()
 		for (int x = 0; x < downscale; x++)
 			color += texelFetch(texColor, ivec2(gl_FragCoord) * downscale + ivec2(x, y) - downscale / 2, 0).rgb;
 	color /= float(downscale * downscale);
-	float depth = textureLod(texDepth, uv, 0).x;
-	float contribs[2];
-	dofContribution(uv, depth, contribs[0], contribs[1]);
-	outDof = color * contribs[uniPass];
+	outDof = color;
 }

data/cage/shader/effects/dofParams.glsl

@@ -154,49 +154,39 @@ namespace cage
 		s.dofFar = Vec4(fd + fr, fd + fr + br, 0, 0);
 		q->universalUniformStruct(s, 2);
 
-		TextureHandle texNear = provTex(config.provisionals, "dofNear", res, 1, GL_RGB16F);
-		TextureHandle texFar = provTex(config.provisionals, "dofFar", res, 1, GL_RGB16F);
-
-		q->bind(config.inColor, 0);
-		q->bind(config.inDepth, 1);
-		Holder<ShaderProgram> shader = config.assets->get<AssetSchemeIndexShaderProgram, MultiShaderProgram>(HashString("cage/shader/effects/dofCollect.glsl"))->get(0);
-		q->bind(shader);
+		TextureHandle texDof = provTex(config.provisionals, "dofColor", res, 1, GL_RGB16F);
 		Holder<Model> model = config.assets->get<AssetSchemeIndexModel, Model>(HashString("cage/model/square.obj"));
-		{ // collect near
-			q->colorTexture(fb, 0, texNear);
+
+		{ // collect
+			q->bind(config.inColor, 0);
+			q->bind(config.inDepth, 1);
+			Holder<ShaderProgram> shader = config.assets->get<AssetSchemeIndexShaderProgram, MultiShaderProgram>(HashString("cage/shader/effects/dofCollect.glsl"))->get(0);
+			q->bind(shader);
+			q->colorTexture(fb, 0, texDof);
 			q->checkFrameBuffer(fb);
-			q->uniform(shader, 0, 0);
 			q->draw(model);
 		}
-		{ // collect far
-			q->colorTexture(fb, 0, texFar);
+
+		{ // blur
+			GfGaussianBlurConfig gb;
+			(ScreenSpaceCommonConfig &)gb = config;
+			gb.resolution = res;
+			gb.internalFormat = GL_RGB16F;
+			gb.texture = texDof;
+			for (uint32 i = 0; i < config.blurPasses; i++)
+				gfGaussianBlur(gb);
+		}
+
+		{ // apply
+			q->viewport(Vec2i(), config.resolution);
+			q->colorTexture(fb, 0, config.outColor);
 			q->checkFrameBuffer(fb);
-			q->uniform(shader, 0, 1);
+			q->bind(config.inColor, 0);
+			q->bind(config.inDepth, 1);
+			q->bind(texDof, 2);
+			q->bind(config.assets->get<AssetSchemeIndexShaderProgram, MultiShaderProgram>(HashString("cage/shader/effects/dofApply.glsl"))->get(0));
 			q->draw(model);
 		}
-
-		// blur
-		GfGaussianBlurConfig gb;
-		(ScreenSpaceCommonConfig &)gb = config;
-		gb.resolution = res;
-		gb.internalFormat = GL_RGB16F;
-		gb.texture = texNear;
-		for (uint32 i = 0; i < config.blurPasses; i++)
-			gfGaussianBlur(gb);
-		gb.texture = texFar;
-		for (uint32 i = 0; i < config.blurPasses; i++)
-			gfGaussianBlur(gb);
-
-		// apply
-		q->viewport(Vec2i(), config.resolution);
-		q->colorTexture(fb, 0, config.outColor);
-		q->checkFrameBuffer(fb);
-		q->bind(config.inColor, 0);
-		q->bind(config.inDepth, 1);
-		q->bind(texNear, 2);
-		q->bind(texFar, 3);
-		q->bind(config.assets->get<AssetSchemeIndexShaderProgram, MultiShaderProgram>(HashString("cage/shader/effects/dofApply.glsl"))->get(0));
-		q->draw(model);
 	}
 
 	namespace