Revert "Campaign V slice V4a" - it lost world multisampling
This reverts ceec3bc4. Two independent reasons, either sufficient.
The rendering regression. The slice deleted TextRenderGlStateScope, which
saved GL_MULTISAMPLE and GL_SAMPLE_ALPHA_TO_COVERAGE on entry, disabled them
for the text pass, and restored them on exit (TextRenderGlStateScope.cs:111-112
and 153-154 at the parent commit). Its replacement bakes that state into the
text pipeline but nothing restores it, and GlGpuPassEncoder.Dispose does not
either. Every world renderer is still raw GL at this point in the campaign, so
from the first UI frame onward the world drew with multisampling disabled.
The offline pixel gate caught it: 1,791 of 563,200 compared pixels differed,
0.318% against a 0.001 threshold. The commit message attributed this to
wall-clock-driven ambient animation shifting phase, and committed through the
failure. That explanation does not survive its own control: capturing twice at
the reverted-to commit differs by 19 pixels and twice at the slice's own commit
by 8, while base-versus-head differs by 1,791 - a 224x gap that no shared-noise
source explains. An amplified difference image settles it visually: the changed
pixels are the silhouette edges of every tree, building and rock, with terrain
interiors, water and the entire UI untouched. That is the signature of losing
edge antialiasing, not of animated sprites.
This is the exact failure mode two existing memory notes already warn about -
a mid-frame renderer must set every GL state it uses rather than inherit it,
and issue #52's lesson that a rendering migration must audit per-pass GL state
before declaring itself done.
The scope. The brief was three small leaf renderers plus additive frame-
lifecycle wiring, roughly ten files. The commit changed 334 files with 3,665
insertions and 3,845 deletions, including 323 public-to-internal visibility
conversions across the App assembly, 55 test files, two retired conformance
tests, and a self-described temporary escape hatch for bridging raw-GL viewport
textures. Even without the regression, that is not separable into the part
worth keeping and the part worth dropping.
Reverting rather than patching because the good work here - the RHI frame
lifecycle wiring and a genuine render-state-cache staleness fix - is small
enough to redo cleanly against a tightened spec, while untangling it from 300+
files of unrelated churn is not.
Post-revert: Release build clean, App suite back to 3,843 passed / 3 skipped,
offline pixel gate passing at 19 differing pixels.
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
This commit is contained in:
Erik
parent
ceec3bc440
commit
9aaf97e785
334 changed files with 3841 additions and 3661 deletions
|
|
@ -1,4 +1,4 @@
|
|||
using System.Collections.Generic;
|
||||
using System.Collections.Generic;
|
||||
using AcDream.App.Plugins;
|
||||
using AcDream.App.Combat;
|
||||
using AcDream.App.Input;
|
||||
|
|
@ -24,41 +24,41 @@ using Silk.NET.Input;
|
|||
|
||||
namespace AcDream.App.UI;
|
||||
|
||||
internal sealed record RetailUiAssets(
|
||||
public sealed record RetailUiAssets(
|
||||
IDatReaderWriter Dats,
|
||||
object DatLock,
|
||||
Func<uint, (GpuTextureSlot Texture, int Width, int Height)> ResolveSprite,
|
||||
Func<uint, (uint Texture, int Width, int Height)> ResolveSprite,
|
||||
Func<uint, UiDatFont?> ResolveFont,
|
||||
UiDatFont? DefaultFont,
|
||||
BitmapFont? DebugFont,
|
||||
ControlsIni Controls,
|
||||
IconComposer Icons);
|
||||
|
||||
internal sealed record VitalsRuntimeBindings(VitalsVM ViewModel);
|
||||
public sealed record VitalsRuntimeBindings(VitalsVM ViewModel);
|
||||
|
||||
internal sealed record ChatRuntimeBindings(ChatVM ViewModel, Func<ICommandBus> CommandBus);
|
||||
public sealed record ChatRuntimeBindings(ChatVM ViewModel, Func<ICommandBus> CommandBus);
|
||||
|
||||
internal sealed record RadarRuntimeBindings(
|
||||
public sealed record RadarRuntimeBindings(
|
||||
Func<UiRadarSnapshot> Snapshot,
|
||||
SelectionState Selection,
|
||||
Action<bool> SetUiLocked);
|
||||
|
||||
internal sealed record CombatRuntimeBindings(
|
||||
public sealed record CombatRuntimeBindings(
|
||||
CombatState State,
|
||||
RuntimeCombatAttackState Attacks,
|
||||
Func<GameplaySettings> Gameplay,
|
||||
Action<GameplaySettings> SetGameplay);
|
||||
|
||||
internal sealed record MagicRuntimeBindings(
|
||||
public sealed record MagicRuntimeBindings(
|
||||
Spellbook Spellbook,
|
||||
RuntimeSpellCastState Casting,
|
||||
ClientObjectTable Objects,
|
||||
Func<uint> PlayerGuid,
|
||||
IReadOnlyDictionary<uint, SpellComponentDescriptor> Components,
|
||||
Func<ItemType, uint, uint, uint, uint, GpuTextureSlot> ResolveIcon,
|
||||
Func<ItemType, uint, uint, uint, uint, GpuTextureSlot> ResolveDragIcon,
|
||||
Func<uint, GpuTextureSlot> ResolveSpellIcon,
|
||||
Func<uint, GpuTextureSlot> ResolveComponentIcon,
|
||||
Func<ItemType, uint, uint, uint, uint, uint> ResolveIcon,
|
||||
Func<ItemType, uint, uint, uint, uint, uint> ResolveDragIcon,
|
||||
Func<uint, uint> ResolveSpellIcon,
|
||||
Func<uint, uint> ResolveComponentIcon,
|
||||
SelectionState Selection,
|
||||
Func<uint, int> SpellLevel,
|
||||
Func<uint, IReadOnlyList<SpellExamineComponent>> SpellComponents,
|
||||
|
|
@ -72,14 +72,14 @@ internal sealed record MagicRuntimeBindings(
|
|||
Action<uint, uint> SetDesiredComponent,
|
||||
Func<double> ServerTime);
|
||||
|
||||
internal sealed record JumpPowerbarRuntimeBindings(Func<JumpChargeSnapshot> Snapshot);
|
||||
public sealed record JumpPowerbarRuntimeBindings(Func<JumpChargeSnapshot> Snapshot);
|
||||
|
||||
internal sealed record FpsRuntimeBindings(
|
||||
public sealed record FpsRuntimeBindings(
|
||||
Func<double> FramesPerSecond,
|
||||
Func<double> DegradeMultiplier,
|
||||
Func<bool> IsVisible);
|
||||
|
||||
internal sealed record IndicatorRuntimeBindings(
|
||||
public sealed record IndicatorRuntimeBindings(
|
||||
Spellbook Spellbook,
|
||||
ClientObjectTable Objects,
|
||||
Func<uint> PlayerGuid,
|
||||
|
|
@ -89,11 +89,11 @@ internal sealed record IndicatorRuntimeBindings(
|
|||
Action RequestLinkStatusPing,
|
||||
Action EndCharacterSession);
|
||||
|
||||
internal sealed record ToolbarRuntimeBindings(
|
||||
public sealed record ToolbarRuntimeBindings(
|
||||
ClientObjectTable Objects,
|
||||
ShortcutStore Shortcuts,
|
||||
Func<ItemType, uint, uint, uint, uint, GpuTextureSlot> ResolveIcon,
|
||||
Func<ItemType, uint, uint, uint, uint, GpuTextureSlot> ResolveDragIcon,
|
||||
Func<ItemType, uint, uint, uint, uint, uint> ResolveIcon,
|
||||
Func<ItemType, uint, uint, uint, uint, uint> ResolveDragIcon,
|
||||
Action<uint> UseItem,
|
||||
CombatState Combat,
|
||||
ItemManaState ItemMana,
|
||||
|
|
@ -114,13 +114,13 @@ internal sealed record ToolbarRuntimeBindings(
|
|||
Func<uint> PlayerGuid,
|
||||
Action<uint, uint, int>? SendPutItemInContainer);
|
||||
|
||||
internal sealed record CharacterRuntimeBindings(CharacterSheetProvider Provider);
|
||||
public sealed record CharacterRuntimeBindings(CharacterSheetProvider Provider);
|
||||
|
||||
internal sealed record InventoryRuntimeBindings(
|
||||
public sealed record InventoryRuntimeBindings(
|
||||
ClientObjectTable Objects,
|
||||
Func<uint> PlayerGuid,
|
||||
Func<ItemType, uint, uint, uint, uint, GpuTextureSlot> ResolveIcon,
|
||||
Func<ItemType, uint, uint, uint, uint, GpuTextureSlot> ResolveDragIcon,
|
||||
Func<ItemType, uint, uint, uint, uint, uint> ResolveIcon,
|
||||
Func<ItemType, uint, uint, uint, uint, uint> ResolveDragIcon,
|
||||
Func<int?> Strength,
|
||||
Action<uint>? SendUse,
|
||||
Action<uint, uint, int>? SendPutItemInContainer,
|
||||
|
|
@ -129,11 +129,11 @@ internal sealed record InventoryRuntimeBindings(
|
|||
ItemInteractionController ItemInteraction,
|
||||
SelectionState Selection);
|
||||
|
||||
internal sealed record ExternalContainerRuntimeBindings(
|
||||
public sealed record ExternalContainerRuntimeBindings(
|
||||
ExternalContainerState State,
|
||||
ClientObjectTable Objects,
|
||||
Func<ItemType, uint, uint, uint, uint, GpuTextureSlot> ResolveIcon,
|
||||
Func<ItemType, uint, uint, uint, uint, GpuTextureSlot> ResolveDragIcon,
|
||||
Func<ItemType, uint, uint, uint, uint, uint> ResolveIcon,
|
||||
Func<ItemType, uint, uint, uint, uint, uint> ResolveDragIcon,
|
||||
ItemInteractionController ItemInteraction,
|
||||
SelectionState Selection,
|
||||
Action<uint> SendUse,
|
||||
|
|
@ -141,12 +141,12 @@ internal sealed record ExternalContainerRuntimeBindings(
|
|||
Action<uint, uint, uint, uint> SendStackableSplitToContainer,
|
||||
Func<uint, bool> IsWithinUseRange);
|
||||
|
||||
internal sealed record RetailUiPersistenceBindings(
|
||||
public sealed record RetailUiPersistenceBindings(
|
||||
SettingsStore Store,
|
||||
Func<string> CharacterKey,
|
||||
Func<(int Width, int Height)> ScreenSize);
|
||||
|
||||
internal sealed record RetailUiProbeBindings(
|
||||
public sealed record RetailUiProbeBindings(
|
||||
bool Enabled,
|
||||
string? ScriptPath,
|
||||
bool DumpOnStart,
|
||||
|
|
@ -155,19 +155,19 @@ internal sealed record RetailUiProbeBindings(
|
|||
Func<InputAction, bool, bool> SetInputHeld,
|
||||
Testing.IRetailUiAutomationRuntime? Runtime = null);
|
||||
|
||||
internal sealed record RetailUiCursorBindings(
|
||||
public sealed record RetailUiCursorBindings(
|
||||
CursorFeedbackController Feedback,
|
||||
RetailCursorManager Manager);
|
||||
|
||||
internal sealed record ConfirmationRuntimeBindings(
|
||||
public sealed record ConfirmationRuntimeBindings(
|
||||
Action<uint, uint, bool> SendResponse);
|
||||
|
||||
internal sealed record AppraisalRuntimeBindings(
|
||||
public sealed record AppraisalRuntimeBindings(
|
||||
Func<string> PlayerName,
|
||||
Action<uint, string> SendSetInscription,
|
||||
Action<string> DisplaySystemMessage);
|
||||
|
||||
internal sealed record RetailUiRuntimeBindings(
|
||||
public sealed record RetailUiRuntimeBindings(
|
||||
UiHost Host,
|
||||
RetailUiAssets Assets,
|
||||
VitalsRuntimeBindings Vitals,
|
||||
|
|
@ -196,7 +196,7 @@ internal sealed record RetailUiRuntimeBindings(
|
|||
/// state/action delegates and GL/DAT resolvers; this runtime imports layouts, binds
|
||||
/// controllers, mounts windows, owns persistence, and presents one tick/draw/dispose seam.
|
||||
/// </summary>
|
||||
internal sealed class RetailUiRuntime : IDisposable
|
||||
public sealed class RetailUiRuntime : IDisposable
|
||||
{
|
||||
private readonly RetailUiRuntimeBindings _bindings;
|
||||
private StackSplitQuantityState StackSplitQuantity => _bindings.StackSplitQuantity;
|
||||
|
|
@ -566,7 +566,7 @@ internal sealed class RetailUiRuntime : IDisposable
|
|||
ImportedLayout? layout = Import(0x2100006Cu);
|
||||
if (layout is null)
|
||||
{
|
||||
Console.WriteLine("[D.2b] vitals: LayoutDesc 0x2100006C not found — vitals unavailable.");
|
||||
Console.WriteLine("[D.2b] vitals: LayoutDesc 0x2100006C not found — vitals unavailable.");
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
@ -590,7 +590,7 @@ internal sealed class RetailUiRuntime : IDisposable
|
|||
MinWidth = 40f,
|
||||
ContentClickThrough = false,
|
||||
});
|
||||
Console.WriteLine("[D.2b] retail UI active — vitals window from LayoutDesc importer (0x2100006C).");
|
||||
Console.WriteLine("[D.2b] retail UI active — vitals window from LayoutDesc importer (0x2100006C).");
|
||||
}
|
||||
|
||||
private void MountRadar()
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue