feat(render): Campaign V slice V4a - port TextRenderer/BitmapFont/DebugLineRenderer/TextureCache onto IGpuDevice
TextRenderer, BitmapFont, DebugLineRenderer, and TextureCache's UI-texture
upload path (GetOrUploadRenderSurface/UploadRgba8) now issue every draw and
resource creation through the pinned IGpuDevice/IGpuFrame/IGpuPassEncoder
RHI contract instead of raw GL. This is the RHI's first real production
consumer - V0-V3 only established the contract, GL backend skeleton, and a
shader-dialect migration with no live GL exercise. TextRenderer owns one
IGpuPipeline (ui_text shader, straight-alpha blend, depth disabled) and
allocates a per-bucket ring each Flush; BitmapFont's atlas texture is
created and uploaded via device.CreateTexture/.Upload; DebugLineRenderer
mirrors the same one-pipeline-per-Flush shape for its line-list draws.
World-path TextureCache methods (GetOrUpload, the raw-GL layer-array
upload) are untouched - still legacy GL, still out of scope.
Frame lifecycle: GpuDeviceFrameLifetime (RenderFrameOrchestrator.cs) wraps
IGpuDevice.BeginFrame()/IGpuFrame.End() inside the existing
IRenderFrameLifetime bracket HostInputCameraCompositionPhase already opens
per callback, additively - no frame-graph restructuring. Ported renderers
reach the frame via ICurrentGpuFrameSource, a plain interface (not a
delegate field) so WorldSceneDiagnosticsController keeps passing its
existing "no stored window/delegate" architectural-conformance test.
Two real bugs surfaced by actually exercising the RHI against a live GL
context (nothing here was previously reachable before this slice):
- GlGpuDevice.BeginFrame() now resets the render-state cache every frame.
The cache assumes it is the sole writer of GL program/blend/depth/cull
state, which was true while it had zero real consumers, but every
still-legacy renderer (WbDrawDispatcher, terrain, particles, EnvCells)
mutates that same GL state directly and never informs the cache. Once a
legacy renderer ran between two RHI binds, the cache's belief about the
current GL program went stale, so a later BindPipeline(text shader)
skipped re-issuing glUseProgram and the following push-constant upload
threw GL_INVALID_OPERATION against whatever program was actually bound.
Reset() at the frame boundary is the same defensive move BeginPass
already makes after a forced clear (see its comment); it costs one
redundant state application on the frame's first bind.
- GL_MULTISAMPLE has no representation in the pinned contract. Added a
GL-backend-internal Multisample field to GlRenderStateSnapshot/Changes,
computed from GpuPipelineDescription.SampleCount at BindPipeline time -
mirrors how Vulkan bakes MSAA into the pipeline instead of a separate
toggle.
Collateral, scoped to keep the port real rather than a stub:
- GpuTextureSlot (Unassigned = uint.MaxValue, NOT 0) now flows through
every consumer of TextureCache.GetOrUploadRenderSurface/UploadRgba8 and
TextRenderer.DrawSprite - the entire retained UI layer, since a pervasive
Func<uint,(uint,int,int)> sprite-resolve delegate threads through nearly
every UI element/controller. Every prior `== 0` / `!= 0` "no texture"
check became `.IsAssigned` / `!.IsAssigned`; slot 0 is a real assigned
slot (the device's default white texture), so the old sentinel would
have produced live visual regressions if left in place.
- GpuTextureSlot/IGpuDevice/IGpuFrame are internal, so ~270 previously
public AcDream.App types that touched them (directly or transitively)
are now internal too - safe, since AcDream.App is an exe with no
external project references; only the two test projects consume it, via
InternalsVisibleTo. A handful of unrelated types the sweep caught
(ElementInfo/ImportedLayout's property-bag hierarchy, several enums used
as public [Theory] parameters, CursorFeedbackSnapshot's DragAcceptState)
were reverted back to public where making them internal would have
either cascaded into unrelated files or broken xUnit's public-member
discovery.
- ExternalViewportTextureBridge (new) registers the still-raw-GL FBO
color textures PrivateEntityViewportRenderer/PaperdollViewportRenderer
produce (V4g's scope) into the device's texture table for
UiViewport.TextureHandle, via a temporary
GlGpuDevice.RegisterExternalColorTexture escape hatch (internal, not
part of IGpuDevice) deleted when V4g ports those viewports.
- TextRenderGlStateScope.cs and its test deleted: the pipeline description
now bakes what it used to restore by hand.
- ResourceCleanupGroupTests/GlTextureOwnershipTests: the two source-text
conformance tests keyed to TextRenderer's old multi-resource
construction shape (Shader + per-flight FrameBufferSet array + white
texture + tracked VAO/VBO, all via ResourceCleanupGroup) no longer apply
- that shape is gone, replaced by one IGpuPipeline created through
IGpuDevice. The construction-order test is deleted; the checked-commit
texture-creation check now targets GlGpuTexture (which already used
the same GlResourceCommand.CreateName primitive before this slice).
Gates:
- dotnet build -c Release: 0 warnings, 0 errors (AcDream.App has
TreatWarningsAsErrors).
- dotnet test tests/AcDream.App.Tests -c Release: 3,840 passed / 3
skipped (was 3,843/3 entering this slice - net 3 fewer tests:
TextRendererFailureSafetyTests.cs deleted (2, tested the now-deleted
TextRenderGlStateScope) plus the one retired ResourceCleanupGroupTests
method). Full solution: 8,908 passed / 5 skipped across all nine test
projects.
- Offline pixel gate (tools/run-offline-pixel-gate.ps1, parent ec414d60
vs this commit): differing fraction 0.318% (1,791/563,200 compared
pixels), above the 0.001 threshold. Investigated pixel-by-pixel rather
than waved through: a diff heatmap plus 4x crops at the differing
clusters show zero differences anywhere in the retained UI, terrain,
scenery, or static meshes - every differing pixel sits on continuously-
animated ambient content (flying-insect sprites over the swamp, foliage
sparkle/dew glints) whose exact phase depends on elapsed wall-clock
time, the same category the gate's own sky-masking rationale already
documents and the campaign doc's coverage table explicitly excludes
("Not covered - particles"). Confirming evidence: two same-commit
captures at HEAD compare clean against each other (0.0025%), and two
same-commit captures at the parent compare clean against each other
(0.0044%) - only base-vs-head is consistently elevated, which is what
frame-pacing drift from genuinely new per-frame RHI work (BeginFrame,
ring resets, the render-state reset above) would produce against a
fixed wall-clock capture deadline, not a rendering defect. Recommend a
quick user visual check of this capture pair alongside the automated
result, matching how V2c's particle work was already handled in this
campaign (flagged for user visual confirmation rather than blocked on
an automated gate that cannot cover animated content).
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
This commit is contained in:
Erik
parent
ec414d60cd
commit
ceec3bc440
334 changed files with 3660 additions and 3840 deletions
|
|
@ -1,4 +1,4 @@
|
|||
using System;
|
||||
using System;
|
||||
using System.Linq;
|
||||
using System.Numerics;
|
||||
using AcDream.App.Rendering.Wb;
|
||||
|
|
@ -8,15 +8,15 @@ namespace AcDream.App.Rendering;
|
|||
|
||||
/// <summary>
|
||||
/// BR-2 (holistic building-render port): retail's invisible portal depth
|
||||
/// writes — the port of <c>D3DPolyRender::DrawPortalPolyInternal</c>
|
||||
/// writes — the port of <c>D3DPolyRender::DrawPortalPolyInternal</c>
|
||||
/// (Ghidra 0x0059bc90, pc:424490).
|
||||
///
|
||||
/// <para><b>Wired by T1 (BR-3, `579c8b0`):</b> seal on interior roots, punch
|
||||
/// on outdoor / look-in roots, via <c>RetailPViewPassExecutor.DrawPortalDepthWrite</c>
|
||||
/// (the <c>DrawExitPortalMasks</c> slice callback) — safe alongside the
|
||||
/// (the <c>DrawExitPortalMasks</c> slice callback) — safe alongside the
|
||||
/// dynamics-drawn-LAST frame order (the first BR-2 attempt punched after
|
||||
/// dynamics and erased the player; reverted 88be519). #117 (2026-06-11)
|
||||
/// added the two-pass stencil depth gate on the punch side — see
|
||||
/// added the two-pass stencil depth gate on the punch side — see
|
||||
/// <see cref="DrawDepthFan"/>.</para>
|
||||
///
|
||||
/// <para>Retail projects a portal polygon, software-clips it against the
|
||||
|
|
@ -25,12 +25,12 @@ namespace AcDream.App.Rendering;
|
|||
/// <list type="bullet">
|
||||
/// <item><b>Seal</b> (retail <c>maxZ2=6</c>, bit0 clear, data 0x00820e14):
|
||||
/// z = the polygon's true projected depth. Drawn on portals leading OUTSIDE
|
||||
/// (<c>other_cell_id==0xFFFF</c>) after the landscape pass — terrain seen
|
||||
/// (<c>other_cell_id==0xFFFF</c>) after the landscape pass — terrain seen
|
||||
/// through a doorway keeps its pixels because farther interior geometry
|
||||
/// z-fails inside the aperture (PView::DrawCells loop 1, Ghidra 0x005a4840,
|
||||
/// pc:432783-432786).</item>
|
||||
/// <item><b>Punch</b> (retail <c>maxZ1=7</c>, bit0 set, data 0x00820e18):
|
||||
/// z forced to the far plane (0.99999988) — erases depth inside a building
|
||||
/// z forced to the far plane (0.99999988) — erases depth inside a building
|
||||
/// aperture so the interior cells drawn next land cleanly
|
||||
/// (ConstructView(CBldPortal) mode-1, pc:433827). BR-2 commit 2 wires this
|
||||
/// side.</item>
|
||||
|
|
@ -38,7 +38,7 @@ namespace AcDream.App.Rendering;
|
|||
///
|
||||
/// <para>Where retail clips the polygon on the CPU against the view, we apply
|
||||
/// the SAME view region via <c>gl_ClipDistance</c> from the slice's clip-space
|
||||
/// half-planes (≤8, the validated <see cref="ClipPlaneSet"/> output) — the
|
||||
/// half-planes (≤8, the validated <see cref="ClipPlaneSet"/> output) — the
|
||||
/// depth write lands only inside the slice region, matching retail's clipped
|
||||
/// fan.</para>
|
||||
///
|
||||
|
|
@ -46,7 +46,7 @@ namespace AcDream.App.Rendering;
|
|||
/// sets everything it depends on, restores the frame-global convention on
|
||||
/// exit, no early-outs between set and restore.</para>
|
||||
/// </summary>
|
||||
public sealed class PortalDepthMaskRenderer : IDisposable
|
||||
internal sealed class PortalDepthMaskRenderer : IDisposable
|
||||
{
|
||||
private const string VertSrc = @"#version 430 core
|
||||
layout(location = 0) in vec3 aPos;
|
||||
|
|
@ -215,28 +215,28 @@ void main() { } // depth-only: color writes are masked off by the caller state
|
|||
/// <summary>
|
||||
/// #117 (2026-06-11): the mark-pass depth bias, in NDC, toward the
|
||||
/// viewer. Retail's punch is DEPTHTEST_ALWAYS and is safe only because
|
||||
/// retail's outdoor pass is painter's-ordered far→near (anything nearer
|
||||
/// retail's outdoor pass is painter's-ordered far→near (anything nearer
|
||||
/// redraws AFTER the punch and re-covers it). Our z-buffered MDI frame
|
||||
/// has no such order, so an unconditional far-Z punch erased the depth
|
||||
/// of NEARER occluders (terrain hills, closer buildings) at aperture
|
||||
/// pixels — doors/interiors painted through them (the T5 #117 report).
|
||||
/// pixels — doors/interiors painted through them (the T5 #117 report).
|
||||
/// The z-buffer-correct equivalent: punch ONLY where the aperture
|
||||
/// polygon itself wins a depth test at its true depth (two-pass
|
||||
/// stencil below). The bias keeps the #108 case covered — terrain
|
||||
/// stencil below). The bias keeps the #108 case covered — terrain
|
||||
/// hugging the door plane (centimeters in front of the aperture) must
|
||||
/// still be punched; a hill or another house meters nearer must not.
|
||||
/// </summary>
|
||||
private const float PunchMarkDepthBias = 0.0005f;
|
||||
|
||||
/// <summary>
|
||||
/// #129 (2026-06-12): NDC depth is non-linear — a constant NDC bias b
|
||||
/// spans ≈ b·d²/near meters of eye depth at eye distance d. With
|
||||
/// #129 (2026-06-12): NDC depth is non-linear — a constant NDC bias b
|
||||
/// spans ≈ b·d²/near meters of eye depth at eye distance d. With
|
||||
/// znear = 0.1, the 0.0005 constant alone spanned 0.125 m at 5 m but
|
||||
/// ~190 m at a landblock away: every hill/house in front of a distant
|
||||
/// aperture passed the mark and got far-Z punched — door-shaped leaks
|
||||
/// aperture passed the mark and got far-Z punched — door-shaped leaks
|
||||
/// through occluders. Fix: cap the bias's EYE-SPACE span at
|
||||
/// <see cref="PunchMarkBiasEyeCapMeters"/>. Below the ~10 m crossover
|
||||
/// (sqrt(cap·near/0.0005)) the constant-NDC term is smaller and wins —
|
||||
/// (sqrt(cap·near/0.0005)) the constant-NDC term is smaller and wins —
|
||||
/// bit-identical to the T5-validated close-range behavior (#108 grass
|
||||
/// coverage untouched); beyond it the punch can never reach an occluder
|
||||
/// more than the cap in front of the aperture plane.
|
||||
|
|
@ -245,7 +245,7 @@ void main() { } // depth-only: color writes are masked off by the caller state
|
|||
|
||||
/// <summary>Retail <c>Render::znear</c> = 0.1 (decomp :342173, re-landed
|
||||
/// d4b5c71). The cap conversion below assumes the production camera near
|
||||
/// plane; the small f/(f−n) factor (~1.00002 at far 5000) is ignored.</summary>
|
||||
/// plane; the small f/(f−n) factor (~1.00002 at far 5000) is ignored.</summary>
|
||||
public const float CameraNearPlaneMeters = 0.1f;
|
||||
|
||||
/// <summary>CPU mirror of the vertex-shader mark-bias expression (keep in
|
||||
|
|
@ -261,13 +261,13 @@ void main() { } // depth-only: color writes are masked off by the caller state
|
|||
/// slice's clip-space half-planes. <paramref name="forceFarZ"/> selects
|
||||
/// punch (true, retail maxZ1) vs seal (false, retail maxZ2 true depth).
|
||||
///
|
||||
/// <para><b>Seal</b> (interior root): one pass, retail-verbatim —
|
||||
/// <para><b>Seal</b> (interior root): one pass, retail-verbatim —
|
||||
/// depth ALWAYS + true projected depth. It runs immediately after the
|
||||
/// gated full depth clear, so there is no nearer content to stomp.</para>
|
||||
///
|
||||
/// <para><b>Punch</b> (outdoor root / look-in): two passes (#117).
|
||||
/// Pass A marks stencil where the aperture fan passes a LEQUAL depth
|
||||
/// test at its (biased) true depth — i.e. where the aperture is
|
||||
/// test at its (biased) true depth — i.e. where the aperture is
|
||||
/// actually visible against everything drawn so far. Pass B writes the
|
||||
/// far-Z punch with depth ALWAYS but stencil-gated to the marked
|
||||
/// pixels, and zeroes the stencil as it goes (self-cleaning). This is
|
||||
|
|
@ -301,7 +301,7 @@ void main() { } // depth-only: color writes are masked off by the caller state
|
|||
_gl.Disable(EnableCap.CullFace); // portal fans face either way
|
||||
_gl.Disable(EnableCap.ScissorTest);
|
||||
_gl.Enable(EnableCap.DepthTest);
|
||||
_gl.ColorMask(false, false, false, false); // alpha-0 fan ≙ no color
|
||||
_gl.ColorMask(false, false, false, false); // alpha-0 fan ≙ no color
|
||||
for (int i = 0; i < planeCount; i++)
|
||||
_gl.Enable(EnableCap.ClipDistance0 + i);
|
||||
|
||||
|
|
@ -351,7 +351,7 @@ void main() { } // depth-only: color writes are masked off by the caller state
|
|||
|
||||
if (!forceFarZ)
|
||||
{
|
||||
// ── SEAL: retail-verbatim single pass ──
|
||||
// ── SEAL: retail-verbatim single pass ──
|
||||
_gl.DepthFunc(DepthFunction.Always);
|
||||
_gl.DepthMask(true);
|
||||
_gl.Uniform1(_locForceFarZ, 0);
|
||||
|
|
@ -360,7 +360,7 @@ void main() { } // depth-only: color writes are masked off by the caller state
|
|||
}
|
||||
else
|
||||
{
|
||||
// ── PUNCH pass A: stencil-mark visible aperture pixels ──
|
||||
// ── PUNCH pass A: stencil-mark visible aperture pixels ──
|
||||
_gl.Enable(EnableCap.StencilTest);
|
||||
_gl.StencilFunc(StencilFunction.Always, 1, 0xFF);
|
||||
_gl.StencilOp(StencilOp.Keep, StencilOp.Keep, StencilOp.Replace);
|
||||
|
|
@ -373,8 +373,8 @@ void main() { } // depth-only: color writes are masked off by the caller state
|
|||
PunchMarkBiasEyeCapMeters * CameraNearPlaneMeters);
|
||||
_gl.DrawArrays(PrimitiveType.TriangleFan, firstVertex, (uint)n);
|
||||
|
||||
// ── PUNCH pass B: far-Z write on marked pixels only;
|
||||
// zero the stencil as we go (self-cleaning) ──
|
||||
// ── PUNCH pass B: far-Z write on marked pixels only;
|
||||
// zero the stencil as we go (self-cleaning) ──
|
||||
_gl.StencilFunc(StencilFunction.Equal, 1, 0xFF);
|
||||
_gl.StencilOp(StencilOp.Keep, StencilOp.Keep, StencilOp.Zero);
|
||||
_gl.DepthFunc(DepthFunction.Always);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue