Write a shared constant once, and stop a scroll placing its own content
Two findings from a sweep over the WGSL prelude and the position widgets, scoped against upstream/main atca2b4b2. `module_source` already builds each shader's preamble from iris_core's own constants, so the move-chain work's second copy of `MOVE_NONE` and `CHAIN_LIMIT` -- under "keep in step with iris_core::CHAIN_LIMIT" -- asked a reader by hand for what the mechanism beside it exists to do. Both are injected now, with `MASK_NONE` beside them replacing a bare literal, and the shader declares none of them. `Scroll`'s `content_len` is never less than its box, so `slack` and the `anchor` computed from it were always zero whatever the alignment: the framework centres short content by placing the answer in the whole box, and the comment credited arithmetic that could not have done it. The same belief guarded the fits-in-the-box contract with `align == NEG`, so at the default alignment -- the middle -- every box change redrew the scroll, measured as 1 widget against 0 at TOP_LEFT. `align` now has no reader at all. `UiSpan::translated` and `UiRegion::translated` are reachable only from each other and from nothing else. Format, clippy with and without layout-diagnostics, and the 131-test suite are clean. The cold dump over 400 depth-5 trees is byte-identical to1096c31, and all three seed scans pass: 400 at depth 5 in 69.07s, 1,000 at depth 6 in 169.29s, 2,000 at depth 4 in 300.75s. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
This commit is contained in:
1 parent
1096c3167a
commit
b7b8d09e40
8 files changed
+63
-64
No files matched your search
@@ -26,9 +26,11 @@ struct MoveOffset {
|
||||
parent: u32,
|
||||
}
|
||||
|
||||
// `PX_STEP` and `REL_STEP` are prepended from `iris_core`'s own constants:
|
||||
// what it stores is a whole count of each, both powers of two, so decoding
|
||||
// is exact and the number here is the number the CPU decided.
|
||||
// `PX_STEP`, `REL_STEP`, `MASK_NONE`, `MOVE_NONE` and `CHAIN_LIMIT` are
|
||||
// prepended from `iris_core`'s own constants, so none of them is written
|
||||
// twice. What the CPU stores is a whole count of each step, and both steps
|
||||
// are powers of two, so decoding is exact and the number here is the number
|
||||
// the CPU decided.
|
||||
|
||||
// Every coordinate the CPU decided is a whole count of `PX_STEP`, so one that
|
||||
// composes to within half a step of a pixel boundary is on that boundary and
|
||||
@@ -70,12 +72,6 @@ struct Region {
|
||||
y: UiSpan,
|
||||
}
|
||||
|
||||
const MOVE_NONE: u32 = 4294967295u;
|
||||
// Keep in step with `iris_core::CHAIN_LIMIT`. It bounds a malformed cycle
|
||||
// rather than any real tree, and the CPU walk uses the same number so both
|
||||
// resolve a deep one the same way.
|
||||
const CHAIN_LIMIT: u32 = 64u;
|
||||
|
||||
// The same expression `Len::within` uses, in floats rather than on the
|
||||
// CPU's grid: a move is resolved here so that scrolling a subtree writes one
|
||||
// entry instead of walking it. What has to hold is that this agrees with
|
||||
@@ -171,7 +167,7 @@ fn vs_main(
|
||||
}
|
||||
|
||||
fn masked(in: VertexOutput, color: vec4<f32>) -> vec4<f32> {
|
||||
if in.mask_idx == 4294967295u {
|
||||
if in.mask_idx == MASK_NONE {
|
||||
return color;
|
||||
}
|
||||
let mask = masks[in.mask_idx];
|
||||
|
||||
Reference in new issue
Block a user