Merge branch 'main' into frustum_halfspace_13945

Author: kfc35

crates/bevy_anti_alias/src/dlss/node.rs

@@ -72,18 +72,15 @@ impl ViewNode for DlssNode<DlssSuperResolutionFeature> {
 
         let diagnostics = render_context.diagnostic_recorder();
         let command_encoder = render_context.command_encoder();
-        let mut dlss_context = dlss_context.context.lock().unwrap();
-
-        command_encoder.push_debug_group("dlss_super_resolution");
         let time_span = diagnostics.time_span(command_encoder, "dlss_super_resolution");
 
+        let mut dlss_context = dlss_context.context.lock().unwrap();
         let dlss_command_buffer = dlss_context
             .render(render_parameters, command_encoder, &adapter)
             .expect("Failed to render DLSS Super Resolution");
 
-        time_span.end(command_encoder);
-        command_encoder.pop_debug_group();
         render_context.add_command_buffer(dlss_command_buffer);
+        time_span.end(render_context.command_encoder());
 
         Ok(())
     }
@@ -149,19 +146,15 @@ impl ViewNode for DlssNode<DlssRayReconstructionFeature> {
 
         let diagnostics = render_context.diagnostic_recorder();
         let command_encoder = render_context.command_encoder();
-        let mut dlss_context = dlss_context.context.lock().unwrap();
-
-        command_encoder.push_debug_group("dlss_ray_reconstruction");
         let time_span = diagnostics.time_span(command_encoder, "dlss_ray_reconstruction");
 
+        let mut dlss_context = dlss_context.context.lock().unwrap();
         let dlss_command_buffer = dlss_context
             .render(render_parameters, command_encoder, &adapter)
             .expect("Failed to render DLSS Ray Reconstruction");
 
-        time_span.end(command_encoder);
-        command_encoder.pop_debug_group();
-
         render_context.add_command_buffer(dlss_command_buffer);
+        time_span.end(render_context.command_encoder());
 
         Ok(())
     }

crates/bevy_render/src/diagnostic/mod.rs

@@ -46,7 +46,7 @@ use crate::renderer::{RenderDevice, RenderQueue};
 ///     ```ignore
 ///     let time_span = diagnostics.time_span(render_context.command_encoder(), "shadows");
 ///     ```
-///  3. End the span, providing the same encoder.
+///  3. End the span, providing the encoder (or the same render/compute pass).
 ///     ```ignore
 ///     time_span.end(render_context.command_encoder());
 ///     ```
@@ -151,7 +151,7 @@ pub struct TimeSpanGuard<'a, R: ?Sized, E> {
 }
 
 impl<R: RecordDiagnostics + ?Sized, E: WriteTimestamp> TimeSpanGuard<'_, R, E> {
