Skip to content

Commit da529ff

Browse files
Ignore PipelineCache ambiguities (#14772)
# Objective The `prepare_view_upscaling_pipelines` system has dozens of ambiguities, which makes it harder to spot and prevent new ambiguities. Closes #14770. ## Solution Just exclude the system from ambiguity detection. See the linked issue for more context on why this resolution was chosen. ## Testing Running the `ambiguity_detection` example now reports dozens fewer `Render` app ambiguities.
1 parent bc445bb commit da529ff

File tree

1 file changed

+8
-1
lines changed
  • crates/bevy_core_pipeline/src/upscaling

1 file changed

+8
-1
lines changed

crates/bevy_core_pipeline/src/upscaling/mod.rs

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,14 @@ impl Plugin for UpscalingPlugin {
1717
if let Some(render_app) = app.get_sub_app_mut(RenderApp) {
1818
render_app.add_systems(
1919
Render,
20-
prepare_view_upscaling_pipelines.in_set(RenderSet::Prepare),
20+
// This system should probably technically be run *after* all of the other systems
21+
// that might modify `PipelineCache` via interior mutability, but for now,
22+
// we've chosen to simply ignore the ambiguities out of a desire for a better refactor
23+
// and aversion to extensive and intrusive system ordering.
24+
// See https://github.com/bevyengine/bevy/issues/14770 for more context.
25+
prepare_view_upscaling_pipelines
26+
.in_set(RenderSet::Prepare)
27+
.ambiguous_with_all(),
2128
);
2229
}
2330
}

0 commit comments

Comments
 (0)