fork/Graphite
1
0
Fork 0
mirror of https://github.com/GraphiteEditor/Graphite.git synced 2026-10-07 03:08:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

Lift shallower sources in the layout union

Browse Source
This commit is contained in:
Dennis Kobert
2026-08-22 16:22:54 +00:00
parent 4bceae26f2
commit 77b0be5c15
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
node-graph/libraries/core-types/src/record.rs
+4 -2
View File
@@ -252,10 +252,12 @@ impl Layout {
/// The union of several layouts over the same element and depth. /// The union of several layouts over the same element and depth.
pub fn union(layouts: &[&Layout]) -> Layout { pub fn union(layouts: &[&Layout]) -> Layout {
let first = layouts.first().expect("a union needs at least one layout"); let first = layouts.first().expect("a union needs at least one layout");
let mut union = Layout::default().with_writes(first.depth, first.element, &[]); // A shallower source joins the union lifted: a scalar concatenates as
// one lane, its fields sitting at the innermost level like any lane's.
let depth = layouts.iter().map(|layout| layout.depth).max().unwrap_or(first.depth);
let mut union = Layout::default().with_writes(depth, first.element, &[]);
for layout in layouts { for layout in layouts {
assert_eq!(union.element, layout.element, "union layouts must share the element"); assert_eq!(union.element, layout.element, "union layouts must share the element");
assert_eq!(union.depth, layout.depth, "union layouts must share the depth");
let writes: Vec<FieldWrite> = layout let writes: Vec<FieldWrite> = layout
.fields .fields
.iter() .iter()