remove Bgr10a2, rename Rg11b10Float -> Rg11b10Ufloat

blade-graphics/src/gles/mod.rs

@@ -632,12 +632,7 @@ fn describe_texture_format(format: crate::TextureFormat) -> FormatInfo {
             glow::RGBA,
             glow::UNSIGNED_INT_2_10_10_10_REV,
         ),
-        Tf::Bgr10a2Unorm => (
-            glow::RGB10_A2, // TODO: Unsupported?
-            glow::BGRA,
-            glow::UNSIGNED_INT_2_10_10_10_REV,
-        ),
-        Tf::Rg11b10Float => (
+        Tf::Rg11b10Ufloat => (
             glow::R11F_G11F_B10F,
             glow::RGB,
             glow::UNSIGNED_INT_10F_11F_11F_REV,

blade-graphics/src/lib.rs

@@ -314,8 +314,7 @@ pub enum TextureFormat {
     Bc7UnormSrgb,
     // packed 32-bit
     Rgb10a2Unorm,
-    Bgr10a2Unorm,
-    Rg11b10Float,
+    Rg11b10Ufloat,
     Rgb9e5Ufloat,
 }
 

blade-graphics/src/metal/mod.rs

@@ -339,8 +339,7 @@ fn map_texture_format(format: crate::TextureFormat) -> metal::MTLPixelFormat {
         Tf::Bc7Unorm => BC7_RGBAUnorm,
         Tf::Bc7UnormSrgb => BC7_RGBAUnorm_sRGB,
         Tf::Rgb10a2Unorm => RGB10A2Unorm,
-        Tf::Bgr10a2Unorm => BGR10A2Unorm,
-        Tf::Rg11b10Float => RG11B10Float,
+        Tf::Rg11b10Ufloat => RG11B10Float,
         Tf::Rgb9e5Ufloat => RGB9E5Float,
     }
 }

blade-graphics/src/util.rs

@@ -89,8 +89,7 @@ impl super::TextureFormat {
             Self::Bc7Unorm => cx_bc(16),
             Self::Bc7UnormSrgb => cx_bc(16),
             Self::Rgb10a2Unorm => uncompressed(4),
-            Self::Bgr10a2Unorm => uncompressed(4),
-            Self::Rg11b10Float => uncompressed(4),
+            Self::Rg11b10Ufloat => uncompressed(4),
             Self::Rgb9e5Ufloat => uncompressed(4),
         }
     }

blade-graphics/src/vulkan/mod.rs

@@ -561,9 +561,8 @@ fn map_texture_format(format: crate::TextureFormat) -> vk::Format {
         Tf::Bc6hFloat => vk::Format::BC6H_SFLOAT_BLOCK,
         Tf::Bc7Unorm => vk::Format::BC7_UNORM_BLOCK,
         Tf::Bc7UnormSrgb => vk::Format::BC7_SRGB_BLOCK,
-        Tf::Rgb10a2Unorm => vk::Format::A2R10G10B10_UNORM_PACK32,
-        Tf::Bgr10a2Unorm => vk::Format::A2B10G10R10_UNORM_PACK32,
-        Tf::Rg11b10Float => vk::Format::B10G11R11_UFLOAT_PACK32,
+        Tf::Rgb10a2Unorm => vk::Format::A2B10G10R10_UNORM_PACK32,
+        Tf::Rg11b10Ufloat => vk::Format::B10G11R11_UFLOAT_PACK32,
         Tf::Rgb9e5Ufloat => vk::Format::E5B9G9R9_UFLOAT_PACK32,
     }
 }

blade-render/code/blur.wgsl

