Lands the working A8 indoor-rendering and streaming fixes accumulated this session. User has verified these visually to some degree (e.g. lifestone / translucent meshes confirmed fine under the FrontFace flip; bridge / wall / collision regressions confirmed fixed after travel); not every path has been exhaustively gated. The cellar-flap defect remains OPEN and will be solved the retail-faithful way via a dedicated brainstorm (see handoff docs). Rendering core (reviewed, high confidence): - EnvCellRenderer SSBO stride fix: upload packed Matrix4x4[] (64B) instead of the 80B CPU InstanceData struct the shader never expected — fixes the transform/texture "explosion" for any draw with >1 instance (cells that dedupe to a shared cellGeomId). Real root cause. - WB-style global FrontFace(CW) + per-batch CullMode carried through the MDI layout (GroupKey + BuildIndirectArrays + DrawIndirectRange split into same-cull runs with absolute uDrawIDOffset per run). - EntitySet partitioning (IndoorPass / OutdoorScenery / LiveDynamic) + WorldEntity.BuildingShellAnchorCellId so building shells scope to their dat-derived building cell instead of rendering everywhere. - RenderOutsideInAcdream (look into buildings from outside) + CollectVisiblePortalBuildings frustum cull of portal bounds. - Sky-when-inside-building + per-cell audit probe + GL-state probe. Streaming / perf (test-covered; not independently code-reviewed this session): - Near/far priority queues so near work wins over far; PromoteToNear carries full landblock + mesh data; LandblockEntriesWithoutAnimatedIndex avoids rebuilding the animated-lookup dict in the hot draw path. Fixes the bridge-not-appearing / missing-walls / broken-collision-after-travel regressions and improves post-transition FPS. Tooling + docs: - tools/A8CellAudit: offline dat cell/portal/building dumper (portals + buildings modes) — reproduces the cellar-flap investigation with no launch. - docs/research cellar-flap root-cause + option-2 handoff (the didInsideStencil double-duty finding + the WB-recursive design decision + brainstorm prompt), entity-taxonomy, replan, issue-78 visibility investigation. Diagnostics retained on purpose: ACDREAM_A8_DIAG_* gates, portal_stencil.vert provisional pos.w clamp, and the probe families are kept (env-var gated, zero cost when off) because the pending option-2 cellar-flap brainstorm needs them. Strip in the option-2 ship commit. Indoor branch stays behind ACDREAM_A8_INDOOR_BRANCH=1 (default off = pre-A8 visual). Build green; App tests + Core (streaming/dispatcher/loader) tests pass. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
289 lines
11 KiB
C#
289 lines
11 KiB
C#
using System.Threading.Tasks;
|
|
using AcDream.App.Streaming;
|
|
using AcDream.Core.World;
|
|
using DatReaderWriter.DBObjs;
|
|
using Xunit;
|
|
|
|
namespace AcDream.Core.Tests.Streaming;
|
|
|
|
public class LandblockStreamerTests
|
|
{
|
|
private const int SpinTimeoutMs = 2000;
|
|
private const int SpinStepMs = 10;
|
|
private const int SpinMaxIterations = SpinTimeoutMs / SpinStepMs;
|
|
|
|
[Fact]
|
|
public async Task Load_FollowedByDrain_ReturnsLoadedRecord()
|
|
{
|
|
var stubLandblock = new LoadedLandblock(
|
|
0xA9B4FFFEu,
|
|
new LandBlock(),
|
|
System.Array.Empty<WorldEntity>());
|
|
var stubMesh = new AcDream.Core.Terrain.LandblockMeshData(
|
|
System.Array.Empty<AcDream.Core.Terrain.TerrainVertex>(),
|
|
System.Array.Empty<uint>());
|
|
|
|
using var streamer = new LandblockStreamer(
|
|
loadLandblock: id => id == 0xA9B4FFFEu ? stubLandblock : null,
|
|
buildMeshOrNull: (_, _) => stubMesh);
|
|
|
|
streamer.Start();
|
|
streamer.EnqueueLoad(0xA9B4FFFEu);
|
|
|
|
// Spin until the worker produces a completion, with a 2s timeout.
|
|
LandblockStreamResult? result = null;
|
|
for (int i = 0; i < SpinMaxIterations && result is null; i++)
|
|
{
|
|
var drained = streamer.DrainCompletions(maxBatchSize: LandblockStreamer.DefaultDrainBatchSize);
|
|
if (drained.Count > 0) result = drained[0];
|
|
else await Task.Delay(SpinStepMs);
|
|
}
|
|
|
|
Assert.NotNull(result);
|
|
var loaded = Assert.IsType<LandblockStreamResult.Loaded>(result);
|
|
Assert.Equal(0xA9B4FFFEu, loaded.LandblockId);
|
|
Assert.Same(stubLandblock, loaded.Landblock);
|
|
}
|
|
|
|
[Fact]
|
|
public async Task LoadNear_OvertakesQueuedFarLoads()
|
|
{
|
|
var callOrder = new System.Collections.Generic.List<(uint Id, LandblockStreamJobKind Kind)>();
|
|
var stubMesh = new AcDream.Core.Terrain.LandblockMeshData(
|
|
System.Array.Empty<AcDream.Core.Terrain.TerrainVertex>(),
|
|
System.Array.Empty<uint>());
|
|
|
|
using var streamer = new LandblockStreamer(
|
|
loadLandblock: (id, kind) =>
|
|
{
|
|
callOrder.Add((id, kind));
|
|
return new LoadedLandblock(id, new LandBlock(), System.Array.Empty<WorldEntity>());
|
|
},
|
|
buildMeshOrNull: (_, _) => stubMesh);
|
|
|
|
streamer.EnqueueLoad(0xAAAAFFFFu, LandblockStreamJobKind.LoadFar);
|
|
streamer.EnqueueLoad(0xBBBBFFFFu, LandblockStreamJobKind.LoadFar);
|
|
streamer.EnqueueLoad(0xCCCCFFFFu, LandblockStreamJobKind.LoadFar);
|
|
streamer.EnqueueLoad(0xDDDDFFFFu, LandblockStreamJobKind.LoadNear);
|
|
streamer.Start();
|
|
|
|
var result = await DrainFirstAsync(streamer);
|
|
|
|
var loaded = Assert.IsType<LandblockStreamResult.Loaded>(result);
|
|
Assert.Equal(0xDDDDFFFFu, loaded.LandblockId);
|
|
Assert.Equal((0xDDDDFFFFu, LandblockStreamJobKind.LoadNear), callOrder[0]);
|
|
}
|
|
|
|
[Fact]
|
|
public async Task PromoteToNear_ProducesPromotedWithMeshData()
|
|
{
|
|
int meshBuildCalls = 0;
|
|
var entity = new WorldEntity
|
|
{
|
|
Id = 7,
|
|
SourceGfxObjOrSetupId = 0,
|
|
Position = System.Numerics.Vector3.Zero,
|
|
Rotation = System.Numerics.Quaternion.Identity,
|
|
MeshRefs = System.Array.Empty<MeshRef>()
|
|
};
|
|
|
|
using var streamer = new LandblockStreamer(
|
|
loadLandblock: (id, kind) => new LoadedLandblock(id, new LandBlock(), new[] { entity }),
|
|
buildMeshOrNull: (_, _) =>
|
|
{
|
|
meshBuildCalls++;
|
|
return new AcDream.Core.Terrain.LandblockMeshData(
|
|
System.Array.Empty<AcDream.Core.Terrain.TerrainVertex>(),
|
|
System.Array.Empty<uint>());
|
|
});
|
|
|
|
streamer.EnqueueLoad(0xA9B4FFFFu, LandblockStreamJobKind.PromoteToNear);
|
|
streamer.Start();
|
|
|
|
var result = await DrainFirstAsync(streamer);
|
|
|
|
var promoted = Assert.IsType<LandblockStreamResult.Promoted>(result);
|
|
Assert.Equal(0xA9B4FFFFu, promoted.LandblockId);
|
|
Assert.Same(entity, promoted.Entities[0]);
|
|
Assert.NotNull(promoted.MeshData);
|
|
Assert.Equal(1, meshBuildCalls);
|
|
}
|
|
|
|
[Fact]
|
|
public async Task PromoteToNear_OvertakesAndSupersedesQueuedFarLoadForSameLandblock()
|
|
{
|
|
var callOrder = new System.Collections.Generic.List<(uint Id, LandblockStreamJobKind Kind)>();
|
|
var stubMesh = new AcDream.Core.Terrain.LandblockMeshData(
|
|
System.Array.Empty<AcDream.Core.Terrain.TerrainVertex>(),
|
|
System.Array.Empty<uint>());
|
|
|
|
using var streamer = new LandblockStreamer(
|
|
loadLandblock: (id, kind) =>
|
|
{
|
|
callOrder.Add((id, kind));
|
|
return new LoadedLandblock(id, new LandBlock(), System.Array.Empty<WorldEntity>());
|
|
},
|
|
buildMeshOrNull: (_, _) => stubMesh);
|
|
|
|
streamer.EnqueueLoad(0xA9B4FFFFu, LandblockStreamJobKind.LoadFar);
|
|
streamer.EnqueueLoad(0xA9B4FFFFu, LandblockStreamJobKind.PromoteToNear);
|
|
streamer.Start();
|
|
|
|
var result = await DrainFirstAsync(streamer);
|
|
|
|
var promoted = Assert.IsType<LandblockStreamResult.Promoted>(result);
|
|
Assert.Equal(0xA9B4FFFFu, promoted.LandblockId);
|
|
Assert.Equal((0xA9B4FFFFu, LandblockStreamJobKind.PromoteToNear), callOrder[0]);
|
|
}
|
|
|
|
[Fact]
|
|
public async Task Load_WhenLoaderReturnsNull_ReportsFailed()
|
|
{
|
|
using var streamer = new LandblockStreamer(
|
|
loadLandblock: _ => null);
|
|
|
|
streamer.Start();
|
|
streamer.EnqueueLoad(0x12340000u);
|
|
|
|
LandblockStreamResult? result = null;
|
|
for (int i = 0; i < SpinMaxIterations && result is null; i++)
|
|
{
|
|
var drained = streamer.DrainCompletions(LandblockStreamer.DefaultDrainBatchSize);
|
|
if (drained.Count > 0) result = drained[0];
|
|
else await Task.Delay(SpinStepMs);
|
|
}
|
|
|
|
Assert.NotNull(result);
|
|
Assert.IsType<LandblockStreamResult.Failed>(result);
|
|
}
|
|
|
|
[Fact]
|
|
public async Task Load_WhenBuildMeshReturnsNull_ReportsFailed()
|
|
{
|
|
// Phase A.5 T10-T12 follow-up: the mesh-build factory may return
|
|
// null (e.g., LandBlock dat missing or corrupt). The worker must
|
|
// emit Failed in that case instead of constructing Loaded with a
|
|
// null MeshData (which would NRE downstream).
|
|
var stubLandblock = new LoadedLandblock(
|
|
0xABCDFFFEu,
|
|
new LandBlock(),
|
|
System.Array.Empty<WorldEntity>());
|
|
|
|
using var streamer = new LandblockStreamer(
|
|
loadLandblock: _ => stubLandblock,
|
|
buildMeshOrNull: (_, _) => null); // mesh-build returns null
|
|
|
|
streamer.Start();
|
|
streamer.EnqueueLoad(0xABCDFFFEu);
|
|
|
|
LandblockStreamResult? result = null;
|
|
for (int i = 0; i < SpinMaxIterations && result is null; i++)
|
|
{
|
|
var drained = streamer.DrainCompletions(LandblockStreamer.DefaultDrainBatchSize);
|
|
if (drained.Count > 0) result = drained[0];
|
|
else await Task.Delay(SpinStepMs);
|
|
}
|
|
|
|
Assert.NotNull(result);
|
|
var failed = Assert.IsType<LandblockStreamResult.Failed>(result);
|
|
Assert.Equal(0xABCDFFFEu, failed.LandblockId);
|
|
Assert.Contains("mesh", failed.Error, System.StringComparison.OrdinalIgnoreCase);
|
|
}
|
|
|
|
[Fact]
|
|
public async Task Load_WhenLoaderThrows_ReportsFailedWithMessage()
|
|
{
|
|
using var streamer = new LandblockStreamer(
|
|
loadLandblock: _ => throw new System.InvalidOperationException("boom"));
|
|
|
|
streamer.Start();
|
|
streamer.EnqueueLoad(0x55550000u);
|
|
|
|
LandblockStreamResult? result = null;
|
|
for (int i = 0; i < SpinMaxIterations && result is null; i++)
|
|
{
|
|
var drained = streamer.DrainCompletions(LandblockStreamer.DefaultDrainBatchSize);
|
|
if (drained.Count > 0) result = drained[0];
|
|
else await Task.Delay(SpinStepMs);
|
|
}
|
|
|
|
var failed = Assert.IsType<LandblockStreamResult.Failed>(result);
|
|
Assert.Contains("boom", failed.Error);
|
|
}
|
|
|
|
[Fact]
|
|
public async Task Unload_ProducesUnloadedResult()
|
|
{
|
|
using var streamer = new LandblockStreamer(loadLandblock: _ => null);
|
|
|
|
streamer.Start();
|
|
streamer.EnqueueUnload(0xABCD0000u);
|
|
|
|
LandblockStreamResult? result = null;
|
|
for (int i = 0; i < SpinMaxIterations && result is null; i++)
|
|
{
|
|
var drained = streamer.DrainCompletions(LandblockStreamer.DefaultDrainBatchSize);
|
|
if (drained.Count > 0) result = drained[0];
|
|
else await Task.Delay(SpinStepMs);
|
|
}
|
|
|
|
var unloaded = Assert.IsType<LandblockStreamResult.Unloaded>(result);
|
|
Assert.Equal(0xABCD0000u, unloaded.LandblockId);
|
|
}
|
|
|
|
[Fact]
|
|
public async Task Load_ExecutesLoaderOnWorkerThread()
|
|
{
|
|
// Phase A.5 T11: the load delegate now runs on the dedicated worker
|
|
// thread (not the calling/render thread). This test verifies the
|
|
// async hand-off: EnqueueLoad returns immediately and the result
|
|
// appears in the outbox only after the worker processes the inbox.
|
|
int testThreadId = System.Environment.CurrentManagedThreadId;
|
|
int? loaderThreadId = null;
|
|
var stubLandblock = new LoadedLandblock(
|
|
0x77770FFEu,
|
|
new LandBlock(),
|
|
System.Array.Empty<WorldEntity>());
|
|
var stubMesh = new AcDream.Core.Terrain.LandblockMeshData(
|
|
System.Array.Empty<AcDream.Core.Terrain.TerrainVertex>(),
|
|
System.Array.Empty<uint>());
|
|
|
|
using var streamer = new LandblockStreamer(
|
|
loadLandblock: id =>
|
|
{
|
|
loaderThreadId = System.Environment.CurrentManagedThreadId;
|
|
return stubLandblock;
|
|
},
|
|
buildMeshOrNull: (_, _) => stubMesh);
|
|
|
|
streamer.Start();
|
|
streamer.EnqueueLoad(0x77770FFEu);
|
|
|
|
// Spin until the worker produces a completion.
|
|
LandblockStreamResult? result = null;
|
|
for (int i = 0; i < SpinMaxIterations && result is null; i++)
|
|
{
|
|
var drained = streamer.DrainCompletions(LandblockStreamer.DefaultDrainBatchSize);
|
|
if (drained.Count > 0) result = drained[0];
|
|
else await Task.Delay(SpinStepMs);
|
|
}
|
|
|
|
Assert.NotNull(result);
|
|
Assert.IsType<LandblockStreamResult.Loaded>(result);
|
|
// The loader MUST have run on a different thread than the test thread.
|
|
Assert.NotNull(loaderThreadId);
|
|
Assert.NotEqual(testThreadId, loaderThreadId.Value);
|
|
}
|
|
|
|
private static async Task<LandblockStreamResult> DrainFirstAsync(LandblockStreamer streamer)
|
|
{
|
|
for (int i = 0; i < SpinMaxIterations; i++)
|
|
{
|
|
var drained = streamer.DrainCompletions(maxBatchSize: LandblockStreamer.DefaultDrainBatchSize);
|
|
if (drained.Count > 0) return drained[0];
|
|
await Task.Delay(SpinStepMs);
|
|
}
|
|
|
|
throw new Xunit.Sdk.XunitException("Timed out waiting for streamer completion.");
|
|
}
|
|
}
|