fix(render): S4 chunk 2 round 1 - particle throw, detail-off immediate draws, EnvCell FIFO, gate honesty
Fix round 1 of the two the plan allows for S4-c2 (048d5b12f), addressing every item M1-M8/A1-A8 from the campaign branch's packet section 11. M1 (BLOCKING): ParticleRenderer.DeferToRetailAlphaQueue threw whenever a mesh-particle batch's TranslucencyKind.Opaque classification (mask 0x00) reached a non-Append DrawMesh row - a real, reachable outcome since TryAppendMeshDraws applies no IsOpaque-style pre-filter unlike WbDrawDispatcher's path. Deleted both throws (ParticleRenderer.cs, WbDrawDispatcher.cs SubmitToAlphaQueue), extracted the router-input derivation into internal static ParticleRenderer.RouteParticleSubmission (directly testable), and implemented rows 1/5's immediate draw by reusing the existing per-instance billboard/mesh draw code (new DrawImmediateParticleSubmissionRhi, no new renderer, no sort per A8). materialHasAlpha (row 4) is derived from CMaterial::CheckAlphaValues @0x005396a0 (Ghidra-verified 2026-09-04): has_alpha=0 only when Ambient.a==Diffuse.a==Specular.a==Emissive.a==1.0f, else 1 - and CMaterial::SetTranslucencySimple @0x005396f0 (reached from CPhysicsPart::SetTranslucency <- Particle::Update @0x0051c290's per-frame alpha-fade) sets all four channels to (1f - translucency) uniformly, so has_alpha == "this particle's current alpha isn't 1.0" - already carried in ColorArgb's top byte (Lerp(StartAlpha,EndAlpha,tLife), ParticleSystem.cs 1039-1041/1453). M3: SubmitToAlphaQueue now takes isBuildingShell + viewProjection and feeds Row 1's detailSurfaceActive gate for translucent building-shell instances (retail DrawBuilding @0x0059f2a0 installs building detail before its own shell subsets reach DrawMesh). Row 1 (detail on) draws the instance immediately at its own walk-stream AlphaSubmitMark via new DrawImmediateAlphaInstance/DrawImmediateAlphaInstanceRhi (reusing WriteDeferredAlphaEntrySlot + the drain's pipeline/detail code for slot 0); never touches _deferredAlpha/the queue for pure-Immediate submissions (fixes a latent leak: previously reserving a _deferredAlpha slot for every candidate meant a frame with ALL-immediate content never registered a source, so ResetAlphaSubmissions never ran). M3c: DrawPreparedAlphaBatchRhi's own per-command hasDetail/DrawBuildingDetailRangeRhi branch is deleted - detail-eligible content no longer reaches the drain (spec: delayed replay is always detailEnabled=0). New AD-120 register row for the "in place -> at the entity's own stream mark" granularity adaptation this introduces. M6: RetailPViewPassExecutor.SubmitOrDrawTransparentCellShell routes an EnvCell's transparent shell through the SAME RetailAlphaMeshRouter table (mask 0x02, detailSurfaceActive = EnvCellRenderer.TransparentDetailEnabled) instead of a hand-coded branch. Detail on: unchanged immediate draw. Detail off: appends ONE token per CELL via new EnvCellAlphaDrawSource (internal, delegate-based so it's unit-testable without a GPU harness), replayed through EnvCellRenderer.RenderTransparentOrdered at the next flush - RenderTransparentOrdered already replayed a cell's batch on demand, so no new deferred-replay abstraction was needed (the original landing's claim that one was required is corrected in the packet). M4: RetailAlphaEntry.IsFirstForList deleted. Retail's per-DrawMesh- invocation "first for this list" flag is trivially true for every subset retail ever appends (DrawMesh @0x0059d4a0 sets both flags true at entry, 0059d4cc/0059d4d0, clearing each independently after ITS OWN first append within that call, 0059d5ef) - the captures confirm it (new=1 on 9,685/10,556 AM lines, impossible under "first since last drain"). acdream's deleted isFirstForList = target.Count == 0 computed the wrong quantifier. One acdream append already IS one DrawMesh call, so the field carried no information and its own pin was vacuous (feedback_every_new_pin_must_be_ shown_to_fail) - deleted rather than kept as an always-true no-op. M5: split all six AlphaFlushTranscript_* KnownFailure Facts into live AlphaFlushSites_* (site+threshold sequence only, content-independent, unconditional pass) and AlphaFlushCounts_* (KnownFailure, full tuple incl. drained counts) sharing one RunAlphaFlushTranscriptReplay helper. Rewrote the KnownFailure reason honestly: THREE independent causes, not "harness content only" - (1) zero live mesh content, (2) acdream appends one entry per INSTANCE vs retail's one per SUBSET per DrawMesh call, (3) acdream's CLIP list is structurally empty for ordinary content (M2). Added ONE live valve pin (WalkFrameDriverTests.SortCellExit_ValveDrainsThroughReplayAtThe ExactBoundary, a Theory over 2250/2249) that goes through WalkFrameDriver. Replay's own SortCellExit arm, not RetailAlphaQueue.Flush called directly. M2/A2/M8c (register): ~~AP-34~~ restored as struck-through RETIRED (it had been deleted outright, not struck, breaking the register's own convention) citing residuals AP-238/AP-239/AP-240. The chunk-2 commit's "AP-236"/ "AP-237" collided with an id ALREADY filed-and-retired on main by an unrelated #132 fix (docs/ISSUES.md:19976) - ids are never reused, so both are renumbered: AP-236->AP-238 (EnvCell; rewritten per M6 - granularity-only residual now, "never through the shared queue" is retired), AP-237->AP-239 (mask-reconstruction gap; the dangling "AP-236b" citation in RetailAlphaMeshRouter.cs never matched either filed id and is corrected to AP-239). New AP-240 filed for M2: WbDrawDispatcher.IsOpaque filters ClipMap out upstream, so ordinary clip-mapped content never reaches retail's CLIP FIFO (draws immediately on the pre-existing OpaqueAlphaToCoverage pipeline instead) - no pipeline change this round, per the contract. AP section header recounted honestly: 159 active (was stale at 161); AD section 92 (was 91, +AD-120). M7: AP-239's only cited example (cloud GfxObj 0x01004C35, surface 0x08000023) is DISPROVEN - decoded Type=0x10114 has alpha-family bits that win in BOTH retail's real priority and acdream's reconstruction, so it never actually diverges. A 2026-09-04 scan of all 6,152 Portal-dat Surfaces found 27 real Translucent+Base1ClipMap-no-alpha-family instances (Type=0x14); cross-referencing GfxObjs found surface 0x08000015 on GfxObj 0x010001EC - cited in place of the disproven cloud example. M8: (a) RenderDeviceD3D::DrawBlock is @0x005a17c0 per symbols.json, not @0x005a18d0 (that is its per-land-cell loop head) - fixed across RetailAlphaQueue.cs, RetailPViewPassExecutor.cs, WalkEvents.cs, WalkFrameDriver.cs (x3), RetailFrameWalk.cs. (b) RetailAlphaQueue.cs's four FlushAlphaList addresses were labelled "return site" but are the CALL instruction's own address (x86 CALL rel32 is 5 bytes) - relabelled "call at X (returns to X+5)". (d) worldbuilder-inventory.md:420's AP-34 citation updated. A1: RetailPViewRenderer.cs's outdoor-root passes.FlushLandscapeAlpha() call (labelled LandscapeFlush) is deleted - retail's real LandscapeFlush (PView::DrawCells @0x005a4840's own FlushAlphaList(0f) @0x005a4872) sits strictly inside if (outside_view.view_count > 0) on the INTERIOR PView; an outdoor root never reaches it (terrace-edge capture: zero 005a4877 FL lines). Verified no opaque draw intervenes between this deletion point and RetailAlphaQueue.EndFrame()'s own RenderNormalMode pass-end flush (WorldSceneRenderer.cs: DrawPostWorldParticles's PView branch is an explicit no-op; only diagnostic wireframes follow) - #132's "drain after the finished opaque world" invariant is kept by that flush alone. A4: RetailAlphaQueue's ApplyScratchRetention call sites passed the ENTRY count as the SOURCE-count argument too (observedClip + observedAlpha twice), so _sources/_sourceDrawOffsets never shrank toward the real source count. Fixed to capture _sources.Count before Clear(). A5/A6/A7: WalkStaticStreamPopulatorTests.cs's stale "same viewer distance" banner corrected; two off-by-one entry counts in the packet's section 10 sequences corrected (foundry-deep x10->x11, holtburg-doorway-still x5->x6); WalkAlphaDepthTrace.cs's "new=" comment explains why IsNew is retained but never compared (M4's finding makes a per-subset comparison meaningless at acdream's per-instance granularity); RetailAlphaMeshRouterTests.cs's IndependentReferenceRoute (never actually independently-shaped) renamed to RestatedBranchTableRoute with an honest doc comment, and the unverified "flipped in turn and failed every time" claim deleted. A3 was resolved as a side effect of M1's SubmitToAlphaQueue doc-comment rewrite (the wrong "0x02/0x03, 0x04/0x05, 0x08/0x09" enumeration no longer exists); RetailAlphaMeshRouter.cs's own MaskFromTranslucencyKind comment updated in the same spirit (M1's particle-site Opaque-reachability finding). Mutation checks (each applied to a scratch-restored copy, confirmed failing, then byte-exact reverted - diffed against a /tmp backup after restore): - A1 (RetailPViewRendererTests.DrawInside_NeverCallsFlushLandscapeAlphaDirectly): restoring the deleted "if (ctx.RootCell.IsOutdoorNode) passes.FlushLandscapeAlpha();" line reintroduces a direct RetailPViewPassExecutor.FlushLandscapeAlpha call in DrawInside's compiled body. Actual failure: "Assert.DoesNotContain() Failure: Filter matched in collection ... CompiledCall { ... Target = Void FlushLandscapeAlpha() }". - A4 (RetailAlphaQueueTests.RetainedSourceCapacity_ConvergesToTheReal SourceCountNotTheEntryCount): reverting both ApplyScratchRetention calls to (observedClip + observedAlpha, observedClip + observedAlpha) - with 100 distinct sources in the spike frame (so _sources.Capacity grows to 128, past its initial 4) followed by three low-demand frames of 10 entries via ONE repeated source - makes sourceTarget compute from 10 (Math.Max(4,10*2)=20) instead of 1 (Math.Max(4,1*2)=4). Actual failure: "Expected the retained source-array capacity to converge toward the real source count (1), but it stayed at 20". (A single-source-only spike does NOT discriminate this bug - Math.Min(sourceTarget, _sources.Capacity) clamps both formulas to the same unchanged initial 4 - hence the 100-source setup.) - M5 valve (WalkFrameDriverTests.SortCellExit_ValveDrainsThroughReplayAt TheExactBoundary, 2250 case): flipping RetailAlphaQueue.Flush's no-op comparison from "<" to "<=" (S4-c1/c2's own boundary mutation) makes the 2250-entries case a no-op instead of draining. Actual failure: "Assert.Equal() Failure: Values differ Expected: 0 Actual: 2250". - M6 (EnvCellAlphaDrawSourceTests, both Facts): adding an immediate renderTransparentOrdered(new[]{cellId}) call inside EnvCellAlphaDrawSource.AddPendingCellId (simulating the M1/M3 "drew immediately instead of deferring" bug class) makes PendingCellToken_IsDrainedAtTheFlushAndNeverBeforeIt fail with "Assert.Empty() Failure: Collection was not empty Collection: [[4660]]" and ParticleAppendedBetweenTwoCellTokens_KeepsItsPositionInTheCombined Drain fail with 'Expected: string[] ["cell:256", "particle:7", "cell:512"] Actual: List<string> ["cell:256", "cell:512", "cell:256", "particle:7", "cell:512"]'. - M1 (ParticleRendererRouteTests.OpaqueClassifiedMeshBatch_WithMaterialAlpha _RoutesToAlphaAppend): hardcoding materialHasAlpha to false inside RouteParticleSubmission makes the Opaque-mask+has-alpha case route Immediate instead of Append. Actual failure: "Assert.Equal() Failure: Values differ Expected: Append Actual: Immediate". Gates (real output lines): - dotnet build AcDream.slnx -c Release -> "Build succeeded. 0 Warning(s) 0 Error(s)". - Hermetic lane (--filter "Lane!=InstalledDat&Lane!=PreparedPackage& Lane!=Live&Lane!=Manual&Lane!=Timing&Lane!=Windows&Lane!=Linux& Lane!=SystemFont&Purpose!=Diagnostic&Status!=KnownFailure") -> "Passed! - Failed: 0, Passed: 6864, Skipped: 0, Total: 6864". - InstalledDat lane (ACDREAM_RUN_INSTALLED_DAT_TESTS=1, ACDREAM_DAT_DIR="C:/Users/erikn/Documents/Asheron's Call", --filter "Lane=InstalledDat") -> "Failed: 10, Passed: 255, Skipped: 1, Total: 266" - the exact 4 pre-existing failures (TowerAscent_StaircaseStaysConeVisible_EveryStep, LayoutImporterMediaBearingChildSweepTests, LayoutImporterInvisibleSweep Tests, Oh_doorway_still_first_frame_diff) plus the six AlphaFlushCounts_* KnownFailure Facts, nothing else; all six AlphaFlushSites_* Facts pass inside this same lane (the whole WalkTraceConformanceTests partial class carries Lane=InstalledDat, so they cannot run hermetically). - Shader classes (VulkanShaderDescriptorContractTests, VulkanShaderManifestTests, RenderPackSpirvValidatorTests) -> "Passed! - Failed: 0, Passed: 32, Skipped: 0, Total: 32". - RetailAlphaQueueTests, RetailAlphaMeshRouterTests, RetailFrameWalkTests, WalkFrameDriverTests, ParticleRenderer*Tests, EnvCellRenderer*Tests (combined filter) -> "Passed! - Failed: 0, Passed: 120, Skipped: 0, Total: 120". - Register collision grep: AP-238/AP-239/AP-240/AD-120 each count exactly 1; ~~AP-34~~ count exactly 1; live totals AP=159, AD=92. Not done / deferred: none - all M1-M8/A1-A8 items landed; A8 was a no-action note. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
This commit is contained in:
Erik
parent
89f1e2676f
commit
9ccb61a8ec
26 changed files with 1180 additions and 326 deletions
|
|
@ -370,6 +370,56 @@ public sealed unsafe partial class ParticleRenderer
|
|||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// S4-c2 fix round 1 (M1c): <c>DrawMesh</c> rows 1/5's "render
|
||||
/// immediately; enqueue nothing" outcome for ONE particle submission —
|
||||
/// reuses the exact same per-instance billboard/mesh draw code
|
||||
/// <see cref="DrawOrderedRhi"/> uses for its own runs (no new renderer),
|
||||
/// applied to a single-element run so no sort is introduced (A8: retail's
|
||||
/// immediate <c>RenderMeshSubset</c> draws in mesh/submission order —
|
||||
/// this draws exactly this submission, right where <c>DrawMesh</c> was
|
||||
/// called, never re-ordered against its neighbors).
|
||||
/// </summary>
|
||||
private void DrawImmediateParticleSubmissionRhi(
|
||||
Matrix4x4 viewProjection,
|
||||
ParticleSubmissionKind kind,
|
||||
int drawIndex)
|
||||
{
|
||||
IGpuPassEncoder encoder = _scope!.RequireEncoder();
|
||||
IGpuFrame frame = RequireRhiFrame();
|
||||
|
||||
if (kind == ParticleSubmissionKind.Billboard)
|
||||
{
|
||||
ParticleDraw draw = _drawListScratch[drawIndex];
|
||||
_runScratch.Clear();
|
||||
_runScratch.Add(draw.Instance);
|
||||
DrawInstancesRhi(encoder, frame, _runScratch, viewProjection, draw.Key.Additive);
|
||||
return;
|
||||
}
|
||||
|
||||
GlobalMeshBuffer? global = _meshAdapter?.MeshManager?.GlobalBuffer;
|
||||
if (!MeshParticlesAvailable || global is null)
|
||||
return;
|
||||
|
||||
MeshParticleDraw meshDraw = _meshDrawListScratch[drawIndex];
|
||||
if (_meshInstanceScratch.Length < 1)
|
||||
_meshInstanceScratch = new MeshParticleGpuInstance[256];
|
||||
WriteMeshGpuInstance(ref _meshInstanceScratch[0], meshDraw.Instance);
|
||||
GpuRingAllocation instances = WriteVertexRing<MeshParticleGpuInstance>(
|
||||
frame,
|
||||
_meshInstanceScratch.AsSpan(0, 1));
|
||||
DrawMeshBatchRhi(
|
||||
encoder,
|
||||
frame,
|
||||
global,
|
||||
meshDraw.Batch,
|
||||
viewProjection,
|
||||
instances.Buffer,
|
||||
instances.OffsetBytes,
|
||||
instanceCount: 1,
|
||||
firstInstance: 0);
|
||||
}
|
||||
|
||||
private void DrawInstancesRhi(
|
||||
IGpuPassEncoder encoder,
|
||||
IGpuFrame frame,
|
||||
|
|
|
|||
|
|
@ -316,6 +316,64 @@ public sealed unsafe partial class ParticleRenderer : IDisposable
|
|||
DrawOrdered(camera);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// S4-c2 fix round 1 (M1): pure router-input derivation for one particle
|
||||
/// submission, extracted so it is directly unit-testable without a
|
||||
/// GPU/mesh-manager harness. A billboard's blend mode (Additive bool) is
|
||||
/// either the Additive or the plain Alpha surface bit — both live in
|
||||
/// retail's alpha-family union (0x00010300) and construct the SAME queue
|
||||
/// mask (0x02); billboards never carry a ClipMap bit (that is a mesh/
|
||||
/// UV-texture concept a generated particle quad has no equivalent of),
|
||||
/// so they always route to ALPHA. A mesh-particle batch's
|
||||
/// <paramref name="meshTranslucency"/> CAN be <see cref="TranslucencyKind.Opaque"/>
|
||||
/// (mask 0x00) — unlike <c>WbDrawDispatcher</c>'s ordinary translucent-
|
||||
/// GfxObj path, <c>TryAppendMeshDraws</c> appends every batch with
|
||||
/// <c>IndexCount>0</c> regardless of translucency classification, so
|
||||
/// mask 0x00 is a real, reachable input here.
|
||||
///
|
||||
/// <para>M1(b): retail's has_alpha (<c>CMaterial::CheckAlphaValues</c>
|
||||
/// @0x005396a0 — Ghidra-verified 2026-09-04: has_alpha=0 only when
|
||||
/// Ambient.a==Diffuse.a==Specular.a==Emissive.a==1.0f, else has_alpha=1)
|
||||
/// is driven, for a particle, by <c>CMaterial::SetTranslucencySimple</c>
|
||||
/// @0x005396f0 — the only production writer reached from a particle's
|
||||
/// live translucency (<c>CPhysicsPart::SetTranslucency</c> <-
|
||||
/// <c>Particle::Update</c> @0x0051c290's own per-frame alpha-fade
|
||||
/// interpolation) — which sets ALL FOUR alpha channels to the SAME
|
||||
/// <c>1f - translucency</c> value and then calls CheckAlphaValues. So
|
||||
/// has_alpha for a particle's material is exactly "this particle's
|
||||
/// CURRENT alpha isn't 1.0 (fully opaque)". acdream already carries that
|
||||
/// exact interpolated value — <c>Lerp(p.StartAlpha, p.EndAlpha, tLife)</c>,
|
||||
/// baked into the top byte of <paramref name="meshColorArgb"/> by
|
||||
/// <c>Color32</c> (ParticleSystem.cs:1039-1041,1453) — so no new state is
|
||||
/// needed. Billboards never reach row 4 (their mask 0x02 always
|
||||
/// satisfies row 3), so <paramref name="meshColorArgb"/> only matters for
|
||||
/// mesh particles.</para>
|
||||
///
|
||||
/// <para>This "Scene" pass never draws during the Sky leaf (sky/off-
|
||||
/// screen particles use the independent DrawOrdered path entirely, never
|
||||
/// this method) and never installs a detail surface; MultiPassAlpha
|
||||
/// stays false (Must Not: no environment override) — Row 2 is therefore
|
||||
/// provably unreachable here. Rows 1/5 (Immediate) ARE reachable for an
|
||||
/// Opaque-classified mesh-particle batch with no material alpha.</para>
|
||||
/// </summary>
|
||||
internal static RetailAlphaMeshDecision RouteParticleSubmission(
|
||||
ParticleSubmissionKind kind, TranslucencyKind meshTranslucency, uint meshColorArgb)
|
||||
{
|
||||
bool isMesh = kind == ParticleSubmissionKind.Mesh;
|
||||
byte mask = kind == ParticleSubmissionKind.Billboard
|
||||
? RetailAlphaMeshRouter.MaskAlphaFamily
|
||||
: RetailAlphaMeshRouter.MaskFromTranslucencyKind(meshTranslucency);
|
||||
bool materialHasAlpha = isMesh && ((meshColorArgb >> 24) & 0xFFu) != 0xFFu;
|
||||
|
||||
return RetailAlphaMeshRouter.Route(
|
||||
currentlyDrawingSky: false,
|
||||
delayMask: RetailAlphaMeshRouter.DefaultDelayMask,
|
||||
detailSurfaceActive: false,
|
||||
multiPassAlpha: false,
|
||||
subsetMask: mask,
|
||||
materialHasAlpha: materialHasAlpha);
|
||||
}
|
||||
|
||||
private void DeferToRetailAlphaQueue(ICamera camera)
|
||||
{
|
||||
RetailAlphaQueue queue = _alphaQueue!;
|
||||
|
|
@ -323,16 +381,6 @@ public sealed unsafe partial class ParticleRenderer : IDisposable
|
|||
for (int i = 0; i < _submissionScratch.Count; i++)
|
||||
{
|
||||
ParticleSubmission submission = _submissionScratch[i];
|
||||
// A billboard's blend mode (Additive bool) is either the
|
||||
// Additive or the plain Alpha surface bit — both live in
|
||||
// retail's alpha-family union (0x00010300) and construct the
|
||||
// SAME queue mask (0x02); billboards never carry a ClipMap bit
|
||||
// (that is a mesh/UV-texture concept a generated particle quad
|
||||
// has no equivalent of), so they always route to ALPHA.
|
||||
byte mask = submission.Kind == ParticleSubmissionKind.Billboard
|
||||
? RetailAlphaMeshRouter.MaskAlphaFamily
|
||||
: RetailAlphaMeshRouter.MaskFromTranslucencyKind(
|
||||
_meshDrawListScratch[submission.DrawIndex].Batch.Translucency);
|
||||
|
||||
DeferredParticleDraw deferred = submission.Kind == ParticleSubmissionKind.Billboard
|
||||
? new DeferredParticleDraw(
|
||||
|
|
@ -346,31 +394,49 @@ public sealed unsafe partial class ParticleRenderer : IDisposable
|
|||
_meshDrawListScratch[submission.DrawIndex],
|
||||
viewProjection);
|
||||
|
||||
int token = _deferredAlpha.Count;
|
||||
_deferredAlpha.Add(deferred);
|
||||
RetailAlphaMeshDecision decision = submission.Kind == ParticleSubmissionKind.Billboard
|
||||
? RouteParticleSubmission(submission.Kind, default, default)
|
||||
: RouteParticleSubmission(
|
||||
submission.Kind,
|
||||
_meshDrawListScratch[submission.DrawIndex].Batch.Translucency,
|
||||
_meshDrawListScratch[submission.DrawIndex].Instance.ColorArgb);
|
||||
|
||||
// S4-c2: same unreachable-branch reasoning as
|
||||
// WbDrawDispatcher.SubmitToAlphaQueue — this "Scene" pass never
|
||||
// draws during the Sky leaf (sky/off-screen particles use the
|
||||
// independent DrawOrdered path entirely, never this method) and
|
||||
// never installs a detail surface; MultiPassAlpha stays false.
|
||||
RetailAlphaMeshDecision decision = RetailAlphaMeshRouter.Route(
|
||||
currentlyDrawingSky: false,
|
||||
delayMask: RetailAlphaMeshRouter.DefaultDelayMask,
|
||||
detailSurfaceActive: false,
|
||||
multiPassAlpha: false,
|
||||
subsetMask: mask,
|
||||
materialHasAlpha: false);
|
||||
if (decision.Action != RetailAlphaMeshAction.Append)
|
||||
switch (decision.Action)
|
||||
{
|
||||
throw new InvalidOperationException(
|
||||
"Scene particle submissions never draw during the Sky leaf or with a "
|
||||
+ "detail surface installed, and MultiPassAlpha stays false — DrawMesh's "
|
||||
+ $"row 1/2/4/5 branches are unreachable here; got {decision.Action}.");
|
||||
}
|
||||
case RetailAlphaMeshAction.Append:
|
||||
{
|
||||
int token = _deferredAlpha.Count;
|
||||
_deferredAlpha.Add(deferred);
|
||||
// Capacity overflow (spec §5): dropped, no recovery.
|
||||
queue.TryAppend(decision.List, _alphaSource, token, decision.OverrideClipmap);
|
||||
break;
|
||||
}
|
||||
|
||||
// Capacity overflow (spec §5): dropped, no recovery.
|
||||
queue.TryAppend(decision.List, _alphaSource, token, decision.OverrideClipmap);
|
||||
case RetailAlphaMeshAction.Immediate:
|
||||
// M1(c): rows 1/5 — draw NOW, through the same
|
||||
// per-instance draw code DrawOrderedRhi uses for one
|
||||
// submission (no new renderer). A8: no sort — retail's
|
||||
// immediate RenderMeshSubset draws in mesh/submission
|
||||
// order, so this draws exactly this submission, right
|
||||
// where DrawMesh was called.
|
||||
DrawImmediateParticleSubmissionRhi(viewProjection, submission.Kind, submission.DrawIndex);
|
||||
break;
|
||||
|
||||
case RetailAlphaMeshAction.AppendClipAndImmediate:
|
||||
{
|
||||
// Row 2: provably unreachable at this call site
|
||||
// (MultiPassAlpha stays false), but a router row is a
|
||||
// data-driven outcome, never an invariant to crash on
|
||||
// (feedback_retail_dispatch_is_data_driven) — handled in
|
||||
// full, exactly as spec §4 row 2 describes: append to
|
||||
// CLIP AND ALSO draw immediately.
|
||||
int token = _deferredAlpha.Count;
|
||||
_deferredAlpha.Add(deferred);
|
||||
queue.TryAppend(decision.List, _alphaSource, token, decision.OverrideClipmap);
|
||||
DrawImmediateParticleSubmissionRhi(viewProjection, submission.Kind, submission.DrawIndex);
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -95,27 +95,44 @@ internal static class RetailAlphaMeshRouter
|
|||
/// spec's queue-routing mask from that already-collapsed classification.
|
||||
/// <see cref="TranslucencyKind.Opaque"/> and <see cref="TranslucencyKind.ClipMap"/>
|
||||
/// are pre-filtered as "opaque" by <c>WbDrawDispatcher.IsOpaque</c> and
|
||||
/// never actually reach a call site that invokes this — both map
|
||||
/// defensively rather than throwing.
|
||||
/// never reach THAT call site (both map defensively there rather than
|
||||
/// throwing) — but S4-c2 fix round 1 (M1) found a SECOND call site,
|
||||
/// <c>ParticleRenderer.TryAppendMeshDraws</c>/<c>DeferToRetailAlphaQueue</c>,
|
||||
/// which applies NO such pre-filter: a mesh-particle batch's
|
||||
/// <see cref="TranslucencyKind.Opaque"/> classification is a real,
|
||||
/// reachable input there, mapping to mask <c>0x00</c> — a data-driven
|
||||
/// outcome the particle site now handles (immediate draw, or ALPHA via
|
||||
/// the material-alpha fallback), never an invariant to assume away.
|
||||
///
|
||||
/// <para><b>Known gap (register row AP-236b):</b>
|
||||
/// <para><b>Known gap (register row AP-239, formerly filed as the
|
||||
/// dangling "AP-236b" — corrected S4-c2 fix round 1, A2/M8c):</b>
|
||||
/// <see cref="TranslucencyKindExtensions.FromSurfaceType"/>'s
|
||||
/// "Translucent override" (raw <c>Surface.Type</c> has BOTH the
|
||||
/// Translucent (0x10) AND Base1ClipMap (0x04) bits, but no alpha-family
|
||||
/// bit — e.g. cloud GfxObj <c>0x01004C35</c>) resolves to
|
||||
/// <see cref="TranslucencyKind.AlphaBlend"/>, discarding the raw ClipMap
|
||||
/// bit. Retail's <c>ConstructMesh</c> would still see that ClipMap bit
|
||||
/// and produce mask <c>0x08</c> (routes to CLIP); this reconstruction,
|
||||
/// having only the collapsed <see cref="TranslucencyKind"/>, produces
|
||||
/// mask <c>0x02</c> (routes to ALPHA) instead. <c>GroupKey</c> does not
|
||||
/// carry the raw <c>SurfaceType</c> needed to distinguish the two
|
||||
/// AlphaBlend origins, and plumbing it through would touch
|
||||
/// bit) resolves to <see cref="TranslucencyKind.AlphaBlend"/>, discarding
|
||||
/// the raw ClipMap bit. Retail's <c>ConstructMesh</c> would still see
|
||||
/// that ClipMap bit and produce mask <c>0x08</c> (routes to CLIP); this
|
||||
/// reconstruction, having only the collapsed <see cref="TranslucencyKind"/>,
|
||||
/// produces mask <c>0x02</c> (routes to ALPHA) instead. <c>GroupKey</c>
|
||||
/// does not carry the raw <c>SurfaceType</c> needed to distinguish the
|
||||
/// two AlphaBlend origins, and plumbing it through would touch
|
||||
/// <c>GfxObjSubMesh</c>/<c>GroupKey</c>/every mesh-classification call
|
||||
/// site — out of this chunk's bounded scope. The consequence is
|
||||
/// site — out of this chunk's bounded scope. S4-c2 fix round 1 (M7)
|
||||
/// DISPROVED this row's original cited example: cloud GfxObj
|
||||
/// <c>0x01004C35</c>'s surface <c>0x08000023</c> is
|
||||
/// <c>Type=0x10114</c> (ADDITIVE|ALPHA|TRANSLUCENT|BASE1_CLIPMAP) — its
|
||||
/// alpha-family bits win in BOTH retail's real priority AND this
|
||||
/// reconstruction, so it reproduces identically (mask <c>0x02</c> either
|
||||
/// way) and never demonstrated the gap at all. A 2026-09-04 scan of
|
||||
/// every Portal-dat <c>Surface</c> (6,152 scanned) found 27 REAL
|
||||
/// instances of Translucent+Base1ClipMap with no alpha-family bit
|
||||
/// (<c>Type=0x14</c>) — e.g. surface <c>0x08000015</c>, referenced by
|
||||
/// GfxObj <c>0x010001EC</c> — confirming the gap is real, just not via
|
||||
/// the disproven cloud example. The consequence remains
|
||||
/// compositing-ORDER only (a queue-selection difference, not a blend/
|
||||
/// visual difference): a translucent+clipmap subset (in practice, only
|
||||
/// clouds) can interleave with ordinary ALPHA-list content at a narrow
|
||||
/// overlap instead of retail's CLIP-list interleave.</para>
|
||||
/// visual difference): an affected subset can interleave with ordinary
|
||||
/// ALPHA-list content at a narrow overlap instead of retail's CLIP-list
|
||||
/// interleave.</para>
|
||||
/// </summary>
|
||||
internal static byte MaskFromTranslucencyKind(TranslucencyKind kind) => kind switch
|
||||
{
|
||||
|
|
|
|||
|
|
@ -33,24 +33,32 @@ internal enum RetailAlphaList : byte
|
|||
/// Retail's four normal-world <c>D3DPolyRender::FlushAlphaList</c>
|
||||
/// (@0x0059d2e0) call sites (OH1 contract §7), each confirmed 2026-09-04
|
||||
/// against <c>docs/research/named-retail/symbols.json</c> — the capture's
|
||||
/// return address lies inside the named function's range:
|
||||
/// return address lies inside the named function's range. S4-c2 fix round 1
|
||||
/// (M8b): every address below is the CALL INSTRUCTION's own address, not a
|
||||
/// "return site" (the earlier landing's mislabel) — x86 CALL rel32 is 5
|
||||
/// bytes, so the actual return address is the call address + 5 (see
|
||||
/// <c>WalkAlphaDepthTrace.cs</c>'s own "ret" doc comment for the same
|
||||
/// distinction on the capture side).
|
||||
/// <list type="bullet">
|
||||
/// <item><see cref="DrawBuilding"/> — <c>RenderDeviceD3D::DrawBuilding</c>
|
||||
/// @0x0059f2a0, return site 0x0059f30b, threshold 0f.</item>
|
||||
/// @0x0059f2a0, call at 0x0059f30b (returns to 0x0059f310), threshold
|
||||
/// 0f.</item>
|
||||
/// <item><see cref="SortCellExit"/> — acdream's own name for
|
||||
/// <c>RenderDeviceD3D::DrawBlock</c> @0x005a18d0's per-land-cell
|
||||
/// <c>FlushAlphaList(::flush)</c>, return site 0x005a1a07, threshold 0.75f
|
||||
/// <c>RenderDeviceD3D::DrawBlock</c> @0x005a17c0's (per-land-cell loop head
|
||||
/// @0x005a18d0) own <c>FlushAlphaList(::flush)</c>, call at 0x005a1a07
|
||||
/// (returns to 0x005a1a0c), threshold 0.75f
|
||||
/// (the immutable global <c>::flush</c>). There is no retail symbol to
|
||||
/// borrow for the walk's own leaf-event name — the walk expresses this turn
|
||||
/// as <c>OnSortCellTurn</c>/<c>OnLandscapeCellTurn</c>, not a "DrawBlock"
|
||||
/// hook.</item>
|
||||
/// <item><see cref="LandscapeFlush"/> — <c>PView::DrawCells</c> @0x005a4840,
|
||||
/// return site 0x005a4872, threshold 0f.</item>
|
||||
/// call at 0x005a4872 (returns to 0x005a4877), threshold 0f.</item>
|
||||
/// <item><see cref="RenderNormalMode"/> — <c>SmartBox::RenderNormalMode</c>
|
||||
/// @0x00453aa0, return site 0x00453b8b, threshold 0f.</item>
|
||||
/// @0x00453aa0, call at 0x00453b8b (returns to 0x00453b90), threshold
|
||||
/// 0f.</item>
|
||||
/// </list>
|
||||
/// A fifth retail caller (the private <c>CreatureMode::Render</c>
|
||||
/// @0x004529d0, return site 0x00452bf0) is out of the normal-world walk this
|
||||
/// @0x004529d0, call at 0x00452bf0) is out of the normal-world walk this
|
||||
/// enum covers (OH1 contract §7) and has no acdream call site.
|
||||
/// </summary>
|
||||
internal enum RetailAlphaFlushSite
|
||||
|
|
@ -84,20 +92,32 @@ internal interface IRetailAlphaDrawSource
|
|||
/// <summary>
|
||||
/// One retail <c>AlphaListEntry</c>. <see cref="OverrideClipmap"/> mirrors
|
||||
/// retail's per-entry <c>clip</c> byte (<c>SetSurface</c>'s alpha-blend-vs-
|
||||
/// clip-test arm selector); <see cref="IsFirstForList"/> mirrors retail's
|
||||
/// per-entry <c>new</c> byte (true only for the first entry appended to its
|
||||
/// list since the list was last drained — retail captures the current
|
||||
/// material/object matrix only for that entry). Neither drives observable
|
||||
/// acdream behavior today: Vulkan's per-batch material/matrix binding makes
|
||||
/// retail's per-entry material-capture optimization a no-op here (see
|
||||
/// <see cref="RetailAlphaQueue"/>'s class doc comment), but both are stored
|
||||
/// for fidelity and are directly test-observable.
|
||||
/// clip-test arm selector).
|
||||
///
|
||||
/// <para>S4-c2 fix round 1 (M4): retail's per-entry <c>new</c>
|
||||
/// ("first-for-this-list") byte is NOT modeled here. Retail's quantifier is
|
||||
/// per-<c>DrawMesh</c>-INVOCATION: <c>DrawMesh</c> @0x0059d4a0 sets both
|
||||
/// list flags true at ENTRY (<c>0059d4cc arg3 = 1; 0059d4d0 var_c = 1</c>)
|
||||
/// and clears each independently after its OWN first append to that list
|
||||
/// WITHIN THAT CALL (<c>0059d5ef if (var_4_1 == 0) var_c = 0; else arg3 =
|
||||
/// 0;</c>) — one retail subset can append to only one list once, so this
|
||||
/// flag is trivially true for every subset retail ever appends; the
|
||||
/// captures confirm it (10,556 <c>AM</c> lines, <c>new=1</c> on 9,685 of
|
||||
/// them — impossible under "first since the last drain", which acdream's
|
||||
/// deleted <c>isFirstForList = target.Count == 0</c> computed instead). One
|
||||
/// acdream append already IS one full <c>DrawMesh</c> invocation (one
|
||||
/// instance, one call), so the truthful port of an always-true flag with no
|
||||
/// acdream reader (Vulkan's per-batch material/matrix binding makes
|
||||
/// retail's per-entry material-capture optimization a no-op here — see
|
||||
/// <see cref="RetailAlphaQueue"/>'s class doc comment) is to not carry it at
|
||||
/// all, rather than keep a field whose value can never vary and whose only
|
||||
/// possible test is therefore vacuous
|
||||
/// (<c>feedback_every_new_pin_must_be_shown_to_fail</c>).</para>
|
||||
/// </summary>
|
||||
internal readonly record struct RetailAlphaEntry(
|
||||
IRetailAlphaDrawSource Source,
|
||||
int Token,
|
||||
bool OverrideClipmap,
|
||||
bool IsFirstForList);
|
||||
bool OverrideClipmap);
|
||||
|
||||
/// <summary>
|
||||
/// Frame-scoped port of retail's shared <c>D3DPolyRender</c> alpha lists.
|
||||
|
|
@ -199,9 +219,10 @@ internal sealed class RetailAlphaQueue : IWorldSceneAlphaFrame
|
|||
/// at <see cref="ListCapacity"/>, return <see langword="false"/> and the
|
||||
/// subset is DROPPED — no recovery, no fallback draw (spec §5). The
|
||||
/// caller (<see cref="RetailAlphaMeshRouter"/>'s decision) supplies
|
||||
/// <paramref name="overrideClipmap"/>; <c>IsFirstForList</c> is computed
|
||||
/// here from whether <paramref name="list"/> was empty before this
|
||||
/// append.
|
||||
/// <paramref name="overrideClipmap"/>. Retail's per-entry "first for
|
||||
/// this list" flag is not modeled — see <see cref="RetailAlphaEntry"/>'s
|
||||
/// own doc comment (M4) for why it is trivially true for every subset
|
||||
/// retail ever appends and therefore carries no information here.
|
||||
/// </summary>
|
||||
internal bool TryAppend(
|
||||
RetailAlphaList list,
|
||||
|
|
@ -219,8 +240,7 @@ internal sealed class RetailAlphaQueue : IWorldSceneAlphaFrame
|
|||
if (target.Count >= ListCapacity)
|
||||
return false;
|
||||
|
||||
bool isFirstForList = target.Count == 0;
|
||||
target.Add(new RetailAlphaEntry(source, token, overrideClipmap, isFirstForList));
|
||||
target.Add(new RetailAlphaEntry(source, token, overrideClipmap));
|
||||
RegisterSource(source);
|
||||
return true;
|
||||
}
|
||||
|
|
@ -313,6 +333,11 @@ internal sealed class RetailAlphaQueue : IWorldSceneAlphaFrame
|
|||
{
|
||||
int observedClip = _clip.Count;
|
||||
int observedAlpha = _alpha.Count;
|
||||
// S4-c2 fix round 1 (A4): the real SOURCE count, captured before
|
||||
// Clear() — passing the entry count here (HEAD~1's regression)
|
||||
// means _sources/_sourceDrawOffsets never shrink, since the
|
||||
// entry count is always >= the source count.
|
||||
int observedSources = _sources.Count;
|
||||
for (int i = 0; i < _sources.Count; i++)
|
||||
{
|
||||
try
|
||||
|
|
@ -327,7 +352,7 @@ internal sealed class RetailAlphaQueue : IWorldSceneAlphaFrame
|
|||
_sources.Clear();
|
||||
_clip.Clear();
|
||||
_alpha.Clear();
|
||||
ApplyScratchRetention(observedClip + observedAlpha, observedClip + observedAlpha);
|
||||
ApplyScratchRetention(observedClip + observedAlpha, observedSources);
|
||||
}
|
||||
|
||||
if (drawFailure is not null)
|
||||
|
|
@ -401,11 +426,14 @@ internal sealed class RetailAlphaQueue : IWorldSceneAlphaFrame
|
|||
{
|
||||
int observedClip = _clip.Count;
|
||||
int observedAlpha = _alpha.Count;
|
||||
// S4-c2 fix round 1 (A4): see DrainAndReset's own comment — the
|
||||
// real source count, captured before Clear().
|
||||
int observedSources = _sources.Count;
|
||||
_sources.Clear();
|
||||
_clip.Clear();
|
||||
_alpha.Clear();
|
||||
IsCollecting = false;
|
||||
ApplyScratchRetention(observedClip + observedAlpha, observedClip + observedAlpha);
|
||||
ApplyScratchRetention(observedClip + observedAlpha, observedSources);
|
||||
}
|
||||
|
||||
if (failures is { Count: > 0 })
|
||||
|
|
|
|||
|
|
@ -204,7 +204,6 @@ internal sealed class WalkProductionLeafRenderer : IWalkFrameLeafRenderer
|
|||
private Action _clearInteriorDepth = null!;
|
||||
private Func<int> _drawExitSeals = null!;
|
||||
private readonly HashSet<uint> _singleCellScratch = new();
|
||||
private readonly List<uint> _singleCellListScratch = new();
|
||||
|
||||
internal WalkProductionLeafRenderer(
|
||||
RetailPViewPassExecutor passes,
|
||||
|
|
@ -261,9 +260,10 @@ internal sealed class WalkProductionLeafRenderer : IWalkFrameLeafRenderer
|
|||
_passes.DrawOpaqueCellShells(_singleCellScratch);
|
||||
if (_passes.CellHasTransparentShell(cellId))
|
||||
{
|
||||
_singleCellListScratch.Clear();
|
||||
_singleCellListScratch.Add(cellId);
|
||||
_passes.DrawTransparentCellShellsOrdered(_singleCellListScratch);
|
||||
// S4-c2 fix round 1 (M6): drawn now (with detail) or appended to
|
||||
// the retail alpha queue for later replay (without detail) —
|
||||
// see SubmitOrDrawTransparentCellShell's own doc comment.
|
||||
_passes.SubmitOrDrawTransparentCellShell(cellId);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -164,6 +164,106 @@ public RetailPViewPassExecutor(
|
|||
public void DrawTransparentCellShellsOrdered(IReadOnlyList<uint> cellIds) =>
|
||||
_envCells.RenderTransparentOrdered(cellIds);
|
||||
|
||||
/// <summary>
|
||||
/// S4-c2 fix round 1 (M6, contract C4): retail <c>DrawEnvCell</c>
|
||||
/// @0x0059f1c2 installs the environment detail surface (may be null)
|
||||
/// before <c>DrawMesh</c> @0x0059f212 and clears it @0x0059f21a — detail
|
||||
/// ON makes the subset take Row 1 (immediate, WITH detail —
|
||||
/// <see cref="EnvCellRenderer.TransparentDetailEnabled"/>'s own doc
|
||||
/// comment); detail OFF takes Row 3 (append; mask 0x02 alpha-family for
|
||||
/// an EnvCell transparent shell surface). Routed through the SAME table
|
||||
/// every other alpha submitter uses so the decision is the table's, not
|
||||
/// a hand-coded branch. <see cref="EnvCellRenderer.RenderTransparentOrdered"/>
|
||||
/// already replays a cell's transparent batch on demand, so the queue
|
||||
/// side (<see cref="EnvCellAlphaDrawSource"/>) needs no new deferred-
|
||||
/// replay abstraction — one token per CELL (coarser than retail's own
|
||||
/// per-subset entries; AP-236's residual documents that granularity gap).
|
||||
/// </summary>
|
||||
internal void SubmitOrDrawTransparentCellShell(uint cellId)
|
||||
{
|
||||
RetailAlphaMeshDecision decision = RetailAlphaMeshRouter.Route(
|
||||
currentlyDrawingSky: false,
|
||||
delayMask: RetailAlphaMeshRouter.DefaultDelayMask,
|
||||
detailSurfaceActive: _envCells.TransparentDetailEnabled,
|
||||
multiPassAlpha: false,
|
||||
subsetMask: RetailAlphaMeshRouter.MaskAlphaFamily,
|
||||
materialHasAlpha: false);
|
||||
|
||||
if (decision.Action == RetailAlphaMeshAction.Immediate)
|
||||
{
|
||||
_singleCellListScratch.Clear();
|
||||
_singleCellListScratch.Add(cellId);
|
||||
_envCells.RenderTransparentOrdered(_singleCellListScratch);
|
||||
return;
|
||||
}
|
||||
|
||||
// Row 2 (AppendClipAndImmediate) needs MultiPassAlpha, fixed false
|
||||
// above — provably unreachable, same reasoning as
|
||||
// WbDrawDispatcher.SubmitToAlphaQueue's ordinary-content case.
|
||||
_envCellAlphaSource ??= new EnvCellAlphaDrawSource(_envCells.RenderTransparentOrdered);
|
||||
int token = _envCellAlphaSource.AddPendingCellId(cellId);
|
||||
_alpha.TryAppend(decision.List, _envCellAlphaSource, token, decision.OverrideClipmap);
|
||||
}
|
||||
|
||||
private EnvCellAlphaDrawSource? _envCellAlphaSource;
|
||||
|
||||
private readonly List<uint> _singleCellListScratch = new(1);
|
||||
|
||||
/// <summary>
|
||||
/// The queue-facing half of <see cref="SubmitOrDrawTransparentCellShell"/>:
|
||||
/// retains the cell ids submitted this frame in append order and replays
|
||||
/// a drained slice through <see cref="EnvCellRenderer.RenderTransparentOrdered"/>
|
||||
/// (production wiring) — one token per cell, never per subset (M6's
|
||||
/// documented granularity residual). <see cref="IRetailAlphaDrawSource.PrepareAlphaDraws"/>'s
|
||||
/// "only adjacent same-source entries batch" invariant means a particle
|
||||
/// or ordinary GfxObj instance appended BETWEEN two cell tokens keeps
|
||||
/// its own position in the combined drain — this source never
|
||||
/// re-orders across another entry. Depends on a delegate rather than
|
||||
/// the concrete <see cref="EnvCellRenderer"/> type (marked
|
||||
/// <see langword="internal"/>, not <see langword="private"/>) so
|
||||
/// <c>EnvCellAlphaDrawSourceTests</c> can pin the queue mechanics
|
||||
/// without standing up a GPU-backed renderer.
|
||||
/// </summary>
|
||||
internal sealed class EnvCellAlphaDrawSource(Action<IReadOnlyList<uint>> renderTransparentOrdered)
|
||||
: IRetailAlphaDrawSource
|
||||
{
|
||||
private readonly List<uint> _pendingCellIds = new();
|
||||
private readonly List<uint> _preparedCellIds = new();
|
||||
private readonly List<uint> _drawScratch = new();
|
||||
|
||||
/// <summary>Returns this cell's token — its index into
|
||||
/// <see cref="_pendingCellIds"/> at the moment it was added.</summary>
|
||||
internal int AddPendingCellId(uint cellId)
|
||||
{
|
||||
int token = _pendingCellIds.Count;
|
||||
_pendingCellIds.Add(cellId);
|
||||
return token;
|
||||
}
|
||||
|
||||
public void PrepareAlphaDraws(ReadOnlySpan<int> tokens)
|
||||
{
|
||||
_preparedCellIds.Clear();
|
||||
for (int i = 0; i < tokens.Length; i++)
|
||||
_preparedCellIds.Add(_pendingCellIds[tokens[i]]);
|
||||
}
|
||||
|
||||
public void DrawPreparedAlphaBatch(int firstPreparedDraw, int drawCount)
|
||||
{
|
||||
if (drawCount <= 0)
|
||||
return;
|
||||
_drawScratch.Clear();
|
||||
for (int i = 0; i < drawCount; i++)
|
||||
_drawScratch.Add(_preparedCellIds[firstPreparedDraw + i]);
|
||||
renderTransparentOrdered(_drawScratch);
|
||||
}
|
||||
|
||||
public void ResetAlphaSubmissions()
|
||||
{
|
||||
_pendingCellIds.Clear();
|
||||
_preparedCellIds.Clear();
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// S3 chunk 1 fix round 2 (§11.6 H1): retail draws the weather pass
|
||||
/// EXACTLY ONCE per frame — <c>GameSky::Draw</c> @0x00506ff0 with
|
||||
|
|
@ -347,9 +447,10 @@ public RetailPViewPassExecutor(
|
|||
internal void FlushBuildingAlpha() =>
|
||||
_alpha.Flush(RetailAlphaFlushSite.DrawBuilding, 0f);
|
||||
|
||||
/// <summary><c>RenderDeviceD3D::DrawBlock</c> @0x005a18d0's per-land-cell
|
||||
/// <c>FlushAlphaList(::flush)</c> @0x005a1a07, the immutable global
|
||||
/// 0.75f pressure valve (OH1 contract §7 site 2).</summary>
|
||||
/// <summary><c>RenderDeviceD3D::DrawBlock</c> @0x005a17c0's (per-land-cell
|
||||
/// loop head @0x005a18d0) own <c>FlushAlphaList(::flush)</c> @0x005a1a07,
|
||||
/// the immutable global 0.75f pressure valve (OH1 contract §7 site
|
||||
/// 2).</summary>
|
||||
internal void FlushSortCellExitAlpha() =>
|
||||
_alpha.Flush(RetailAlphaFlushSite.SortCellExit, 0.75f);
|
||||
|
||||
|
|
|
|||
|
|
@ -473,16 +473,35 @@ internal sealed class RetailPViewRenderer
|
|||
ClearWalkFrameBindings();
|
||||
}
|
||||
|
||||
// OUTDOOR root: the LScape-boundary alpha drain deferred from the
|
||||
// landscape stage runs HERE, after punches, interior shells, cell
|
||||
// objects, and the dynamics pass — the frame's complete opaque
|
||||
// world. Retail's walk draws all of those before its boundary
|
||||
// flush (LScape::draw includes every cell's objects,
|
||||
// DrawSortCell 0x005A17C0), so this is the same one-list far→near
|
||||
// composite over finished depth; draining at the stage end instead
|
||||
// let every later opaque mesh overwrite the flames (#132).
|
||||
if (ctx.RootCell.IsOutdoorNode)
|
||||
passes.FlushLandscapeAlpha();
|
||||
// S4-c2 fix round 1 (A1): the call that used to sit HERE
|
||||
// (`passes.FlushLandscapeAlpha()`, an outdoor-root-only drain
|
||||
// labelled LandscapeFlush) is DELETED — it was mislabelled.
|
||||
// Retail's LandscapeFlush (`PView::DrawCells` @0x005a4840's own
|
||||
// `FlushAlphaList(0f)` @0x005a4872) sits strictly INSIDE
|
||||
// `if (outside_view.view_count > 0)` on the INTERIOR PView
|
||||
// (WalkEvents.cs's own `OnInteriorFloodDrawTurn` doc comment);
|
||||
// an outdoor root never reaches that branch at all — confirmed
|
||||
// by the terrace-edge capture (zero `005a4877` FL lines) and by
|
||||
// `RetailAlphaQueue`'s own flush-site enum, whose
|
||||
// `LandscapeFlush` member cites that exact address. Retail's
|
||||
// real outdoor-root drains are `DrawBlock`'s per-cell 0.75 valve
|
||||
// (`WalkFrameEventKind.SortCellExit`, already wired) and
|
||||
// `SmartBox::RenderNormalMode`'s own `FlushAlphaList(0f)`
|
||||
// @0x00453b8b at the pass end — which acdream already performs
|
||||
// unconditionally in `RetailAlphaQueue.EndFrame()` (called from
|
||||
// `WorldSceneRenderer.CompleteWorldFrame()`). Between this
|
||||
// method's `return result;` below and that `EndFrame()` call,
|
||||
// `WorldSceneRenderer.Render` performs zero further opaque-world
|
||||
// draws for a PView-rooted frame — `DrawPostWorldParticles`'s
|
||||
// own PView branch is an explicit no-op ("already drew inside
|
||||
// LScape::draw... replaying here would be too late"), and the
|
||||
// diagnostics that follow only emit collision wireframes (a
|
||||
// debug-only probe, off by default) — so #132's "drain after
|
||||
// the finished opaque world" invariant is kept by the
|
||||
// RenderNormalMode flush alone, and `DrawUnattachedSceneParticles`
|
||||
// below joins the SAME final drain retail's own outdoor root
|
||||
// would produce (never an extra LandscapeFlush call retail
|
||||
// never makes there).
|
||||
|
||||
// Interior-cell UNATTACHED emitters (spell ground effects and
|
||||
// swirls anchored in EnvCells) draw in this final world scope —
|
||||
|
|
|
|||
|
|
@ -240,8 +240,9 @@ public sealed class RetailFrameWalk
|
|||
block.SideCellCount,
|
||||
cellIndex);
|
||||
|
||||
// S4-c2: RenderDeviceD3D::DrawBlock @0x005a18d0's own
|
||||
// FlushAlphaList(::flush) @0x005a1a07 call, immediately after
|
||||
// S4-c2: RenderDeviceD3D::DrawBlock @0x005a17c0's (per-land-cell
|
||||
// loop head @0x005a18d0) own FlushAlphaList(::flush)
|
||||
// @0x005a1a07 call, immediately after
|
||||
// DrawSortCell under the SAME alwaysDrawObjects||cellInView
|
||||
// gate that already wraps this whole loop body (the early
|
||||
// `continue` above) — see OnSortCellExit's own doc comment.
|
||||
|
|
|
|||
|
|
@ -155,8 +155,8 @@ public interface IWalkEventSink
|
|||
/// that cell's <see cref="OnLandscapeCellTurn(uint,int,int)"/> turn (the
|
||||
/// object-list turn, itself after the building's own turn) and before
|
||||
/// the loop moves to the next cell's <see cref="OnLandCellTurn"/> —
|
||||
/// <c>RenderDeviceD3D::DrawBlock</c> @0x005a18d0's own
|
||||
/// <c>FlushAlphaList(::flush)</c> @0x005a1a07 call, gated by the exact
|
||||
/// <c>RenderDeviceD3D::DrawBlock</c> @0x005a17c0's (per-land-cell loop
|
||||
/// head @0x005a18d0) own <c>FlushAlphaList(::flush)</c> @0x005a1a07 call, gated by the exact
|
||||
/// same <c>alwaysDrawObjects || cellInView</c> condition as
|
||||
/// <c>DrawSortCell</c> itself (Ghidra-verified 2026-09-04: retail
|
||||
/// re-evaluates the identical condition for the flush call, immediately
|
||||
|
|
|
|||
|
|
@ -238,8 +238,9 @@ internal interface IWalkFrameLeafRenderer
|
|||
/// synthetic viewer-distance threshold.</summary>
|
||||
void AlphaBarrier();
|
||||
|
||||
/// <summary>S4-c2: retail <c>RenderDeviceD3D::DrawBlock</c> @0x005a18d0's
|
||||
/// per-land-cell <c>FlushAlphaList(::flush)</c> @0x005a1a07 — the
|
||||
/// <summary>S4-c2: retail <c>RenderDeviceD3D::DrawBlock</c> @0x005a17c0's
|
||||
/// (per-land-cell loop head @0x005a18d0) own <c>FlushAlphaList(::flush)</c>
|
||||
/// @0x005a1a07 — the
|
||||
/// immutable global 0.75f pressure valve, inert below 2250 entries in
|
||||
/// either list (a no-op the overwhelming majority of the time at
|
||||
/// today's scene complexity) but pinned exact by the capacity/threshold
|
||||
|
|
@ -377,8 +378,8 @@ internal enum WalkFrameEventKind : byte
|
|||
CellParticles,
|
||||
|
||||
/// <summary>S4-c2: <see cref="IWalkFrameLeafRenderer.FlushSortCellExit"/> —
|
||||
/// retail <c>RenderDeviceD3D::DrawBlock</c> @0x005a18d0's per-land-cell
|
||||
/// <c>FlushAlphaList(0.75f)</c>.</summary>
|
||||
/// retail <c>RenderDeviceD3D::DrawBlock</c> @0x005a17c0's (per-land-cell
|
||||
/// loop head @0x005a18d0) own <c>FlushAlphaList(0.75f)</c>.</summary>
|
||||
SortCellExit,
|
||||
}
|
||||
|
||||
|
|
@ -1475,8 +1476,9 @@ internal sealed class WalkFrameDriver : IWalkEventSink, IWalkLookInViewSource
|
|||
_events.Add(WalkFrameEvent.LandscapeCellParticles(cellId));
|
||||
}
|
||||
|
||||
/// <summary>S4-c2: retail <c>RenderDeviceD3D::DrawBlock</c> @0x005a18d0's
|
||||
/// per-land-cell <c>FlushAlphaList(::flush)</c> @0x005a1a07 (the 0.75f
|
||||
/// <summary>S4-c2: retail <c>RenderDeviceD3D::DrawBlock</c> @0x005a17c0's
|
||||
/// (per-land-cell loop head @0x005a18d0) own <c>FlushAlphaList(::flush)</c>
|
||||
/// @0x005a1a07 (the 0.75f
|
||||
/// pressure valve) — fires once per admitted land-block cell, at the SAME
|
||||
/// gate <see cref="IWalkEventSink.OnLandscapeCellTurn(uint,int,int)"/>
|
||||
/// already fires under (<c>RetailFrameWalk.DrawLandscape</c> calls this
|
||||
|
|
|
|||
|
|
@ -32,6 +32,20 @@ public sealed unsafe partial class EnvCellRenderer
|
|||
private readonly TerrainAtlas.RetailDetailTextureBinding _environmentDetail;
|
||||
private readonly Func<bool> _buildingDetailEnabled;
|
||||
|
||||
/// <summary>
|
||||
/// S4-c2 fix round 1 (M6): the SAME <c>detailEnabled</c> test the
|
||||
/// transparent-shell MDI path (line ~254 below) already evaluates at
|
||||
/// draw time — retail <c>DrawEnvCell</c> @0x0059f1c2 installs the
|
||||
/// environment detail surface (may be null) before <c>DrawMesh</c>
|
||||
/// @0x0059f212 and clears it @0x0059f21a, so a non-null environment
|
||||
/// detail is what makes an eligible transparent subset take Row 1
|
||||
/// (immediate). <see cref="RetailPViewPassExecutor"/> reads this to
|
||||
/// decide whether a cell's transparent shell draws now or is appended
|
||||
/// to the retail alpha queue for later replay.
|
||||
/// </summary>
|
||||
internal bool TransparentDetailEnabled =>
|
||||
RetailDetailTextureContract.ShouldRender(_buildingDetailEnabled(), _environmentDetail);
|
||||
|
||||
/// <summary>
|
||||
/// The RHI arm's constructor. It also completes <c>Initialize</c>'s job: the
|
||||
/// five pipelines ARE this renderer's program, so there is no second step
|
||||
|
|
|
|||
|
|
@ -587,21 +587,25 @@ public sealed unsafe partial class WbDrawDispatcher
|
|||
checked((uint)(count * DrawCommandStride)));
|
||||
}
|
||||
|
||||
private void DrawPreparedAlphaBatchRhi(
|
||||
/// <summary>
|
||||
/// The push-constant/pipeline/storage-binding setup <see cref="DrawPreparedAlphaBatchRhi"/>'s
|
||||
/// drain and <see cref="DrawImmediateAlphaInstanceRhi"/>'s single-
|
||||
/// instance immediate draw (S4-c2 fix round 1, M3) share — the only
|
||||
/// difference between the two call sites is <paramref name="viewProjection"/>
|
||||
/// (the drain reads the deferred scope's own <c>_deferredAlphaViewProjection</c>;
|
||||
/// an immediate draw uses whatever the CURRENT frame's viewProjection
|
||||
/// is) and whether a building-detail overlay pass follows.
|
||||
/// </summary>
|
||||
private GpuPushConstants BindAlphaDrawState(
|
||||
IGpuPassEncoder encoder,
|
||||
IGpuFrame frame,
|
||||
GlobalMeshBuffer mesh,
|
||||
int firstPreparedDraw,
|
||||
int drawCount)
|
||||
Matrix4x4 viewProjection,
|
||||
out MeshPipelineSet pipelines)
|
||||
{
|
||||
if (_alphaCommands.Buffer is null)
|
||||
return;
|
||||
|
||||
IWorldPassScope scope = _scope!;
|
||||
IGpuPassEncoder encoder = scope.RequireEncoder();
|
||||
IGpuFrame frame = RequireRhiFrame();
|
||||
|
||||
var pushConstants = new GpuPushConstants
|
||||
{
|
||||
ViewProjection = _deferredAlphaViewProjection,
|
||||
ViewProjection = viewProjection,
|
||||
DrawIdOffset = 0,
|
||||
LightingMode = 0,
|
||||
RenderPass = 1,
|
||||
|
|
@ -612,7 +616,7 @@ public sealed unsafe partial class WbDrawDispatcher
|
|||
ParamB = 0f,
|
||||
};
|
||||
|
||||
MeshPipelineSet pipelines = PipelinesFor(
|
||||
pipelines = PipelinesFor(
|
||||
encoder,
|
||||
frame,
|
||||
out DirectionalShadowFrameBinding shadowBinding);
|
||||
|
|
@ -635,13 +639,34 @@ public sealed unsafe partial class WbDrawDispatcher
|
|||
GpuBindingModel.StorageInstanceDetailCategory,
|
||||
_alphaDetailCategory);
|
||||
AcDream.App.Rendering.WorldFrameSectionBinding.BindClipRegions(
|
||||
encoder, scope.Sections, frame);
|
||||
encoder, _scope!.Sections, frame);
|
||||
AcDream.App.Rendering.WorldFrameSectionBinding.BindSceneLighting(
|
||||
encoder, scope.Sections, frame);
|
||||
encoder, _scope!.Sections, frame);
|
||||
return pushConstants;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// S4-c2 fix round 1 (M3c): delayed replay is ALWAYS <c>detailEnabled=0</c>
|
||||
/// (OH1 contract §4/§5 — <c>FlushAlphaList</c>'s replay calls
|
||||
/// <c>RenderMeshSubset(..., 0, entry.clip, ...)</c>) because every
|
||||
/// detail-eligible subset now takes Row 1 immediate instead
|
||||
/// (<c>SubmitToAlphaQueue</c>'s <c>detailSurfaceActive</c> gate) and
|
||||
/// never reaches this drain at all — so this loop batches purely by
|
||||
/// blend kind, with no per-command detail-category branch left.
|
||||
/// </summary>
|
||||
private void DrawPreparedAlphaBatchRhi(
|
||||
GlobalMeshBuffer mesh,
|
||||
int firstPreparedDraw,
|
||||
int drawCount)
|
||||
{
|
||||
if (_alphaCommands.Buffer is null)
|
||||
return;
|
||||
|
||||
IGpuPassEncoder encoder = _scope!.RequireEncoder();
|
||||
IGpuFrame frame = RequireRhiFrame();
|
||||
GpuPushConstants pushConstants = BindAlphaDrawState(
|
||||
encoder, frame, mesh, _deferredAlphaViewProjection, out MeshPipelineSet pipelines);
|
||||
|
||||
bool detailEnabled = RetailDetailTextureContract.ShouldRender(
|
||||
_buildingDetailEnabled(),
|
||||
_buildingDetail);
|
||||
if (firstPreparedDraw < 0
|
||||
|| drawCount < 0
|
||||
|| firstPreparedDraw > _preparedAlphaInstanceCount - drawCount)
|
||||
|
|
@ -650,25 +675,14 @@ public sealed unsafe partial class WbDrawDispatcher
|
|||
nameof(firstPreparedDraw),
|
||||
"The prepared-alpha draw range exceeds its uploaded instance/category payload.");
|
||||
}
|
||||
ReadOnlySpan<uint> usedDetailCategories =
|
||||
_detailCategoryData.AsSpan(0, _preparedAlphaInstanceCount);
|
||||
|
||||
int runStart = firstPreparedDraw;
|
||||
int preparedEnd = firstPreparedDraw + drawCount;
|
||||
while (runStart < preparedEnd)
|
||||
{
|
||||
TranslucencyKind blend = _deferredAlphaKinds[runStart];
|
||||
bool hasDetail = detailEnabled
|
||||
&& CommandContainsDetailCategory(
|
||||
_indirectCommands[runStart],
|
||||
usedDetailCategories);
|
||||
int runEnd = runStart + 1;
|
||||
while (runEnd < preparedEnd
|
||||
&& !hasDetail
|
||||
&& _deferredAlphaKinds[runEnd] == blend
|
||||
&& (!detailEnabled
|
||||
|| !CommandContainsDetailCategory(
|
||||
_indirectCommands[runEnd],
|
||||
usedDetailCategories)))
|
||||
while (runEnd < preparedEnd && _deferredAlphaKinds[runEnd] == blend)
|
||||
runEnd++;
|
||||
|
||||
// ApplyRetailBlend's three cases are three pipelines, including the
|
||||
|
|
@ -682,23 +696,55 @@ public sealed unsafe partial class WbDrawDispatcher
|
|||
_alphaCommands.OffsetBytes,
|
||||
runStart,
|
||||
runEnd - runStart);
|
||||
|
||||
if (hasDetail)
|
||||
{
|
||||
DrawBuildingDetailRangeRhi(
|
||||
encoder,
|
||||
mesh,
|
||||
pipelines.RetailDetailTransparent,
|
||||
ref pushConstants,
|
||||
_alphaCommands.Buffer!,
|
||||
_alphaCommands.OffsetBytes,
|
||||
runStart,
|
||||
1);
|
||||
}
|
||||
runStart = runEnd;
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// S4-c2 fix round 1 (M3b): <c>DrawMesh</c> row 1's "render immediately;
|
||||
/// enqueue nothing" outcome for ONE translucent building-shell instance
|
||||
/// under building detail — bind the blend pipeline, one indirect draw,
|
||||
/// then the detail pass, reusing <see cref="BindAlphaDrawState"/> and
|
||||
/// <see cref="DrawBuildingDetailRangeRhi"/> (the same code
|
||||
/// <see cref="DrawPreparedAlphaBatchRhi"/> used to use) for the single
|
||||
/// slot <see cref="WbDrawDispatcher.DrawImmediateAlphaInstance"/> just
|
||||
/// prepared. The caller only reaches this method when
|
||||
/// <c>detailSurfaceActive</c> was true, so the detail pass always
|
||||
/// applies here — the drain's own per-command detail CHECK is gone
|
||||
/// (M3c) precisely because detail-eligible content no longer reaches it.
|
||||
/// </summary>
|
||||
private void DrawImmediateAlphaInstanceRhi(
|
||||
GlobalMeshBuffer mesh, TranslucencyKind blend, Matrix4x4 viewProjection)
|
||||
{
|
||||
if (_alphaCommands.Buffer is null)
|
||||
return;
|
||||
|
||||
IGpuPassEncoder encoder = _scope!.RequireEncoder();
|
||||
IGpuFrame frame = RequireRhiFrame();
|
||||
GpuPushConstants pushConstants = BindAlphaDrawState(
|
||||
encoder, frame, mesh, viewProjection, out MeshPipelineSet pipelines);
|
||||
|
||||
BindPipelineWithMesh(encoder, PipelineForBlend(pipelines, blend), mesh);
|
||||
encoder.SetPushConstants(in pushConstants);
|
||||
DrawIndirectRangeRhi(
|
||||
encoder,
|
||||
ref pushConstants,
|
||||
_alphaCommands.Buffer!,
|
||||
_alphaCommands.OffsetBytes,
|
||||
startCommand: 0,
|
||||
commandCount: 1);
|
||||
|
||||
DrawBuildingDetailRangeRhi(
|
||||
encoder,
|
||||
mesh,
|
||||
pipelines.RetailDetailTransparent,
|
||||
ref pushConstants,
|
||||
_alphaCommands.Buffer!,
|
||||
_alphaCommands.OffsetBytes,
|
||||
firstCommand: 0,
|
||||
commandCount: 1);
|
||||
}
|
||||
|
||||
private void DrawImmediateTransparentRhi(
|
||||
IGpuPassEncoder encoder,
|
||||
GlobalMeshBuffer mesh,
|
||||
|
|
|
|||
|
|
@ -903,10 +903,10 @@ public sealed partial class WbDrawDispatcher
|
|||
throw new InvalidOperationException(
|
||||
"One retail alpha scope cannot combine different view-projection matrices.");
|
||||
|
||||
int token = _deferredAlpha.Count;
|
||||
_deferredAlpha.Add(new DeferredAlphaInstance(
|
||||
var candidate = new DeferredAlphaInstance(
|
||||
batch.Key, batch.Transform, batch.ClipSlot, batch.Lights,
|
||||
batch.IndoorFlag, batch.DetailCategory, batch.Alpha, batch.SelectionLighting));
|
||||
SubmitToAlphaQueue(queue, batch.Key.Translucency, token);
|
||||
batch.IndoorFlag, batch.DetailCategory, batch.Alpha, batch.SelectionLighting);
|
||||
SubmitToAlphaQueue(
|
||||
queue, batch.Key.Translucency, in candidate, batch.DetailCategory == 1u, viewProjection);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2445,8 +2445,7 @@ public sealed partial class WbDrawDispatcher : IDisposable
|
|||
{
|
||||
InstanceGroup group = entry.Group;
|
||||
int i = entry.InstanceIndex;
|
||||
int token = _deferredAlpha.Count;
|
||||
_deferredAlpha.Add(new DeferredAlphaInstance(
|
||||
var candidate = new DeferredAlphaInstance(
|
||||
ToKey(group),
|
||||
group.Matrices[i],
|
||||
group.Slots[i],
|
||||
|
|
@ -2454,8 +2453,9 @@ public sealed partial class WbDrawDispatcher : IDisposable
|
|||
group.IndoorFlags[i],
|
||||
group.DetailCategories[i],
|
||||
group.Opacities[i],
|
||||
group.SelectionLighting[i]));
|
||||
SubmitToAlphaQueue(queue, group.Translucency, token);
|
||||
group.SelectionLighting[i]);
|
||||
SubmitToAlphaQueue(
|
||||
queue, group.Translucency, in candidate, group.DetailCategories[i] == 1u, viewProjection);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -2466,40 +2466,71 @@ public sealed partial class WbDrawDispatcher : IDisposable
|
|||
/// clip-map subsets are filtered out upstream by <c>IsOpaque</c> and
|
||||
/// never reach <c>_translucentDraws</c>/this path at all — see
|
||||
/// <see cref="RetailAlphaMeshRouter.MaskFromTranslucencyKind"/>'s own doc
|
||||
/// comment). Neither call site ever draws during the Sky leaf or with a
|
||||
/// building/environment detail surface installed (ordinary GfxObj/
|
||||
/// particle paths never install one — OH1 contract §6), and
|
||||
/// comment). Neither call site ever draws during the Sky leaf and
|
||||
/// <c>MultiPassAlpha</c> stays false (no environment override — Must
|
||||
/// Not). Under those fixed inputs and <see cref="RetailAlphaMeshRouter.DefaultDelayMask"/>,
|
||||
/// every reachable mask (0x02/0x03, 0x04/0x05, 0x08/0x09) intersects the
|
||||
/// delay mask, so <c>DrawMesh</c>'s row 3 always fires — rows 1, 2, 4,
|
||||
/// and 5 are unreachable here and would indicate a real routing bug if
|
||||
/// ever hit.
|
||||
/// Not) — Row 2 is provably unreachable. Under
|
||||
/// <see cref="RetailAlphaMeshRouter.DefaultDelayMask"/> the only
|
||||
/// reachable mask here is 0x02 (alpha-family), which always intersects
|
||||
/// the delay mask, so an ordinary (non-building-shell) instance always
|
||||
/// takes Row 3 (Append).
|
||||
///
|
||||
/// <para>S4-c2 fix round 1 (M3): <paramref name="isBuildingShell"/> feeds
|
||||
/// Row 1's <c>curr_detail_surface != null</c> gate — retail's
|
||||
/// <c>DrawBuilding</c> @0x0059f2a0 installs the building detail surface
|
||||
/// BEFORE its own shell subsets reach <c>DrawMesh</c>
|
||||
/// (<c>0059f2eb curr_detail_surface = building_detail_surface</c>), so a
|
||||
/// translucent building-shell instance takes Row 1 (immediate, WITH
|
||||
/// detail) whenever building detail is on. This IS therefore a real,
|
||||
/// data-driven outcome — not an invariant to throw on
|
||||
/// (feedback_retail_dispatch_is_data_driven) — handled below by drawing
|
||||
/// the instance immediately instead of appending it.</para>
|
||||
/// </summary>
|
||||
private void SubmitToAlphaQueue(
|
||||
RetailAlphaQueue queue, TranslucencyKind kind, int token)
|
||||
RetailAlphaQueue queue,
|
||||
TranslucencyKind kind,
|
||||
in DeferredAlphaInstance candidate,
|
||||
bool isBuildingShell,
|
||||
Matrix4x4 viewProjection)
|
||||
{
|
||||
byte mask = RetailAlphaMeshRouter.MaskFromTranslucencyKind(kind);
|
||||
bool detailSurfaceActive = isBuildingShell
|
||||
&& RetailDetailTextureContract.ShouldRender(_buildingDetailEnabled(), _buildingDetail);
|
||||
RetailAlphaMeshDecision decision = RetailAlphaMeshRouter.Route(
|
||||
currentlyDrawingSky: false,
|
||||
delayMask: RetailAlphaMeshRouter.DefaultDelayMask,
|
||||
detailSurfaceActive: false,
|
||||
detailSurfaceActive: detailSurfaceActive,
|
||||
multiPassAlpha: false,
|
||||
subsetMask: mask,
|
||||
materialHasAlpha: false);
|
||||
|
||||
if (decision.Action != RetailAlphaMeshAction.Append)
|
||||
if (decision.Action == RetailAlphaMeshAction.Immediate)
|
||||
{
|
||||
throw new InvalidOperationException(
|
||||
"Ordinary translucent GfxObj/particle submissions never install a detail "
|
||||
+ "surface or draw during the Sky leaf, and MultiPassAlpha stays false — "
|
||||
+ $"DrawMesh's row 1/2/4/5 branches are unreachable here; got {decision.Action}.");
|
||||
// M3(b): row 1 — draw NOW, at this instance's own turn, and
|
||||
// never touch _deferredAlpha/the queue at all (so a frame whose
|
||||
// translucent content is ENTIRELY immediate — e.g. every visible
|
||||
// shell drawing with building detail on — still leaves nothing
|
||||
// for the queue to clear; only Append/AppendClipAndImmediate,
|
||||
// below, ever grow _deferredAlpha).
|
||||
DrawImmediateAlphaInstance(in candidate, viewProjection);
|
||||
return;
|
||||
}
|
||||
|
||||
int token = _deferredAlpha.Count;
|
||||
_deferredAlpha.Add(candidate);
|
||||
// Capacity overflow (spec §5): TryAppend returns false and the
|
||||
// subset is DROPPED. The reserved _deferredAlpha token simply never
|
||||
// gets prepared/drawn — no recovery, matching retail exactly.
|
||||
queue.TryAppend(decision.List, _alphaSource, token, decision.OverrideClipmap);
|
||||
|
||||
if (decision.Action == RetailAlphaMeshAction.AppendClipAndImmediate)
|
||||
{
|
||||
// Row 2: provably unreachable here (MultiPassAlpha stays false),
|
||||
// but handled in full rather than asserted against — exactly as
|
||||
// spec §4 row 2 describes: append to CLIP AND ALSO draw
|
||||
// immediately.
|
||||
DrawImmediateAlphaInstance(in candidate, viewProjection);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
private sealed class AlphaSubmissionOrderComparer :
|
||||
|
|
@ -2518,6 +2549,59 @@ public sealed partial class WbDrawDispatcher : IDisposable
|
|||
left.SubmissionOrder.CompareTo(right.SubmissionOrder);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Writes ONE <see cref="DeferredAlphaInstance"/> into the CPU staging
|
||||
/// arrays at <paramref name="slot"/> — the per-entry body
|
||||
/// <see cref="PrepareDeferredAlphaDraws"/>'s drain loop and
|
||||
/// <see cref="DrawImmediateAlphaInstance"/>'s single-instance immediate
|
||||
/// path (S4-c2 fix round 1, M3) both share, so the two paths can never
|
||||
/// disagree on how a <see cref="DeferredAlphaInstance"/> becomes GPU
|
||||
/// data. Caller ensures capacity first.
|
||||
/// </summary>
|
||||
private void WriteDeferredAlphaEntrySlot(int slot, in DeferredAlphaInstance entry)
|
||||
{
|
||||
WriteMatrix(_instanceData, slot * 16, entry.Model);
|
||||
_clipSlotData[slot] = entry.ClipSlot;
|
||||
_indoorData[slot] = entry.Indoor;
|
||||
_detailCategoryData[slot] = entry.DetailCategory;
|
||||
_alphaData[slot] = entry.Opacity;
|
||||
_selectionLightingData[slot] = entry.SelectionLighting;
|
||||
int lightOffset = slot * LightManager.MaxLightsPerObject;
|
||||
entry.Lights.CopyTo(_lightSetData, lightOffset);
|
||||
|
||||
GroupKey key = entry.Key;
|
||||
_batchData[slot] = new BatchData
|
||||
{
|
||||
// Campaign V slice V2: table slot, not the raw handle.
|
||||
TextureIndex = key.TextureSlot.Index,
|
||||
TextureLayer = key.TextureLayer,
|
||||
// DrawMesh invokes RenderMeshSubset with detail enabled for
|
||||
// every built-mesh material subset while curr_detail_surface
|
||||
// is installed. The per-instance category still rejects
|
||||
// ordinary objects in mesh_detail. Review fix round 2 (F2):
|
||||
// bit 0 (the #226 built-mesh marker) is unconditional here —
|
||||
// every delayed-alpha entry IS a built-mesh alpha submission
|
||||
// — but the previous hardcoded `1` silently dropped bits 1/2
|
||||
// (Campaign VM VM6 foliage classification). A trunk instance
|
||||
// promoted into the alpha-blend group mid-fade (translucency
|
||||
// < 1 forces AlphaBlend even for an otherwise-Opaque trunk —
|
||||
// see ClassifyBatches's #188 promotion) must keep swaying
|
||||
// through the deferred-alpha replay instead of going rigid
|
||||
// for the duration of its fade.
|
||||
Flags = 1u | key.FoliageFlags,
|
||||
};
|
||||
_indirectCommands[slot] = new DrawElementsIndirectCommand
|
||||
{
|
||||
Count = (uint)key.IndexCount,
|
||||
InstanceCount = 1,
|
||||
FirstIndex = key.FirstIndex,
|
||||
BaseVertex = key.BaseVertex,
|
||||
BaseInstance = (uint)slot,
|
||||
};
|
||||
_drawCullModes[slot] = key.CullMode;
|
||||
_deferredAlphaKinds[slot] = key.Translucency;
|
||||
}
|
||||
|
||||
private void PrepareDeferredAlphaDraws(ReadOnlySpan<int> tokens)
|
||||
{
|
||||
if (tokens.Length == 0)
|
||||
|
|
@ -2530,49 +2614,7 @@ public sealed partial class WbDrawDispatcher : IDisposable
|
|||
int count = tokens.Length;
|
||||
EnsureDeferredAlphaCapacity(count);
|
||||
for (int i = 0; i < count; i++)
|
||||
{
|
||||
DeferredAlphaInstance entry = _deferredAlpha[tokens[i]];
|
||||
WriteMatrix(_instanceData, i * 16, entry.Model);
|
||||
_clipSlotData[i] = entry.ClipSlot;
|
||||
_indoorData[i] = entry.Indoor;
|
||||
_detailCategoryData[i] = entry.DetailCategory;
|
||||
_alphaData[i] = entry.Opacity;
|
||||
_selectionLightingData[i] = entry.SelectionLighting;
|
||||
int lightOffset = i * LightManager.MaxLightsPerObject;
|
||||
entry.Lights.CopyTo(_lightSetData, lightOffset);
|
||||
|
||||
GroupKey key = entry.Key;
|
||||
_batchData[i] = new BatchData
|
||||
{
|
||||
// Campaign V slice V2: table slot, not the raw handle.
|
||||
TextureIndex = key.TextureSlot.Index,
|
||||
TextureLayer = key.TextureLayer,
|
||||
// DrawMesh invokes RenderMeshSubset with detail enabled for
|
||||
// every built-mesh material subset while curr_detail_surface
|
||||
// is installed. The per-instance category still rejects
|
||||
// ordinary objects in mesh_detail. Review fix round 2 (F2):
|
||||
// bit 0 (the #226 built-mesh marker) is unconditional here —
|
||||
// every delayed-alpha entry IS a built-mesh alpha submission
|
||||
// — but the previous hardcoded `1` silently dropped bits 1/2
|
||||
// (Campaign VM VM6 foliage classification). A trunk instance
|
||||
// promoted into the alpha-blend group mid-fade (translucency
|
||||
// < 1 forces AlphaBlend even for an otherwise-Opaque trunk —
|
||||
// see ClassifyBatches's #188 promotion) must keep swaying
|
||||
// through the deferred-alpha replay instead of going rigid
|
||||
// for the duration of its fade.
|
||||
Flags = 1u | key.FoliageFlags,
|
||||
};
|
||||
_indirectCommands[i] = new DrawElementsIndirectCommand
|
||||
{
|
||||
Count = (uint)key.IndexCount,
|
||||
InstanceCount = 1,
|
||||
FirstIndex = key.FirstIndex,
|
||||
BaseVertex = key.BaseVertex,
|
||||
BaseInstance = (uint)i,
|
||||
};
|
||||
_drawCullModes[i] = key.CullMode;
|
||||
_deferredAlphaKinds[i] = key.Translucency;
|
||||
}
|
||||
WriteDeferredAlphaEntrySlot(i, _deferredAlpha[tokens[i]]);
|
||||
|
||||
// One upload per source per sorted alpha scope. RetailAlphaQueue later
|
||||
// draws contiguous ranges from this immutable prepared payload; it must
|
||||
|
|
@ -2584,6 +2626,34 @@ public sealed partial class WbDrawDispatcher : IDisposable
|
|||
PrepareRhiAlphaSections(count);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// S4-c2 fix round 1 (M3b): <c>DrawMesh</c> row 1's "render immediately;
|
||||
/// enqueue nothing" outcome for ONE translucent building-shell instance
|
||||
/// — retail draws the subset in place inside the mesh; the walk's
|
||||
/// opaque instances are stream-batched, so "in place" becomes "at the
|
||||
/// entity's own stream mark" (a register row records this granularity
|
||||
/// adaptation — see <c>SubmitToAlphaQueue</c>'s caller). Reuses
|
||||
/// <see cref="WriteDeferredAlphaEntrySlot"/> and
|
||||
/// <see cref="PrepareRhiAlphaSections"/> for slot 0, then
|
||||
/// <see cref="DrawImmediateAlphaInstanceRhi"/> for the actual pipeline/
|
||||
/// detail draw. Never touches <c>_deferredAlpha</c> or the queue — this
|
||||
/// instance never enters a list — and never overlaps a real queue drain
|
||||
/// in time (a drain only replays previously-APPENDED tokens at a LATER
|
||||
/// flush site; this call happens at the instance's own submission,
|
||||
/// strictly before any such flush).
|
||||
/// </summary>
|
||||
private void DrawImmediateAlphaInstance(in DeferredAlphaInstance entry, Matrix4x4 viewProjection)
|
||||
{
|
||||
GlobalMeshBuffer? global = _meshAdapter.MeshManager?.GlobalBuffer;
|
||||
if (global is null || !MeshSourceReady())
|
||||
return;
|
||||
|
||||
EnsureDeferredAlphaCapacity(1);
|
||||
WriteDeferredAlphaEntrySlot(0, in entry);
|
||||
PrepareRhiAlphaSections(1);
|
||||
DrawImmediateAlphaInstanceRhi(global, entry.Key.Translucency, viewProjection);
|
||||
}
|
||||
|
||||
private void DrawPreparedAlphaBatch(int firstPreparedDraw, int drawCount)
|
||||
{
|
||||
if (drawCount <= 0)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue