bloom

Author: malytomas

data/cage/shaders/effects/bloomApply.glsl

@@ -5,20 +5,21 @@ $define shader fragment
 
 layout(std140, set = 2, binding = 0) uniform Params
 {
-	ivec4 uniLodLevel; // x
+	vec4 uniBloomParams; // threshold, blur passes
 };
 
 layout(set = 2, binding = 1) uniform sampler2D texColor;
-layout(set = 2, binding = 2) uniform sampler2D texBloom;
+layout(set = 2, binding = 3) uniform sampler2D texBloom;
 
 layout(location = 0) out vec4 outColor;
 
 void main()
 {
+	int levels = int(uniBloomParams.y);
 	vec3 color = texelFetch(texColor, ivec2(gl_FragCoord), 0).rgb;
 	vec3 bloom = vec3(0);
-	vec2 uv = vec2(gl_FragCoord) / textureSize(texColor, 0).xy;
-	for (int i = 0; i < uniLodLevel.x; i++)
+	vec2 uv = vec2(gl_FragCoord) / vec2(textureSize(texColor, 0));
+	for (int i = 0; i < levels; i++)
 		bloom += textureLod(texBloom, uv, i).rgb;
-	outColor = vec4(color + bloom / uniLodLevel.x, 1); // additive mixing
+	outColor = vec4(color + bloom / levels, 1); // additive mixing
 }

data/cage/shaders/effects/bloomGenerate.glsl

@@ -5,7 +5,7 @@ $define shader fragment
 
 layout(std140, set = 2, binding = 0) uniform Params
 {
-	vec4 uniBloomParams; // threshold
+	vec4 uniBloomParams; // threshold, blur passes
 };
 
 layout(set = 2, binding = 1) uniform sampler2D texColor;

data/cage/shaders/effects/effects.assets

@@ -10,6 +10,7 @@ dofApply.glsl
 dofCollect.glsl
 fxaa.glsl
 gaussianBlur.glsl
+makeMip.glsl
 sharpening.glsl
 ssaoDownscaleDepth.glsl
 ssaoGenerate.glsl

data/cage/shaders/effects/effects.pack

@@ -5,6 +5,7 @@ dofApply.glsl
 dofCollect.glsl
 fxaa.glsl
 gaussianBlur.glsl
+makeMip.glsl
 sharpening.glsl
 ssaoDownscaleDepth.glsl
 ssaoGenerate.glsl

data/cage/shaders/effects/gaussianBlur.glsl

@@ -8,25 +8,25 @@ $define shader fragment
 const float offsets[3] = { 0.0, 1.3846153846, 3.2307692308 };
 const float weights[3] = { 0.2270270270, 0.3162162162, 0.0702702703 };
 
-layout(std140, set = 2, binding = 0) uniform Params
-{
-	vec4 uniDirection; // xy
-	ivec4 uniLodLevel; // x
-};
+#ifdef Vertical
+	const vec2 direction = vec2(0, 1);
+#else
+	const vec2 direction = vec2(1, 0);
+#endif
 
-layout(set = 2, binding = 1) uniform sampler2D texInput;
+layout(set = 2, binding = 0) uniform sampler2D texInput;
 
 layout(location = 0) out vec4 outOutput;
 
 void main()
 {
-	vec2 texelSize = 1 / vec2(textureSize(texInput, uniLodLevel.x));
+	vec2 texelSize = 1 / vec2(textureSize(texInput, 0));
 	vec2 center = gl_FragCoord.xy;
-	vec4 val = textureLod(texInput, center * texelSize, uniLodLevel.x) * weights[0];
+	vec4 val = textureLod(texInput, center * texelSize, 0) * weights[0];
 	for(int i = 1; i < 3; i++)
 	{
-		val += textureLod(texInput, (center - uniDirection.xy * offsets[i]) * texelSize, uniLodLevel.x) * weights[i];
-		val += textureLod(texInput, (center + uniDirection.xy * offsets[i]) * texelSize, uniLodLevel.x) * weights[i];
+		val += textureLod(texInput, (center - direction * offsets[i]) * texelSize, 0) * weights[i];
+		val += textureLod(texInput, (center + direction * offsets[i]) * texelSize, 0) * weights[i];
 	}
 	outOutput = val;
 }

data/cage/shaders/effects/makeMip.glsl

@@ -0,0 +1,14 @@
+
+$include vertex.glsl
+
+$define shader fragment
+
+layout(set = 2, binding = 0) uniform sampler2D texColor;
+
+layout(location = 0) out vec4 outColor;
+
+void main()
+{
+	vec2 uv = 2 * vec2(gl_FragCoord) / vec2(textureSize(texColor, 0));
+	outColor = textureLod(texColor, uv, 0);
+}

sources/libengine/graphics/bindings.cpp

@@ -1,3 +1,5 @@
+#include <svector.h>
+
 #include <cage-core/assetsManager.h>
 #include <cage-core/concurrent.h>
 #include <cage-core/hashString.h>
@@ -56,7 +58,7 @@ namespace cage
 
 		wgpu::BindGroupLayout createLayout(GraphicsDevice *device, const BindingsCreateConfig &config)
 		{
-			std::vector<wgpu::BindGroupLayoutEntry> entries;
+			ankerl::svector<wgpu::BindGroupLayoutEntry, 10> entries;
 			entries.reserve(config.buffers.size() + config.textures.size() * 2);
 
 			for (const auto &b : config.buffers)
@@ -114,7 +116,7 @@ namespace cage
 
 		wgpu::BindGroup createGroup(GraphicsDevice *device, const wgpu::BindGroupLayout &layout, const BindingsCreateConfig &config)
 		{
-			std::vector<wgpu::BindGroupEntry> entries;
+			ankerl::svector<wgpu::BindGroupEntry, 10> entries;
 			entries.reserve(config.buffers.size() + config.textures.size() * 2);
 
 			for (const auto &b : config.buffers)
@@ -164,18 +166,26 @@ namespace cage
 
 		struct Key
 		{
-			std::vector<uint32> keys;
+			ankerl::svector<uint32, 5> keys;
 
 			std::size_t hash = 0;
 
 			Key(const BindingsCreateConfig &config)
 			{
 				keys.reserve(config.buffers.size() + 1 + config.textures.size());
 				for (const auto &b : config.buffers)
-					keys.push_back(b.binding + (b.dynamic * (1u << 10)) + (b.buffer->type() << 11));
+				{
+					const uint32 dyn = (uint32)b.dynamic << 10;
+					const uint32 type = (uint32)b.buffer->type() << 11;
+					keys.push_back(b.binding + dyn + type);
+				}
 				keys.push_back(75431564); // separator
 				for (const auto &t : config.textures)
-					keys.push_back(t.binding + ((uint32)t.texture->flags << 10));
+				{
+					const uint32 filterable = (uint32)isFormatFilterable(t.texture->nativeTexture().GetFormat()) << 10;
+					const uint32 flags = (uint32)t.texture->flags << 11;
+					keys.push_back(t.binding + filterable + flags);
+				}
 
 				auto hashCombine = [&](std::unsigned_integral auto v) { hash ^= std::hash<std::decay_t<decltype(v)>>{}(v) + 0x9e3779b9 + (hash << 6) + (hash >> 2); };
 				for (uint32 k : keys)

sources/libengine/graphics/encoder.cpp

@@ -1,3 +1,4 @@
+#include <svector.h>
 #include <webgpu/webgpu_cpp.h>
 
 #include <cage-core/concurrent.h>
@@ -27,7 +28,7 @@ namespace cage
 		struct Key
 		{
 			std::array<WGPUBindGroupLayout, 3> layouts = {};
-			std::vector<wgpu::TextureFormat> colorFormats;
+			ankerl::svector<wgpu::TextureFormat, 5> colorFormats;
 			const Shader *shader = nullptr;
 			MeshComponentsFlags meshComponents = MeshComponentsFlags::None;
 			wgpu::TextureFormat depthFormat = wgpu::TextureFormat::Undefined;
@@ -122,7 +123,7 @@ namespace cage
 			}
 
 			wgpu::BlendState blendState = convertBlending(config.blending);
-			std::vector<wgpu::ColorTargetState> colors;
+			ankerl::svector<wgpu::ColorTargetState, 1> colors;
 			colors.reserve(passData.colorTargets.size());
 			for (const auto &ct : passData.colorTargets)
 			{
@@ -251,7 +252,7 @@ namespace cage
 					if (!passData.bindings)
 						passData.bindings = getEmptyBindings(device);
 
-					std::vector<wgpu::RenderPassColorAttachment> atts;
+					ankerl::svector<wgpu::RenderPassColorAttachment, 1> atts;
 					atts.reserve(passData.colorTargets.size());
 					for (const auto &it : passData.colorTargets)
 					{