Fix

Author: beicause

crates/bevy_core_pipeline/src/oit/mod.rs

@@ -52,8 +52,8 @@ pub struct OrderIndependentTransparencySettings {
 impl Default for OrderIndependentTransparencySettings {
     fn default() -> Self {
         Self {
-            sorted_fragment_max_count: 8,
-            fragments_per_pixel_average: 4.0,
+            sorted_fragment_max_count: 16,
+            fragments_per_pixel_average: 8.0,
             alpha_threshold: 0.0,
         }
     }

crates/bevy_core_pipeline/src/oit/resolve/mod.rs

@@ -1,4 +1,4 @@
-use std::num::NonZero;
+use core::num::NonZero;
 
 use super::OitBuffers;
 use crate::{oit::OrderIndependentTransparencySettings, FullscreenShader};
@@ -221,7 +221,7 @@ fn specialize_oit_resolve_pipeline(
             shader: load_embedded_asset!(asset_server, "oit_resolve.wgsl"),
             shader_defs: vec![ShaderDefVal::UInt(
                 "SORTED_FRAGMENT_MAX_COUNT".into(),
-                key.sorted_fragment_max_count as u32,
+                key.sorted_fragment_max_count,
             )],
             targets: vec![Some(ColorTargetState {
                 format,

crates/bevy_core_pipeline/src/oit/resolve/oit_resolve.wgsl

@@ -71,8 +71,13 @@ fn resolve(header: u32, opaque_depth: f32) -> vec4<f32> {
             // There is still room in the sorted list.
             // Insert the fragment so that the list stay sorted.
             var i = sorted_frag_count;
-            for(; (i > 0) && (depth_alpha.x < fragment_list[i - 1].depth); i -= 1) {
-                fragment_list[i] = fragment_list[i - 1];
+            for(; i > 0; i -= 1) {
+                // short-circuit can't be used in for-loop, https://github.com/gfx-rs/wgpu/issues/4394
+                if depth_alpha.x < fragment_list[i - 1].depth {
+                    fragment_list[i] = fragment_list[i - 1];
+                } else {
+                    break;
+                }
             }
             fragment_list[i].color = color;
             fragment_list[i].alpha = depth_alpha.y;
@@ -85,8 +90,13 @@ fn resolve(header: u32, opaque_depth: f32) -> vec4<f32> {
             // This is an approximation.
             final_color = blend(vec4f(fragment_list[0].color * fragment_list[0].alpha, fragment_list[0].alpha), final_color);
             var i = 0u;
-            for(; (i < SORTED_FRAGMENT_MAX_COUNT - 1) && (fragment_list[i + 1].depth < depth_alpha.x); i += 1) {
-               fragment_list[i] = fragment_list[i + 1];
+            for(; i < SORTED_FRAGMENT_MAX_COUNT - 1; i += 1) {
+                // short-circuit can't be used in for-loop, https://github.com/gfx-rs/wgpu/issues/4394
+                if fragment_list[i + 1].depth < depth_alpha.x {
+                    fragment_list[i] = fragment_list[i + 1];
+                } else {
+                    break;
+                }
             }
             fragment_list[i].color = color;
             fragment_list[i].alpha = depth_alpha.y;