erik/acdream
1
0
Fork 0
Code Issues Pull requests Projects Releases 6 Packages Wiki Activity Actions

Revert "Campaign V slice V4a" - it lost world multisampling

Browse source 
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 2026-07-27 18:27:52 +02:00
parent ceec3bc440
commit 9aaf97e785
334 changed files with 3841 additions and 3661 deletions
Download patch file Download diff file Expand all files Collapse all files

103
tests/AcDream.App.Tests/UI/Layout/ToolbarControllerTests.cs
View file

@ -1,4 +1,3 @@
using AcDream.App.Rendering.Gpu;
using System;
using System.Collections.Generic;
using AcDream.App.UI;
@ -67,7 +66,7 @@ public class ToolbarControllerTests
void AddSlot(uint id)
{
var list = new UiItemList(_ => (GpuTextureSlot.Unassigned, 0, 0)) { Width = 32, Height = 32 };
var list = new UiItemList(_ => (0u, 0, 0)) { Width = 32, Height = 32 };
dict[id] = list; slots[id] = list; root.AddChild(list);
}
@ -102,7 +101,7 @@ public class ToolbarControllerTests
},
};
}
var button = new UiButton(info, _ => (GpuTextureSlot.Unassigned, 0, 0)) { Width = 32, Height = 32 };
var button = new UiButton(info, _ => (0u, 0, 0)) { Width = 32, Height = 32 };
dict[id] = button;
root.AddChild(button);
}
@ -118,10 +117,10 @@ public class ToolbarControllerTests
{ new(Index: 0, ObjectId: 0x5001u, SpellId: 0) };
ToolbarController.Bind(layout, repo, Store(shortcuts),
iconIds: (_,_,_,_,_) => new GpuTextureSlot(0x77u), useItem: _ => { });
iconIds: (_,_,_,_,_) => 0x77u, useItem: _ => { });
Assert.Equal(0x5001u, slots[Row1[0]].Cell.ItemId);
Assert.Equal(new GpuTextureSlot(0x77u), slots[Row1[0]].Cell.IconTexture);
Assert.Equal(0x77u, slots[Row1[0]].Cell.IconTexture);
Assert.Equal(0u, slots[Row1[1]].Cell.ItemId); // others empty
}
@ -144,7 +143,7 @@ public class ToolbarControllerTests
layout,
repo,
Store(shortcuts),
iconIds: (_, _, _, _, _) => new GpuTextureSlot(0x77u),
iconIds: (_, _, _, _, _) => 0x77u,
useItem: _ => { });
Assert.Equal(0x5001u, slots[Row1[0]].Cell.ItemId);
@ -162,7 +161,7 @@ public class ToolbarControllerTests
{ new(Index: 2, ObjectId: 0x5002u, SpellId: 0) };
ToolbarController.Bind(layout, repo, Store(shortcuts),
iconIds: (_,_,_,_,_) => new GpuTextureSlot(0x88u), useItem: _ => { });
iconIds: (_,_,_,_,_) => 0x88u, useItem: _ => { });
Assert.Equal(0u, slots[Row1[2]].Cell.ItemId); // not bound yet
repo.AddOrUpdate(new ClientObject { ObjectId = 0x5002u, WeenieClassId = 1u, IconId = 0x06005678u });
@ -178,7 +177,7 @@ public class ToolbarControllerTests
var shortcuts = new List<ShortcutEntry>
{ new(Index: 2, ObjectId: 0x5002u, SpellId: 0) };
var controller = ToolbarController.Bind(layout, repo, Store(shortcuts),
iconIds: (_,_,_,_,_) => new GpuTextureSlot(0x88u), useItem: _ => { });
iconIds: (_,_,_,_,_) => 0x88u, useItem: _ => { });
controller.Dispose();
controller.Dispose();
@ -204,7 +203,7 @@ public class ToolbarControllerTests
var selection = new SelectionState();
ToolbarController.Bind(layout, repo, Store(shortcuts),
iconIds: (_,_,_,_,_) => new GpuTextureSlot(0x77u),
iconIds: (_,_,_,_,_) => 0x77u,
useItem: g => used = g,
selection: selection);
UiItemSlot cell = slots[Row1[0]].Cell;
@ -227,7 +226,7 @@ public class ToolbarControllerTests
var ctrl = ToolbarController.Bind(layout, repo,
new ShortcutStore(),
iconIds: (_,_,_,_,_) => GpuTextureSlot.Unassigned, useItem: _ => { });
iconIds: (_,_,_,_,_) => 0u, useItem: _ => { });
ctrl.BindPanelButtons(
panelId => panelId is RetailPanelCatalog.Inventory or RetailPanelCatalog.Character,
toggles.Add);
@ -278,7 +277,7 @@ public class ToolbarControllerTests
var ctrl = ToolbarController.Bind(layout, repo,
new ShortcutStore(),
iconIds: (_,_,_,_,_) => GpuTextureSlot.Unassigned,
iconIds: (_,_,_,_,_) => 0u,
useItem: _ => { },
itemInteraction: interaction);
ctrl.BindPanelButtons(
@ -305,7 +304,7 @@ public class ToolbarControllerTests
var puts = new List<(uint Item, uint Container, int Placement)>();
ToolbarController.Bind(layout, repo,
new ShortcutStore(),
iconIds: (_, _, _, _, _) => GpuTextureSlot.Unassigned,
iconIds: (_, _, _, _, _) => 0u,
useItem: _ => { },
playerGuid: () => player,
sendPutItemInContainer: (i, c, p) => puts.Add((i, c, p)));
@ -345,7 +344,7 @@ public class ToolbarControllerTests
layout,
repo,
new ShortcutStore(),
iconIds: static (_, _, _, _, _) => GpuTextureSlot.Unassigned,
iconIds: static (_, _, _, _, _) => 0u,
useItem: static _ => { },
itemInteraction: interaction,
playerGuid: () => player,
@ -395,7 +394,7 @@ public class ToolbarControllerTests
layout,
repo,
new ShortcutStore(),
iconIds: static (_, _, _, _, _) => GpuTextureSlot.Unassigned,
iconIds: static (_, _, _, _, _) => 0u,
useItem: static _ => { },
itemInteraction: interaction,
playerGuid: () => player,
@ -427,7 +426,7 @@ public class ToolbarControllerTests
var puts = new List<(uint Item, uint Container, int Placement)>();
ToolbarController.Bind(layout, repo,
new ShortcutStore(),
iconIds: (_, _, _, _, _) => GpuTextureSlot.Unassigned,
iconIds: (_, _, _, _, _) => 0u,
useItem: _ => { },
playerGuid: () => player,
sendPutItemInContainer: (i, c, p) => puts.Add((i, c, p)));
@ -448,7 +447,7 @@ public class ToolbarControllerTests
var repo = new ClientObjectTable();
var ctrl = ToolbarController.Bind(layout, repo,
new ShortcutStore(),
iconIds: (_,_,_,_,_) => GpuTextureSlot.Unassigned, useItem: _ => { });
iconIds: (_,_,_,_,_) => 0u, useItem: _ => { });
var inventoryButton = (UiButton)layout.FindElement(InventoryButtonId)!;
var characterButton = (UiButton)layout.FindElement(CharacterButtonId)!;
@ -525,7 +524,7 @@ public class ToolbarControllerTests
layout,
repo,
new ShortcutStore(),
iconIds: (_, _, _, _, _) => GpuTextureSlot.Unassigned,
iconIds: (_, _, _, _, _) => 0u,
useItem: _ => { },
itemInteraction: interaction,
selectedObjectId: () => selected);
@ -583,7 +582,7 @@ public class ToolbarControllerTests
layout,
repo,
new ShortcutStore(),
iconIds: (_, _, _, _, _) => GpuTextureSlot.Unassigned,
iconIds: (_, _, _, _, _) => 0u,
useItem: _ => { },
itemInteraction: interaction,
selectedObjectId: () => selection.SelectedObjectId ?? 0u,
@ -649,7 +648,7 @@ public class ToolbarControllerTests
layout,
repo,
new ShortcutStore(),
iconIds: (_, _, _, _, _) => GpuTextureSlot.Unassigned,
iconIds: (_, _, _, _, _) => 0u,
useItem: _ => { },
itemInteraction: interaction,
selectedObjectId: () => selection.SelectedObjectId ?? 0u,
@ -692,7 +691,7 @@ public class ToolbarControllerTests
layout,
repo,
new ShortcutStore(),
iconIds: (_, _, _, _, _) => GpuTextureSlot.Unassigned,
iconIds: (_, _, _, _, _) => 0u,
useItem: _ => { },
playerGuid: () => player);
var ammoButton = (UiButton)layout.FindElement(0x10000194u)!;
@ -731,7 +730,7 @@ public class ToolbarControllerTests
layout,
repo,
new ShortcutStore(),
iconIds: (_, _, _, _, _) => GpuTextureSlot.Unassigned,
iconIds: (_, _, _, _, _) => 0u,
useItem: _ => { },
playerGuid: () => player);
var ammoButton = (UiButton)layout.FindElement(0x10000194u)!;
@ -753,7 +752,7 @@ public class ToolbarControllerTests
layout,
repo,
new ShortcutStore(),
iconIds: (_, _, _, _, _) => GpuTextureSlot.Unassigned,
iconIds: (_, _, _, _, _) => 0u,
useItem: _ => { },
toggleCombat: () => toggles++);
@ -780,7 +779,7 @@ public class ToolbarControllerTests
layout,
repo,
Store(shortcuts),
iconIds: (_, _, _, _, _) => new GpuTextureSlot(1u),
iconIds: (_, _, _, _, _) => 1u,
useItem: id => used = id,
selectItem: id => selected = id);
@ -817,7 +816,7 @@ public class ToolbarControllerTests
layout,
repo,
Store(shortcuts),
iconIds: (_, _, _, _, _) => new GpuTextureSlot(1u),
iconIds: (_, _, _, _, _) => 1u,
useItem: _ => { },
itemInteraction: interaction,
selectItem: id => selection.Select(id, SelectionChangeSource.Toolbar),
@ -871,7 +870,7 @@ public class ToolbarControllerTests
layout,
repo,
Store(shortcuts),
iconIds: (_, _, _, _, _) => new GpuTextureSlot(1u),
iconIds: (_, _, _, _, _) => 1u,
useItem: _ => { },
itemInteraction: interaction);
@ -910,7 +909,7 @@ public class ToolbarControllerTests
layout,
repo,
new ShortcutStore(),
iconIds: (_, _, _, _, _) => new GpuTextureSlot(1u),
iconIds: (_, _, _, _, _) => 1u,
useItem: _ => { },
itemInteraction: interaction,
sendAddShortcut: entry => sends.Add(((uint)entry.Index, entry.ObjectId)));
@ -936,7 +935,7 @@ public class ToolbarControllerTests
ToolbarController.Bind(layout, repo,
new ShortcutStore(),
iconIds: (_,_,_,_,_) => GpuTextureSlot.Unassigned, useItem: _ => { });
iconIds: (_,_,_,_,_) =>0u, useItem: _ => { });
// Only peace indicator (index 0 = 0x10000192) is visible.
Assert.True (indicators[0x10000192u].Visible, "peace indicator should be visible after bind");
@ -956,7 +955,7 @@ public class ToolbarControllerTests
var ctrl = ToolbarController.Bind(layout, repo,
new ShortcutStore(),
iconIds: (_,_,_,_,_) => GpuTextureSlot.Unassigned, useItem: _ => { });
iconIds: (_,_,_,_,_) =>0u, useItem: _ => { });
ctrl.SetCombatMode(CombatMode.Melee);
@ -978,7 +977,7 @@ public class ToolbarControllerTests
ToolbarController.Bind(layout, repo,
new ShortcutStore(),
iconIds: (_,_,_,_,_) => GpuTextureSlot.Unassigned, useItem: _ => { },
iconIds: (_,_,_,_,_) =>0u, useItem: _ => { },
combatState: combat);
// Initially NonCombat after bind.
@ -1017,7 +1016,7 @@ public class ToolbarControllerTests
ToolbarController.Bind(layout, repo,
new ShortcutStore(),
iconIds: (_,_,_,_,_) => GpuTextureSlot.Unassigned, useItem: _ => { },
iconIds: (_,_,_,_,_) => 0u, useItem: _ => { },
regularDigits: FakeRegular, ghostedDigits: FakeGhosted);
// Top row: ShortcutNum == slot index, ghosted == false.
@ -1046,7 +1045,7 @@ public class ToolbarControllerTests
var repo = new ClientObjectTable();
var ctrl = ToolbarController.Bind(layout, repo,
new ShortcutStore(),
iconIds: (_,_,_,_,_) => GpuTextureSlot.Unassigned, useItem: _ => { },
iconIds: (_,_,_,_,_) => 0u, useItem: _ => { },
regularDigits: FakeRegular, ghostedDigits: FakeGhosted);
ctrl.SetCombatMode(mode);
@ -1056,7 +1055,7 @@ public class ToolbarControllerTests
var cell = slots[Row1[i]].Cell;
Assert.Equal(i, cell.ShortcutNum);
Assert.False(cell.ShortcutGhosted, $"top-row slot {i} should be regular in {mode}");
cell.SetItem((uint)(0x5000 + i), new GpuTextureSlot(0x99u));
cell.SetItem((uint)(0x5000 + i), 0x99u);
Assert.Same(FakeRegular, cell.ActiveDigitArray());
}
// Bottom row still has no number.
@ -1074,13 +1073,13 @@ public class ToolbarControllerTests
var repo = new ClientObjectTable();
var ctrl = ToolbarController.Bind(layout, repo,
new ShortcutStore(),
iconIds: (_,_,_,_,_) => GpuTextureSlot.Unassigned, useItem: _ => { },
iconIds: (_,_,_,_,_) => 0u, useItem: _ => { },
regularDigits: FakeRegular, ghostedDigits: FakeGhosted);
ctrl.SetCombatMode(CombatMode.Magic);
foreach (var id in Row1)
{
slots[id].Cell.SetItem(id, new GpuTextureSlot(0x99u));
slots[id].Cell.SetItem(id, 0x99u);
Assert.True(slots[id].Cell.ShortcutGhosted);
Assert.Same(FakeGhosted, slots[id].Cell.ActiveDigitArray());
}
@ -1106,7 +1105,7 @@ public class ToolbarControllerTests
ToolbarController.Bind(layout, repo,
new ShortcutStore(),
iconIds: (_,_,_,_,_) => GpuTextureSlot.Unassigned, useItem: _ => { },
iconIds: (_,_,_,_,_) => 0u, useItem: _ => { },
regularDigits: FakeRegular, ghostedDigits: FakeGhosted);
foreach (var id in Row1)
@ -1128,7 +1127,7 @@ public class ToolbarControllerTests
ToolbarController.Bind(layout, repo,
new ShortcutStore(),
iconIds: (_,_,_,_,_) => GpuTextureSlot.Unassigned, useItem: _ => { },
iconIds: (_,_,_,_,_) => 0u, useItem: _ => { },
regularDigits: FakeRegular, ghostedDigits: FakeGhosted, emptyDigits: FakeEmpty);
foreach (var id in Row1)
@ -1149,7 +1148,7 @@ public class ToolbarControllerTests
ToolbarController.Bind(layout, repo,
new ShortcutStore(),
iconIds: (_,_,_,_,_) => GpuTextureSlot.Unassigned, useItem: _ => { },
iconIds: (_,_,_,_,_) => 0u, useItem: _ => { },
regularDigits: FakeRegular, ghostedDigits: FakeGhosted, emptyDigits: null);
foreach (var id in Row1)
@ -1175,7 +1174,7 @@ public class ToolbarControllerTests
int iconCallCount = 0;
ToolbarController.Bind(layout, repo, Store(shortcuts),
iconIds: (_,_,_,_,_) => { iconCallCount++; return new GpuTextureSlot(0x77u); }, useItem: _ => { });
iconIds: (_,_,_,_,_) => { iconCallCount++; return 0x77u; }, useItem: _ => { });
int callsAfterBind = iconCallCount; // 1 call from initial Populate
@ -1200,7 +1199,7 @@ public class ToolbarControllerTests
int iconCallCount = 0;
ToolbarController.Bind(layout, repo, Store(shortcuts),
iconIds: (_,_,_,_,_) => { iconCallCount++; return new GpuTextureSlot(0x99u); }, useItem: _ => { });
iconIds: (_,_,_,_,_) => { iconCallCount++; return 0x99u; }, useItem: _ => { });
Assert.Equal(0, iconCallCount); // not called — item absent during initial Populate
Assert.Equal(0u, slots[Row1[1]].Cell.ItemId);
@ -1226,7 +1225,7 @@ public class ToolbarControllerTests
{ new(Index: 3, ObjectId: 0x5004u, SpellId: 0) };
ToolbarController.Bind(layout, repo, Store(shortcuts),
iconIds: (_,_,_,_,_) => new GpuTextureSlot(0xAAu), useItem: _ => { });
iconIds: (_,_,_,_,_) => 0xAAu, useItem: _ => { });
Assert.Equal(0x5004u, slots[Row1[3]].Cell.ItemId); // bound
@ -1253,7 +1252,7 @@ public class ToolbarControllerTests
int iconCallCount = 0;
ToolbarController.Bind(layout, repo, Store(shortcuts),
iconIds: (_,_,_,_,_) => { iconCallCount++; return new GpuTextureSlot(0xBBu); }, useItem: _ => { });
iconIds: (_,_,_,_,_) => { iconCallCount++; return 0xBBu; }, useItem: _ => { });
int callsAfterBind = iconCallCount; // 1 call for the shortcut item
@ -1275,7 +1274,7 @@ public class ToolbarControllerTests
var ctrl = ToolbarController.Bind(layout, repo,
new ShortcutStore(),
iconIds: (_,_,_,_,_) => GpuTextureSlot.Unassigned, useItem: _ => { });
iconIds: (_,_,_,_,_) => 0u, useItem: _ => { });
for (int i = 0; i < Row1.Length; i++)
{
@ -1300,7 +1299,7 @@ public class ToolbarControllerTests
var (layout, slots, _) = FakeToolbar();
var ctrl = ToolbarController.Bind(layout, new ClientObjectTable(),
new ShortcutStore(),
iconIds: (_,_,_,_,_) => GpuTextureSlot.Unassigned, useItem: _ => { });
iconIds: (_,_,_,_,_) => 0u, useItem: _ => { });
var list = slots[Row1[0]];
var payload = new ItemDragPayload(0x5001u, ItemDragSource.Inventory, 0, new UiItemSlot());
@ -1315,7 +1314,7 @@ public class ToolbarControllerTests
var (layout, slots, _) = FakeToolbar();
var ctrl = ToolbarController.Bind(layout, new ClientObjectTable(),
new ShortcutStore(),
iconIds: (_,_,_,_,_) => GpuTextureSlot.Unassigned, useItem: _ => { });
iconIds: (_,_,_,_,_) => 0u, useItem: _ => { });
var list = slots[Row1[0]];
var payload = new ItemDragPayload(0u, ItemDragSource.Inventory, 0, new UiItemSlot());
Assert.Equal(ItemDragAcceptance.None, ctrl.OnDragOver(list, list.Cell, payload));
@ -1344,7 +1343,7 @@ public class ToolbarControllerTests
uint selected = 0;
var ctrl = ToolbarController.Bind(layout, repo, Store(shortcuts),
iconIds: (_,_,_,_,_) => new GpuTextureSlot(0x77u), useItem: _ => { },
iconIds: (_,_,_,_,_) => 0x77u, useItem: _ => { },
sendAddShortcut: add, sendRemoveShortcut: rem,
selectItem: item => selected = item, selectedObjectId: () => selected);
Assert.Equal(0x5001u, slots[Row1[3]].Cell.ItemId);
@ -1369,7 +1368,7 @@ public class ToolbarControllerTests
new(Index: 5, ObjectId: 0x5002u, SpellId: 0) };
var (adds, removes) = NewSpies(out var add, out var rem);
var ctrl = ToolbarController.Bind(layout, repo, Store(shortcuts),
iconIds: (_,_,_,_,_) => new GpuTextureSlot(0x77u), useItem: _ => { },
iconIds: (_,_,_,_,_) => 0x77u, useItem: _ => { },
sendAddShortcut: add, sendRemoveShortcut: rem);
var payload = new ItemDragPayload(0x5001u, ItemDragSource.ShortcutBar, 3, slots[Row1[3]].Cell);
@ -1398,7 +1397,7 @@ public class ToolbarControllerTests
var (adds, _) = NewSpies(out var add, out var remove);
var controller = ToolbarController.Bind(
layout, repo, Store(shortcuts),
iconIds: (_, _, _, _, _) => new GpuTextureSlot(1u),
iconIds: (_, _, _, _, _) => 1u,
useItem: _ => { },
sendAddShortcut: add,
sendRemoveShortcut: remove);
@ -1421,7 +1420,7 @@ public class ToolbarControllerTests
{ new(Index: 3, ObjectId: 0x5001u, SpellId: 0) };
var (adds, removes) = NewSpies(out var add, out var rem);
var ctrl = ToolbarController.Bind(layout, repo, Store(shortcuts),
iconIds: (_,_,_,_,_) => new GpuTextureSlot(0x77u), useItem: _ => { },
iconIds: (_,_,_,_,_) => 0x77u, useItem: _ => { },
sendAddShortcut: add, sendRemoveShortcut: rem);
var payload = new ItemDragPayload(0x5001u, ItemDragSource.ShortcutBar, 3, slots[Row1[3]].Cell);
@ -1447,7 +1446,7 @@ public class ToolbarControllerTests
};
var wire = new List<string>();
var ctrl = ToolbarController.Bind(layout, repo, Store(shortcuts),
iconIds: (_, _, _, _, _) => new GpuTextureSlot(1u),
iconIds: (_, _, _, _, _) => 1u,
useItem: _ => { },
sendAddShortcut: entry => wire.Add($"add:{entry.Index}:{entry.ObjectId:X8}:{entry.SpellId:X8}"),
sendRemoveShortcut: slot => wire.Add($"remove:{slot}"));
@ -1480,7 +1479,7 @@ public class ToolbarControllerTests
};
var wire = new List<string>();
var ctrl = ToolbarController.Bind(layout, repo, Store(shortcuts),
iconIds: (_, _, _, _, _) => new GpuTextureSlot(1u),
iconIds: (_, _, _, _, _) => 1u,
useItem: _ => { },
sendAddShortcut: entry => wire.Add($"add:{entry.Index}:{entry.ObjectId:X8}:{entry.SpellId:X8}"),
sendRemoveShortcut: slot => wire.Add($"remove:{slot}"));
@ -1505,7 +1504,7 @@ public class ToolbarControllerTests
{ new(Index: 3, ObjectId: 0x5001u, SpellId: 0) };
var (adds, removes) = NewSpies(out var add, out var rem);
var ctrl = ToolbarController.Bind(layout, repo, Store(shortcuts),
iconIds: (_,_,_,_,_) => new GpuTextureSlot(0x77u), useItem: _ => { },
iconIds: (_,_,_,_,_) => 0x77u, useItem: _ => { },
sendAddShortcut: add, sendRemoveShortcut: rem);
var payload = new ItemDragPayload(0x5001u, ItemDragSource.ShortcutBar, 3, slots[Row1[3]].Cell);
@ -1524,7 +1523,7 @@ public class ToolbarControllerTests
var (layout, slots, _) = FakeToolbar();
ToolbarController.Bind(layout, new ClientObjectTable(),
new ShortcutStore(),
iconIds: (_,_,_,_,_) => GpuTextureSlot.Unassigned, useItem: _ => { });
iconIds: (_,_,_,_,_) => 0u, useItem: _ => { });
Assert.Equal(0x060011FAu, slots[Row1[0]].Cell.DragAcceptSprite); // green cross, not the ring F9
}
}