@@ -0,0 +1,162 @@
+#include "camera.inc.wgsl"
+#include "gbuf.inc.wgsl"
+#include "quaternion.inc.wgsl"
+#include "surface.inc.wgsl"
+
+// Spatio-temporal variance-guided filtering
+// https://research.nvidia.com/sites/default/files/pubs/2017-07_Spatiotemporal-Variance-Guided-Filtering%3A//svgf_preprint.pdf
+
+// Note: using "ilm" in place of "illumination and the 2nd moment of its luminance"
+
+struct Params {
+    extent: vec2<i32>,
+    temporal_weight: f32,
+    iteration: u32,
+    use_motion_vectors: u32,
+}
+
+var<uniform> camera: CameraParams;
+var<uniform> prev_camera: CameraParams;
+var<uniform> params: Params;
+var t_depth: texture_2d<f32>;
+var t_prev_depth: texture_2d<f32>;
+var t_flat_normal: texture_2d<f32>;
+var t_prev_flat_normal: texture_2d<f32>;
+var t_motion: texture_2d<f32>;
+var input: texture_2d<f32>;
+var prev_input: texture_2d<f32>;
+var output: texture_storage_2d<rgba16float, write>;
+
+const LUMA: vec3<f32> = vec3<f32>(0.2126, 0.7152, 0.0722);
+const MIN_WEIGHT: f32 = 0.01;
+
+fn read_surface(pixel: vec2<i32>) -> Surface {
+    var surface = Surface();
+    surface.flat_normal = normalize(textureLoad(t_flat_normal, pixel, 0).xyz);
+    surface.depth = textureLoad(t_depth, pixel, 0).x;
+    return surface;
+}
+fn read_prev_surface(pixel: vec2<i32>) -> Surface {
+    var surface = Surface();
+    surface.flat_normal = normalize(textureLoad(t_prev_flat_normal, pixel, 0).xyz);
+    surface.depth = textureLoad(t_prev_depth, pixel, 0).x;
+    return surface;
+}
+
+fn get_prev_pixel(pixel: vec2<i32>, pos_world: vec3<f32>) -> vec2<f32> {
+    if (USE_MOTION_VECTORS && params.use_motion_vectors != 0u) {
+        let motion = textureLoad(t_motion, pixel, 0).xy / MOTION_SCALE;
+        return vec2<f32>(pixel) + 0.5 + motion;
+    } else {
+        return get_projected_pixel_float(prev_camera, pos_world);
+    }
+}
+
+@compute @workgroup_size(8, 8)
+fn temporal_accum(@builtin(global_invocation_id) global_id: vec3<u32>) {
+    let pixel = vec2<i32>(global_id.xy);
+    if (any(pixel >= params.extent)) {
+        return;
+    }
+
+    let surface = read_surface(pixel);
+    let pos_world = camera.position + surface.depth * get_ray_direction(camera, pixel);
+    // considering all samples in 2x2 quad, to help with edges
+    var center_pixel = get_prev_pixel(pixel, pos_world);
+    var prev_pixels = array<vec2<i32>, 4>(
+        vec2<i32>(vec2<f32>(center_pixel.x - 0.5, center_pixel.y - 0.5)),
+        vec2<i32>(vec2<f32>(center_pixel.x + 0.5, center_pixel.y - 0.5)),
+        vec2<i32>(vec2<f32>(center_pixel.x + 0.5, center_pixel.y + 0.5)),
+        vec2<i32>(vec2<f32>(center_pixel.x - 0.5, center_pixel.y + 0.5)),
+    );
+    //Note: careful about the pixel center when there is a perfect match
+    let w_bot_right = fract(center_pixel + vec2<f32>(0.5));
+    var prev_weights = vec4<f32>(
+        (1.0 - w_bot_right.x) * (1.0 - w_bot_right.y),
+        w_bot_right.x * (1.0 - w_bot_right.y),
+        w_bot_right.x * w_bot_right.y,
+        (1.0 - w_bot_right.x) * w_bot_right.y,
+    );
+
+    var sum_weight = 0.0;
+    var sum_ilm = vec4<f32>(0.0);
+    //TODO: optimize depth load with a gather operation
+    for (var i = 0; i < 4; i += 1) {
+        let prev_pixel = prev_pixels[i];
+        if (all(prev_pixel >= vec2<i32>(0)) && all(prev_pixel < params.extent)) {
+            let prev_surface = read_prev_surface(prev_pixel);
+            if (compare_flat_normals(surface.flat_normal, prev_surface.flat_normal) < 0.5) {
+                continue;
+            }
+            let projected_distance = length(pos_world - prev_camera.position);
+            if (compare_depths(prev_surface.depth, projected_distance) < 0.5) {
+                continue;
+            }
+            let w = prev_weights[i];
+            sum_weight += w;
+            let illumination = w * textureLoad(prev_input, prev_pixel, 0).xyz;
+            let luminocity = dot(illumination, LUMA);
+            sum_ilm += vec4<f32>(illumination, luminocity * luminocity);
+        }
+    }
+
+    let cur_illumination = textureLoad(input, pixel, 0).xyz;
+    let cur_luminocity = dot(cur_illumination, LUMA);
+    var mixed_ilm = vec4<f32>(cur_illumination, cur_luminocity * cur_luminocity);
+    if (sum_weight > MIN_WEIGHT) {
+        let prev_ilm = sum_ilm / vec4(vec3<f32>(sum_weight), max(0.001, sum_weight*sum_weight));
+        mixed_ilm = mix(mixed_ilm, prev_ilm, sum_weight * (1.0 - params.temporal_weight));
+    }
+    textureStore(output, global_id.xy, mixed_ilm);
+}
+
+const GAUSSIAN_WEIGHTS = vec2<f32>(0.44198, 0.27901);
+const SIGMA_L: f32 = 4.0;
+const EPSILON: f32 = 0.001;
+
+fn compare_luminance(a_lum: f32, b_lum: f32, variance: f32) -> f32 {
+    return exp(-abs(a_lum - b_lum) / (SIGMA_L * variance + EPSILON));
+}
+
+fn w4(w: f32) -> vec4<f32> {
+    return vec4<f32>(vec3<f32>(w), w * w);
+}
+
+@compute @workgroup_size(8, 8)
+fn atrous3x3(@builtin(global_invocation_id) global_id: vec3<u32>) {
+    let center = vec2<i32>(global_id.xy);
+    if (any(center >= params.extent)) {
+        return;
+    }
+
+    let center_ilm = textureLoad(input, center, 0);
+    let center_luma = dot(center_ilm.xyz, LUMA);
+    let variance = sqrt(center_ilm.w);
+    let center_suf = read_surface(center);
+    var sum_weight = GAUSSIAN_WEIGHTS[0] * GAUSSIAN_WEIGHTS[0];
+    var sum_ilm = w4(sum_weight) * center_ilm;
+
+    for (var yy=-1; yy<=1; yy+=1) {
+        for (var xx=-1; xx<=1; xx+=1) {
+            let p = center + vec2<i32>(xx, yy) * (1i << params.iteration);
+            if (all(p == center) || any(p < vec2<i32>(0)) || any(p >= params.extent)) {
+                continue;
+            }
+
+            //TODO: store in group-shared memory
+            let surface = read_surface(p);
+            var weight = GAUSSIAN_WEIGHTS[abs(xx)] * GAUSSIAN_WEIGHTS[abs(yy)];
+            //TODO: make it stricter on higher iterations
+            weight *= compare_flat_normals(surface.flat_normal, center_suf.flat_normal);
+            //Note: should we use a projected depth instead of the surface one?
+            weight *= compare_depths(surface.depth, center_suf.depth);
+            let other_ilm = textureLoad(input, p, 0);
+            weight *= compare_luminance(center_luma, dot(other_ilm.xyz, LUMA), variance);
+            sum_ilm += w4(weight) * other_ilm;
+            sum_weight += weight;
+        }
+    }
+
+    let filtered_ilm = select(center_ilm, sum_ilm / w4(sum_weight), sum_weight > MIN_WEIGHT);
+    textureStore(output, global_id.xy, filtered_ilm);
+}