Guard renderer module graph against cycles

Author: DoubleStyx

crates/renderide/src/config/persist/load/tests.rs

@@ -118,7 +118,7 @@ fn max_local_reflection_probe_env_override_clamps_effective_value() {
         settings
             .experimental
             .effective_max_local_reflection_probes(),
-        crate::reflection_probes::specular::MAX_LOCAL_PROBES
+        crate::render_contract::MAX_LOCAL_REFLECTION_PROBES
     );
 }
 

crates/renderide/src/config/types.rs

@@ -107,7 +107,7 @@ mod tests {
         assert_eq!(settings.display.focused_fps_cap, 75);
         assert_eq!(
             settings.experimental.max_local_reflection_probes,
-            crate::reflection_probes::specular::MAX_LOCAL_PROBES
+            crate::render_contract::MAX_LOCAL_REFLECTION_PROBES
         );
         assert!(!settings.experimental.reflection_probe_sh2_enabled);
     }
@@ -123,7 +123,7 @@ mod tests {
         assert!(text.contains("[experimental]"), "got:\n{text}");
         assert_eq!(
             decoded.experimental.max_local_reflection_probes,
-            crate::reflection_probes::specular::MAX_LOCAL_PROBES
+            crate::render_contract::MAX_LOCAL_REFLECTION_PROBES
         );
         assert!(!decoded.experimental.reflection_probe_sh2_enabled);
     }

crates/renderide/src/config/types/experimental.rs

@@ -2,7 +2,7 @@
 
 use serde::{Deserialize, Serialize};
 
-use crate::reflection_probes::specular::MAX_LOCAL_PROBES;
+use crate::render_contract::MAX_LOCAL_REFLECTION_PROBES;
 
 /// Feature flags for renderer behavior that is still experimental.
 #[derive(Clone, Copy, Debug, PartialEq, Eq, Serialize, Deserialize)]
@@ -19,7 +19,7 @@ pub struct ExperimentalSettings {
 impl Default for ExperimentalSettings {
     fn default() -> Self {
         Self {
-            max_local_reflection_probes: MAX_LOCAL_PROBES,
+            max_local_reflection_probes: MAX_LOCAL_REFLECTION_PROBES,
             reflection_probe_sh2_enabled: false,
             material_shader_hot_reload_enabled: false,
         }
@@ -30,7 +30,8 @@ impl ExperimentalSettings {
     /// Returns the local reflection-probe count clamped to the fixed per-draw packing capacity.
     #[must_use]
     pub fn effective_max_local_reflection_probes(self) -> usize {
-        self.max_local_reflection_probes.min(MAX_LOCAL_PROBES)
+        self.max_local_reflection_probes
+            .min(MAX_LOCAL_REFLECTION_PROBES)
     }
 }
 
@@ -42,23 +43,26 @@ mod tests {
     fn default_local_reflection_probe_limit_matches_packed_capacity() {
         let settings = ExperimentalSettings::default();
 
-        assert_eq!(settings.max_local_reflection_probes, MAX_LOCAL_PROBES);
+        assert_eq!(
+            settings.max_local_reflection_probes,
+            MAX_LOCAL_REFLECTION_PROBES
+        );
         assert_eq!(
             settings.effective_max_local_reflection_probes(),
-            MAX_LOCAL_PROBES
+            MAX_LOCAL_REFLECTION_PROBES
         );
     }
 
     #[test]
     fn effective_local_reflection_probe_limit_clamps_to_packed_capacity() {
         let settings = ExperimentalSettings {
-            max_local_reflection_probes: MAX_LOCAL_PROBES + 10,
+            max_local_reflection_probes: MAX_LOCAL_REFLECTION_PROBES + 10,
             ..Default::default()
         };
 
         assert_eq!(
             settings.effective_max_local_reflection_probes(),
-            MAX_LOCAL_PROBES
+            MAX_LOCAL_REFLECTION_PROBES
         );
     }
 }

crates/renderide/src/diagnostics/hud/windows/renderer_config/experimental.rs

@@ -1,7 +1,7 @@
 //! Experimental renderer-config HUD controls.
 
 use crate::config::RendererSettings;
-use crate::reflection_probes::specular::MAX_LOCAL_PROBES;
+use crate::render_contract::MAX_LOCAL_REFLECTION_PROBES;
 
 use super::controls::drag_u32_slider_setting;
 
@@ -15,7 +15,7 @@ pub(super) fn experimental_section(ui: &imgui::Ui, g: &mut RendererSettings, dir
         "Maximum number of local reflection probes per mesh",
         &mut mrp,
         0,
-        MAX_LOCAL_PROBES as u32,
+        MAX_LOCAL_REFLECTION_PROBES as u32,
     ) {
         g.experimental.max_local_reflection_probes = mrp as usize;
         *dirty = true;

crates/renderide/src/reflection_probes/specular.rs

@@ -12,7 +12,6 @@ pub(crate) use captures::{
     RuntimeReflectionProbeCaptureStore,
 };
 pub(crate) use resources::ReflectionProbeSpecularResources;
-pub(crate) use selection::MAX_LOCAL_PROBES;
 pub use selection::{ReflectionProbeDrawSelection, ReflectionProbeFrameSelection};
 pub(crate) use system::ReflectionProbeSpecularMaintainParams;
 pub use system::ReflectionProbeSpecularSystem;

crates/renderide/src/reflection_probes/specular/selection.rs

@@ -5,13 +5,14 @@ use rayon::prelude::*;
 use crate::cpu_parallelism::{
     admit_coarse_space_items, current_reference_worker_count, record_parallel_admission,
 };
+use crate::render_contract::MAX_LOCAL_REFLECTION_PROBES;
 use crate::scene::RenderSpaceId;
 
 /// Maximum number of probes in one BVH leaf.
 const BVH_LEAF_SIZE: usize = 8;
 const MIN_BLEND_DISTANCE: f32 = 1e-6;
 /// Maximum number of local reflection probes packed into one draw.
-pub const MAX_LOCAL_PROBES: usize = 4;
+pub const MAX_LOCAL_PROBES: usize = MAX_LOCAL_REFLECTION_PROBES;
 const CONTAINMENT_EPSILON: f32 = 1e-5;
 
 /// Clamps user configuration to the fixed per-draw packing capacity.

crates/renderide/src/render_contract.rs

@@ -22,6 +22,9 @@ pub const BLENDSHAPE_PACKED_VECTOR_SPARSE_ENTRY_WORDS: u32 = 3;
 /// Minimum storage buffer size used when a mesh has blendshapes but zero sparse bytes.
 pub const BLENDSHAPE_SPARSE_MIN_BUFFER_BYTES: u64 = 16;
 
+/// Maximum number of local reflection probes packed into one draw.
+pub const MAX_LOCAL_REFLECTION_PROBES: usize = 4;
+
 /// GPU-ready channel-sparse blendshape deltas and CPU scatter ranges.
 pub struct BlendshapeGpuPack {
     /// Tightly packed `u32` words containing position, normal, and tangent sparse sections.