-    /// End the span. You have to provide the same encoder which was used to begin the span.
+    /// End the span.
     pub fn end(self, encoder: &mut E) {
         self.recorder.end_time_span(encoder);
         core::mem::forget(self);

crates/bevy_solari/src/realtime/restir_gi.wgsl

@@ -12,6 +12,7 @@ enable wgpu_ray_query;
 #import bevy_solari::scene_bindings::{trace_ray, resolve_ray_hit_full, RAY_T_MIN, RAY_T_MAX}
 #import bevy_solari::world_cache::{query_world_cache, WORLD_CACHE_CELL_LIFETIME}
 #import bevy_solari::realtime_bindings::{view_output, gi_reservoirs_a, gi_reservoirs_b, gbuffer, depth_buffer, motion_vectors, previous_gbuffer, previous_depth_buffer, view, previous_view, constants, Reservoir}
+#import bevy_solari::specular_gi::DIFFUSE_GI_REUSE_ROUGHNESS_THRESHOLD
 
 const SPATIAL_REUSE_RADIUS_PIXELS = 30.0;
 const CONFIDENCE_WEIGHT_CAP = 8.0;
@@ -29,6 +30,10 @@ fn initial_and_temporal(@builtin(global_invocation_id) global_id: vec3<u32>) {
         return;
     }
     let surface = gpixel_resolve(textureLoad(gbuffer, global_id.xy, 0), depth, global_id.xy, view.main_pass_viewport.zw, view.world_from_clip);
+    if surface.material.metallic > 0.9999 && surface.material.roughness <= DIFFUSE_GI_REUSE_ROUGHNESS_THRESHOLD {
+        gi_reservoirs_b[pixel_index] = empty_reservoir();
+        return;
+    }
 
     let initial_reservoir = generate_initial_reservoir(surface.world_position, surface.world_normal, &rng);
     let temporal = load_temporal_reservoir(global_id.xy, depth, surface.world_position, surface.world_normal);
@@ -51,6 +56,10 @@ fn spatial_and_shade(@builtin(global_invocation_id) global_id: vec3<u32>) {
         return;
     }
     let surface = gpixel_resolve(textureLoad(gbuffer, global_id.xy, 0), depth, global_id.xy, view.main_pass_viewport.zw, view.world_from_clip);
+    if surface.material.metallic > 0.9999 && surface.material.roughness <= DIFFUSE_GI_REUSE_ROUGHNESS_THRESHOLD {
+        gi_reservoirs_a[pixel_index] = empty_reservoir();
+        return;
+    }
 
     let input_reservoir = gi_reservoirs_b[pixel_index];
     let spatial = load_spatial_reservoir(global_id.xy, depth, surface.world_position, surface.world_normal, &rng);

crates/bevy_text/src/pipeline.rs

@@ -6,7 +6,7 @@ use bevy_ecs::{
     system::ResMut,
 };
 use bevy_image::prelude::*;
-use bevy_log::{once, warn};
+use bevy_log::warn_once;
 use bevy_math::{Rect, UVec2, Vec2};
 use bevy_reflect::{std_traits::ReflectDefault, Reflect};
 
@@ -166,9 +166,7 @@ impl TextPipeline {
         computed.needs_rerender = false;
 
         if scale_factor <= 0.0 {
-            once!(warn!(
-                "Text scale factor is <= 0.0. No text will be displayed.",
-            ));
+            warn_once!("Text scale factor is <= 0.0. No text will be displayed.",);
 
             return Err(TextError::DegenerateScaleFactor);
         }
@@ -212,13 +210,24 @@ impl TextPipeline {
 
                 // Save spans that aren't zero-sized.
                 if text_font.font_size <= 0.0 {
-                    once!(warn!(
+                    warn_once!(
                         "Text span {entity} has a font size <= 0.0. Nothing will be displayed.",
-                    ));
+                    );
 
                     continue;
                 }
 
+                const WARN_FONT_SIZE: f32 = 1000.0;
+                if text_font.font_size * scale_factor as f32 > WARN_FONT_SIZE {
+                    warn_once!(
+                        "Text span {entity} has an excessively large font size ({} with scale factor {}). \
+                        Extremely large font sizes will cause performance issues with font atlas \
+                        generation and high memory usage.",
+                        text_font.font_size,
+                        scale_factor,
+                    );
+                }
+
                 let attrs = get_attrs(span_index, text_font, line_height, family, scale_factor);
 
                 sections.push((span, attrs));
@@ -583,19 +592,22 @@ fn get_attrs<'a>(
     family: Family<'a>,
     scale_factor: f64,
 ) -> Attrs<'a> {
+    let font_size = (text_font.font_size * scale_factor as f32).round();
+    let line_height = match line_height {
+        LineHeight::Px(px) => px * scale_factor as f32,
+        LineHeight::RelativeToFont(s) => s * font_size,
+    };
+
     Attrs::new()
         .metadata(span_index)
         .family(family)
         .stretch(text_font.width.into())
         .style(text_font.style.into())
         .weight(text_font.weight.into())
-        .metrics(
-            Metrics {
-                font_size: text_font.font_size,
-                line_height: line_height.eval(text_font.font_size),
-            }
-            .scale(scale_factor as f32),
-        )
+        .metrics(Metrics {
+            font_size,
+            line_height,
+        })
         .font_features((&text_font.font_features).into())
 }
 

crates/bevy_text/src/text.rs

@@ -368,8 +368,9 @@ pub struct TextFont {
     pub font: FontSource,
     /// The vertical height of rasterized glyphs in the font atlas in pixels.
     ///
-    /// This is multiplied by the window scale factor and `UiScale`, but not the text entity
-    /// transform or camera projection.
+    /// This is multiplied by the window scale factor and `UiScale`, but not the text entity's
+    /// transform or camera projection. Then, the scaled font size is rounded to the nearest pixel
+    /// to produce the final font size used during glyph layout.
     ///
     /// A new font atlas is generated for every combination of font handle and scaled font size
     /// which can have a strong performance impact.
@@ -794,15 +795,6 @@ pub enum LineHeight {
     RelativeToFont(f32),
 }
 
-impl LineHeight {
-    pub(crate) fn eval(self, font_size: f32) -> f32 {
-        match self {
-            LineHeight::Px(px) => px,
-            LineHeight::RelativeToFont(scale) => scale * font_size,
-        }
-    }
-}
-
 impl Default for LineHeight {
     fn default() -> Self {
         LineHeight::RelativeToFont(1.2)

examples/3d/solari.rs

@@ -601,7 +601,7 @@ fn update_performance_text(
         "Specular indirect",
         "render/solari_lighting/specular_indirect_lighting/elapsed_gpu",
     );
-    text.push_str(&format!("{:17}     TODO\n", "DLSS-RR"));
+    (add_diagnostic)("DLSS-RR", "render/dlss_ray_reconstruction/elapsed_gpu");
     text.push_str(&format!("{:17}  {total:.2} ms\n", "Total"));
 
     if let Some(world_cache_active_cells_count) = diagnostics