fix(render): S4 chunk 1 round 2 (LAST) - honest PM/PC gate, seeded portalsDrawnCount, the SOME-vs-SAME-plane pin, sixth pose, comment truth
Round 1 (2bd353234) was three-lens reviewed: retail-faithful PASS,
production PASS, gate-honesty FAIL. Every finding landed on the
terrace-edge KnownFailure row plus one pin gap. This is the last round.
R2-1 - gate honesty. WalkTraceConformanceTests.AlphaDepthTranscript.cs's
own KnownFailure doc comment claimed "the PC sequence matches exactly";
it never did - Assert.Equal(expected.PmEvents, actualPm) threw first, so
the PC Assert.Equal line never ran. RunAlphaDepthTranscriptGate now
computes BOTH diffs (SequenceEqual, not Assert.Equal) before asserting
either, and Assert.Fail's message prints both sequences together
whenever either diverges - a written claim about one sequence is now
only ever one this method actually evaluated. Re-running the OLD
(unseeded, cold PortalsDrawnCount=0) code path through this new combined
assertion shows terrace-edge's real divergence was WORSE than round 1
believed: both PM and PC diverged (PC expected counter=2, actual
counter=0) - round 1's "PC matches" claim was not just untested, it was
false.
R2-2 - the harness fix. Retail's portalsDrawnCount (wo(008719b4)) is a
PERSISTENT session global; each capture's own FIRST PM or PC line
(cathedral-arrival 0, cathedral-leak 0, foundry-deep 1,
holtburg-doorway-still 2, terrace-edge 2, cathedral-stair-arch 8) already
carries the pre-capture value - terrace-edge's own sample sits in the
"F 1" preamble text a cdb session prints before the first parsed frame
marker (line 1209, ahead of "F 1" at line 1298), so no amount of
replaying the CAPTURED frames from a cold start can ever reach it (this
fixture's own turns never touch the counter - every PC line reads
ov=0). New WalkAlphaDepthTrace.LoadInitialCounter(root, fixtureName)
scans a fixture's raw lines, ignoring frame boundaries, for the first
PM/PC match and returns its counter. RunAlphaDepthTranscriptGate seeds
WalkFrameDriver.PortalsDrawnCount (already an internal, test-assembly-
settable field) from this value, runs ONE Collect+Replay pass, and
deletes the two-pass "priming" replay outright. Result: terrace-edge
turns GREEN with no KnownFailure tag; every other pose stays exact
(a fixture with real steady-state seal activity computes the identical
value a priming pass used to converge to, since a steady state is by
definition unchanged by one more pass). No pose diverges after seeding,
so the packet's "write the divergence into section 9" fallback never
triggers - nothing needed there this round.
R2-3 - the SOME-vs-SAME-plane discriminator. T2's existing five cases
never separated retail's real quantifier ("every vertex lies on the SAME
one of the four +/-12 planes") from a weaker "every vertex lies on SOME
plane" (per-vertex OR across the four planes, ANDed across vertices) -
the existing split-plane case's third vertex sits on NO plane at all, so
both readings admit it for the same reason. New case in
WalkVisibilityMathTests.cs
(Boundary_guard_admits_a_polygon_whose_every_vertex_is_on_SOME_plane_but_not_the_SAME_one)
and a fourth sink.OnPunchGeometry call in WalkFrameDriverTests.cs's
OnPunchGeometry_RejectsOnlyWhenEveryVertexSharesOnePlane_ButPunchesAnyOtherShape
pin close the gap: [(12,0,3),(0,12,3),(12,5,3)] - every vertex touches
SOME plane (vertex1/3 on x=+12, vertex2 on y=+12) but no SINGLE plane
holds all three (x=+12 cleared by vertex2's x=0, y=+12 cleared by
vertex1's y=0) - retail's real four-accumulator guard admits it; the
weaker per-vertex-OR form rejects it.
R2-4 - the sixth pose. Cherry-picked 4f12cd06b (walk+alphadepth capture)
and 3a6aa7eef (pmverts capture) from claude/campaign-w-retail-frame-walk
onto 2bd353234 - both applied clean, no conflicts (README.md merged
without a manual row). New
AlphaDepthTranscript_CathedralStairArch_MatchesRetailFrame2 Fact: root
0xF4180114, seven outside views, sixteen mode=1 building punches (all
counterBefore=0008 - far-Z punches never touch the counter) of which
twelve are guard-rejected on local y=12.000, then eight mode=0 exit
seals with counterBefore running 0..7 against the root's own ov=7
read-then-zero, settling this fixture's own steady-state counter at 8 -
exactly the value LoadInitialCounter reads back out of its own preamble.
PASS.
R2-5 - comment truth. (a) RetailPViewPassExecutor.cs:
DrawPortalDepthWrite's and DrawExitPortalMask's summaries corrected -
neither the retired ">=3 vertices" pre-filter nor "always matches what
reached the GPU" describe F2's actual count-before-clip behavior any
more. (b) The F2 pin's doc comment
(RetailPViewPassExecutorTests.DrawExitPortalMask_CountsAnUnclippableTwoVertexPolygon_ButDrawsNothing)
named TWO alternative mutations as if both failed; verified only one
does (see mutations below) - the doc comment now says so explicitly and
keeps only the pre-filter mutation. (c) WalkVisibilityMath.cs's doc
comment stated DAT-scan figures as bare facts; independently re-verified
this round with a freshly-written scan (own code, walking the same
production EnvCell.CellPortals/CellStruct.Polygons shape
WalkCellFactory itself uses, over the full 0x0000-0xFFFF landblock-prefix
range) - every cited figure reproduced bit-exact (3,405 landblocks with
cells; 1,854,237 portal polygons; 2,889 any-vertex; 2,163 all-on-plane,
all exit, 0 interior; 16,939 exit portals total, 1,837,298 interior) -
so the doc comment now states the counting rule (id range, what's
counted, how unresolvable polygons/cells are skipped) alongside every
figure instead of leaving them unqualified; landblocksWithCells=3,405
also independently matches CellStructSurfaceConstructionInstalledDatTests'
own OH2 walk of the identical range (that test's own golden-count
comment). The scratch scan itself is not part of this diff (deleted
after use, same as F1's own datScan). (d) This commit body does not
cite "register tests" as evidence - no test reads the register.
Register truth is the human read: no row changes, AD-119 (the C2
blend-vs-write-mask row) unchanged.
Mutations run this round (all verified against production code, then
reverted):
- R2-1/R2-2 (disable seeding, driver.PortalsDrawnCount = 0 instead of
initialCounter): AlphaDepthTranscript_TerraceEdge_MatchesRetailFrame2
fails - "terrace-edge.alphadepth: PM DIVERGES - expected
[(mode=1,counterBefore=2), (mode=1,counterBefore=2)], actual
[(mode=1,counterBefore=0), (mode=1,counterBefore=0)]; PC DIVERGES -
expected [(ov=0,counter=2,fc=0), (ov=0,counter=2,fc=0)], actual
[(ov=0,counter=0,fc=0), (ov=0,counter=0,fc=0)]" - proving both the
seeding fix (R2-2) and the honest dual-sequence message (R2-1) at
once.
- R2-3 (replace the four per-plane accumulators with a single
per-vertex "on ANY plane" test ANDed across vertices):
Boundary_guard_admits_a_polygon_whose_every_vertex_is_on_SOME_plane_but_not_the_SAME_one
fails, Assert.False() Expected:False Actual:True;
OnPunchGeometry_RejectsOnlyWhenEveryVertexSharesOnePlane_ButPunchesAnyOtherShape
fails, Assert.Equal() Expected:3 Actual:2.
- R2-5b, mutation ONE (restore the old `localVertices.Length < 3`
pre-filter ahead of the guard):
DrawExitPortalMask_CountsAnUnclippableTwoVertexPolygon_ButDrawsNothing
fails, Assert.Equal() Expected:1 Actual:0 - kept as the pin's cited
mutation.
- R2-5b, mutation TWO (move `submitted++` to AFTER
`_portalDepthMask.DrawDepthFan(...)` instead of before): same test
STILL PASSES - DrawDepthFan has no effect on the local `submitted`
counter, so the final returned value is identical regardless of
which side of that call the increment sits on. Confirmed unobservable
exactly as R2-5b required; the doc comment no longer names this as a
failing mutation.
Gates: dotnet build tests/AcDream.App.Tests -c Release -> 0 warnings/0
errors. dotnet build src/AcDream.App -c Release -> 0 warnings/0 errors.
Hermetic lane (Lane!=InstalledDat&Lane!=PreparedPackage&Lane!=Live&
Lane!=Manual&Lane!=Timing&Lane!=Windows&Lane!=Linux&Lane!=SystemFont&
Purpose!=Diagnostic&Status!=KnownFailure): 6830/6830 passed (+1 over
round 1's 6829, the new T2 case). InstalledDat lane
(ACDREAM_RUN_INSTALLED_DAT_TESTS=1, --filter Lane=InstalledDat): 254
total (+1 over round 1's 253, the new sixth Fact), 249 passed, 4 failed -
exactly the pre-existing four (LayoutImporterMediaBearingChildSweepTests
and LayoutImporterInvisibleSweepTests, both #383;
TowerAscentReplayTests' KnownFailure; Oh_doorway_still_first_frame_diff,
#458) plus the pre-existing WalkLookInGateSweepTests skip - terrace-edge
no longer fails, no new divergence anywhere else. All six
AlphaDepthTranscript_*_MatchesRetailFrame2 Facts: 6/6 passed standalone.
Shader classes (VulkanShaderDescriptorContractTests +
VulkanShaderManifestTests + RenderPackSpirvValidatorTests +
SkyVertexLayoutTests): 35/35. RetailPViewPassExecutorTests +
WalkFrameDriverTests (full classes, regression check on the R2-3/R2-5b
edits): 57/57.
Commits: two cherry-picks (4f12cd06b, 3a6aa7eef) from
claude/campaign-w-retail-frame-walk, both clean, plus this one fix
commit on top of 2bd353234.
Register: no new AD row; AD-119 unchanged (human read, not a test -
see R2-5d above).
Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
This commit is contained in:
Erik
parent
5de42a12f3
commit
323f5a334d
7 changed files with 246 additions and 91 deletions
|
|
@ -286,10 +286,16 @@ public RetailPViewPassExecutor(
|
|||
_surface.ClearInteriorDepth();
|
||||
}
|
||||
|
||||
/// <summary>Returns the number of exit-seal fan polygons actually
|
||||
/// submitted (S3 §8.2 B2) — the SAME enumeration that draws them, so the
|
||||
/// caller's persistent seal counter always matches what reached the GPU
|
||||
/// this turn.</summary>
|
||||
/// <summary>Returns the number of exit-seal fans ATTEMPTED this turn —
|
||||
/// S4-c1 fix round 1 F2 corrected this from "matches what reached the
|
||||
/// GPU": retail increments <c>portalsDrawnCount</c> BEFORE
|
||||
/// <c>polyClipFinish</c> runs (0x59BD70-0x59BD74 precedes 0x59BDB0), so
|
||||
/// the counter records guard-passing ATTEMPTS, not successful GPU fans.
|
||||
/// A portal whose polygon has fewer than 3 vertices is counted here even
|
||||
/// though the GPU renderer's own internal <c><3</c> guard
|
||||
/// (<c>DrawDepthFan</c>) draws nothing for it
|
||||
/// (RetailPViewPassExecutorTests.DrawExitPortalMask_CountsAnUnclippableTwoVertexPolygon_ButDrawsNothing
|
||||
/// pins exactly this).</summary>
|
||||
public int DrawExitPortalMask(
|
||||
RetailPViewFrameInput frame,
|
||||
uint cellId,
|
||||
|
|
@ -366,10 +372,16 @@ public RetailPViewPassExecutor(
|
|||
/// <summary>Retail <c>D3DPolyRender::DrawPortalPolyInternal</c>
|
||||
/// @0x0059BC90. Main interior roots stamp true depth (seal); outdoor and
|
||||
/// look-in apertures stamp far depth (punch). The renderer owns that
|
||||
/// choice. Returns the number of portals actually submitted — S3 §8.2 B2:
|
||||
/// each portal with <c>OtherCellId == 0xFFFF</c> and >=3 vertices —
|
||||
/// the same enumeration <c>WalkFrameDriver.OnInteriorFloodDrawTurn</c>
|
||||
/// counts through <c>DrawExitSeals</c>'s return value.</summary>
|
||||
/// choice. Returns the number of portals ATTEMPTED (not necessarily
|
||||
/// drawn) this turn — S4-c1 fix round 1 F2 retired the ">=3 vertices"
|
||||
/// pre-filter that used to gate the count: every portal with
|
||||
/// <c>OtherCellId == 0xFFFF</c> that survives the ±12 boundary guard
|
||||
/// (<see cref="WalkVisibilityMath.IsRejectedByPortalPolygonBoundaryGuard"/>)
|
||||
/// is counted here, BEFORE the vertex-count check that decides whether
|
||||
/// its fan actually draws — matching retail's own count-BEFORE-clip
|
||||
/// order (0x59BD70-0x59BD74 precedes 0x59BDB0). This is the same
|
||||
/// enumeration <c>WalkFrameDriver.OnInteriorFloodDrawTurn</c> counts
|
||||
/// through <c>DrawExitSeals</c>'s return value.</summary>
|
||||
private int DrawPortalDepthWrite(
|
||||
uint cellId,
|
||||
ReadOnlySpan<Vector4> clipPlanes,
|
||||
|
|
|
|||
|
|
@ -222,13 +222,32 @@ public static class WalkVisibilityMath
|
|||
/// <c>xformStart</c>, the world transform — against exactly <c>+12</c>
|
||||
/// and <c>-12</c>. Retail's order is reject → transform → clip → count
|
||||
/// (no transform, no clip, no <c>portalsDrawnCount</c> increment on a
|
||||
/// reject). A scan of the installed cell DAT (full 0x0000-0xFFFF
|
||||
/// landblock-prefix walk, 3,405 landblocks with cells, 1,854,237 portal
|
||||
/// polygons; S4-c1 fix round 1 F1) found 2,889 polygons with at least
|
||||
/// one vertex on a +/-12 plane and 2,163 polygons with EVERY vertex on
|
||||
/// the SAME plane — all 2,163 are EXIT portals (<c>OtherCellId ==
|
||||
/// 0xFFFF</c>; 0 interior portals qualify), out of 16,939 exit portals
|
||||
/// total. This guard therefore rejects real content: retail never
|
||||
/// reject).</para>
|
||||
///
|
||||
/// <para><b>DAT-scan figures (S4-c1 fix round 1 F1, independently
|
||||
/// re-verified at fix round 2 R2-5c with a second, separately-written
|
||||
/// scan over the SAME production <c>EnvCell.CellPortals</c> /
|
||||
/// <c>CellStruct.Polygons</c> shape <see cref="AcDream.App.Rendering.Walk.WalkCellFactory"/>
|
||||
/// itself walks — both scans agree on every figure below bit-for-bit).
|
||||
/// Id range: the full <c>0x0000</c>-<c>0xFFFF</c> landblock-prefix
|
||||
/// space, each landblock's cells enumerated <c>0x0100</c> through
|
||||
/// <c>0x0100 + LandBlockInfo.NumCells - 1</c> (the same range
|
||||
/// <c>CellStructSurfaceConstructionInstalledDatTests</c>' own
|
||||
/// independent OH2 walk uses — its pinned
|
||||
/// <c>landblocksWithCells=3,405</c> diagnostic already agrees). What is
|
||||
/// counted: one entry per <c>CellPortal</c> whose <c>PolygonId</c>
|
||||
/// resolves in its cell's <c>CellStruct.Polygons</c> AND has >=3
|
||||
/// vertex ids that all resolve in <c>CellStruct.VertexArray</c> — an
|
||||
/// unresolvable <c>PolygonId</c>, a <3-vertex polygon, or a cell
|
||||
/// whose own <c>EnvironmentId</c>/<c>CellStructure</c> does not resolve
|
||||
/// is skipped ENTIRELY (not counted toward the total or either plane
|
||||
/// tally, matching this method's own live callers, which never see such
|
||||
/// a polygon in the first place). Under that rule: 3,405 landblocks with
|
||||
/// cells, 1,854,237 portal polygons; 2,889 with at least one vertex on a
|
||||
/// +/-12 plane, 2,163 with EVERY vertex on the SAME plane — all 2,163
|
||||
/// are EXIT portals (<c>OtherCellId == 0xFFFF</c>; 0 interior portals
|
||||
/// qualify), out of 16,939 exit portals total (1,837,298 interior
|
||||
/// portals). This guard therefore rejects real content: retail never
|
||||
/// punches or seals those 2,163 exit portals, which is very likely the
|
||||
/// "never-drawn portal polygon = panel" mechanism the PV campaign named
|
||||
/// (#456).</para>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue