sharpening filter

Author: malytomas

data/cage/shader/effects/effects.assets

@@ -14,6 +14,7 @@ gaussianBlur.glsl
 luminanceApply.glsl
 luminanceCollection.glsl
 luminanceHistogram.glsl
-ssaoResolve.glsl
+sharpening.glsl
 ssaoGenerate.glsl
+ssaoResolve.glsl
 tonemap.glsl

data/cage/shader/effects/effects.pack

@@ -9,6 +9,7 @@ gaussianBlur.glsl
 luminanceApply.glsl
 luminanceCollection.glsl
 luminanceHistogram.glsl
-ssaoResolve.glsl
+sharpening.glsl
 ssaoGenerate.glsl
+ssaoResolve.glsl
 tonemap.glsl

data/cage/shader/effects/sharpening.glsl

@@ -0,0 +1,25 @@
+$include vertex.glsl
+
+$define shader fragment
+
+layout(binding = 0) uniform sampler2D texColor;
+
+layout(std140, binding = 2) uniform Sharpening
+{
+	vec4 params; // strength
+};
+
+out vec3 outColor;
+
+void main()
+{
+	ivec2 coord = ivec2(gl_FragCoord.xy);
+	vec3 center = texelFetch(texColor, coord, 0).rgb;
+	vec3 up = texelFetch(texColor, coord + ivec2(0, 1), 0).rgb;
+	vec3 down = texelFetch(texColor, coord + ivec2(0, -1), 0).rgb;
+	vec3 left = texelFetch(texColor, coord + ivec2(-1, 0), 0).rgb;
+	vec3 right = texelFetch(texColor, coord + ivec2(1, 0), 0).rgb;
+	float strength = params.x;
+	vec3 sharpenedColor = center * (1 + 4 * strength) - (up + down + left + right) * strength;
+	outColor = clamp(sharpenedColor, 0, 1);
+}

sources/include/cage-engine/sceneScreenSpaceEffects.h

@@ -15,6 +15,7 @@ namespace cage
 		ToneMapping = 1 << 5,
 		GammaCorrection = 1 << 6,
 		AntiAliasing = 1 << 7,
+		Sharpening = 1 << 8,
 		Default = AmbientOcclusion | Bloom | ToneMapping | GammaCorrection | AntiAliasing,
 	};
 
@@ -24,6 +25,7 @@ namespace cage
 		ScreenSpaceBloom bloom;
 		ScreenSpaceEyeAdaptation eyeAdaptation;
 		ScreenSpaceDepthOfField depthOfField;
+		ScreenSpaceSharpening sharpening;
 		Real gamma = 2.2;
 		ScreenSpaceEffectsFlags effects = ScreenSpaceEffectsFlags::Default;
 	};

sources/include/cage-engine/screenSpaceEffects.h

@@ -62,13 +62,20 @@ namespace cage
 		TextureHandle outColor;
 	};
 
+	struct CAGE_ENGINE_API ScreenSpaceSharpeningConfig : public ScreenSpaceCommonConfig, public ScreenSpaceSharpening
+	{
+		TextureHandle inColor;
+		TextureHandle outColor;
+	};
+
 	CAGE_ENGINE_API void screenSpaceAmbientOcclusion(const ScreenSpaceAmbientOcclusionConfig &config);
 	CAGE_ENGINE_API void screenSpaceDepthOfField(const ScreenSpaceDepthOfFieldConfig &config);
 	CAGE_ENGINE_API void screenSpaceEyeAdaptationPrepare(const ScreenSpaceEyeAdaptationConfig &config);
 	CAGE_ENGINE_API void screenSpaceBloom(const ScreenSpaceBloomConfig &config);
 	CAGE_ENGINE_API void screenSpaceEyeAdaptationApply(const ScreenSpaceEyeAdaptationConfig &config);
 	CAGE_ENGINE_API void screenSpaceTonemap(const ScreenSpaceTonemapConfig &config);
 	CAGE_ENGINE_API void screenSpaceFastApproximateAntiAliasing(const ScreenSpaceFastApproximateAntiAliasingConfig &config);
+	CAGE_ENGINE_API void screenSpaceSharpening(const ScreenSpaceSharpeningConfig &config);
 }
 
 #endif // guard_screenSpaceEffects_h_xcfvh241448960sdrt

sources/include/cage-engine/screenSpaceEffectsProperties.h

@@ -45,6 +45,11 @@ namespace cage
 		uint32 blurPasses = 5;
 		Real threshold = 1;
 	};
+
+	struct CAGE_ENGINE_API ScreenSpaceSharpening
+	{
+		Real strength = 1;
+	};
 }
 
 #endif // guard_screenSpaceEffectsProperties_h_0156sdrf4treth1

sources/libengine/graphics/renderPipeline.cpp

@@ -1199,7 +1199,7 @@ namespace cage
 						std::swap(texSource, texTarget);
 					}
 
-					// final screen effects
+					// tonemap & gamma correction
 					if (any(effects.effects & (ScreenSpaceEffectsFlags::ToneMapping | ScreenSpaceEffectsFlags::GammaCorrection)))
 					{
 						ScreenSpaceTonemapConfig cfg;
@@ -1223,6 +1223,18 @@ namespace cage
 						std::swap(texSource, texTarget);
 					}
 
+					// sharpening
+					if (any(effects.effects & ScreenSpaceEffectsFlags::Sharpening) && effects.sharpening.strength > 1e-3)
+					{
+						ScreenSpaceSharpeningConfig cfg;
+						(ScreenSpaceCommonConfig &)cfg = commonConfig;
+						cfg.inColor = texSource;
+						cfg.outColor = texTarget;
+						cfg.strength = effects.sharpening.strength;
+						screenSpaceSharpening(cfg);
+						std::swap(texSource, texTarget);
+					}
+
 					// blit to destination
 					if (texSource != colorTexture)
 					{

sources/libengine/graphics/screenSpaceEffects.cpp

@@ -351,4 +351,27 @@ namespace cage
 		q->bind(config.assets->get<AssetSchemeIndexShaderProgram, MultiShaderProgram>(HashString("cage/shader/effects/fxaa.glsl"))->get(0));
 		q->draw(config.assets->get<AssetSchemeIndexModel, Model>(HashString("cage/model/square.obj")));
 	}
+
+	void screenSpaceSharpening(const ScreenSpaceSharpeningConfig &config)
+	{
+		RenderQueue *q = config.queue;
+		const auto graphicsDebugScope = q->namedScope("sharpening");
+
+		q->viewport(Vec2i(), config.resolution);
+		FrameBufferHandle fb = config.provisionals->frameBufferDraw("graphicsEffects");
+		q->bind(fb);
+
+		struct Shader
+		{
+			Vec4 params; // strength
+		} s;
+		s.params[0] = config.strength;
+		q->universalUniformStruct(s, 2);
+
+		q->colorTexture(fb, 0, config.outColor);
+		q->checkFrameBuffer(fb);
+		q->bind(config.inColor, 0);
+		q->bind(config.assets->get<AssetSchemeIndexShaderProgram, MultiShaderProgram>(HashString("cage/shader/effects/sharpening.glsl"))->get(0));
+		q->draw(config.assets->get<AssetSchemeIndexModel, Model>(HashString("cage/model/square.obj")));
+	}
 }