Upload spectrum ring slots by offset
This commit is contained in:
parent
b44aaac7cc
commit
07a7864944
6 changed files with 49 additions and 26 deletions
|
|
@ -655,8 +655,9 @@ static int RunMimirSpectrumUploadSmoke()
|
|||
|
||||
var frame = runtime.Frame;
|
||||
var field = frame.Scene.FieldEvidenceFrame;
|
||||
var upload = field.ResourceUploads.SingleOrDefault(upload =>
|
||||
string.Equals(upload.ResourceKey, "mimir:resource:spectrum:field-upload", StringComparison.Ordinal));
|
||||
var matchingUploads = field.ResourceUploads
|
||||
.Where(upload => string.Equals(upload.ResourceKey, "mimir:resource:spectrum:field-upload", StringComparison.Ordinal))
|
||||
.ToArray();
|
||||
var matchingResources = field.Resources
|
||||
.Where(resource => string.Equals(resource.ResourceKey, "mimir:resource:spectrum:field-upload", StringComparison.Ordinal))
|
||||
.ToArray();
|
||||
|
|
@ -686,19 +687,30 @@ static int RunMimirSpectrumUploadSmoke()
|
|||
.ToArray();
|
||||
|
||||
Console.WriteLine(
|
||||
$"mimir-spectrum-upload-smoke resources={field.Resources.Count} uploads={field.ResourceUploads.Count} claims={field.Claims.Count} tubeLowerings={field.TubeSplineLowerings.Count} planned={plan.Packets.Count} errors={validation.HasErrors} legacySplines={frame.Scene.SplineFrame.Splines.Count} bufferFields={frame.Scene.BufferFieldFrame.SplineTubeFields.Count + frame.Scene.BufferFieldFrame.TextureSplineFields.Count} uploadFloats={upload?.Float32Data.Count ?? 0}");
|
||||
$"mimir-spectrum-upload-smoke resources={field.Resources.Count} uploads={field.ResourceUploads.Count} claims={field.Claims.Count} tubeLowerings={field.TubeSplineLowerings.Count} planned={plan.Packets.Count} errors={validation.HasErrors} legacySplines={frame.Scene.SplineFrame.Splines.Count} bufferFields={frame.Scene.BufferFieldFrame.SplineTubeFields.Count + frame.Scene.BufferFieldFrame.TextureSplineFields.Count} uploadFloats={matchingUploads.Sum(upload => upload.Float32Data.Count)}");
|
||||
|
||||
return
|
||||
!validation.HasErrors &&
|
||||
!frame.Scene.SplineFrame.HasInput &&
|
||||
!frame.Scene.BufferFieldFrame.HasInput &&
|
||||
upload is not null &&
|
||||
matchingUploads.Length == expectedHistoryCount &&
|
||||
matchingResources.Length == 1 &&
|
||||
matchingRamps.Length == 1 &&
|
||||
matchingLowerings.Length == 4 &&
|
||||
matchingClaims.Length == matchingLowerings.Length &&
|
||||
upload.Version == resource.Version &&
|
||||
upload.Float32Data.Count == resource.DepthOrCount &&
|
||||
matchingUploads.All(upload => upload.Version == resource.Version) &&
|
||||
matchingUploads.Sum(upload => upload.Float32Data.Count) == lowering.Width * expectedSourceLaneCapacity * expectedHistoryCount &&
|
||||
matchingUploads.All(upload =>
|
||||
upload.Float32Data.Count == lowering.Width * expectedSourceLaneCapacity &&
|
||||
upload.ElementOffset >= 0 &&
|
||||
upload.ElementOffset + upload.Float32Data.Count <= resource.DepthOrCount) &&
|
||||
matchingUploads.Select(upload => upload.ElementOffset).Order().SequenceEqual(
|
||||
new[]
|
||||
{
|
||||
0,
|
||||
lowering.Width * expectedSourceLaneCapacity * (expectedHistoryCapacity - 2),
|
||||
lowering.Width * expectedSourceLaneCapacity * (expectedHistoryCapacity - 1),
|
||||
}.Order()) &&
|
||||
resource.Kind == AquariumFieldResourceKind.StructuredBuffer &&
|
||||
resource.Residency == AquariumFieldResourceResidency.GpuResident &&
|
||||
resource.Access == AquariumFieldShaderAccess.ShaderResource &&
|
||||
|
|
@ -710,7 +722,6 @@ static int RunMimirSpectrumUploadSmoke()
|
|||
string.Equals(ramp.Format, "Rgba8Unorm", StringComparison.OrdinalIgnoreCase) &&
|
||||
string.Equals(ramp.SourceUri, @"D:\WIP4\Projects\Aetheria\Assets\Resources\Ramps\blackbody.png", StringComparison.OrdinalIgnoreCase) &&
|
||||
resource.Height == expectedSourceLaneCapacity * expectedHistoryCapacity &&
|
||||
lowering.Width * resource.Height == upload.Float32Data.Count &&
|
||||
matchingLowerings.All(item =>
|
||||
item.ColumnCount == expectedHistoryCount &&
|
||||
item.ColumnStride == expectedSourceLaneCapacity &&
|
||||
|
|
|
|||
|
|
@ -280,10 +280,12 @@ public sealed class MimirRuntime : IAquariumRuntime
|
|||
var resourceColumnCapacity = checked(spectrumSourceLaneCapacity * SpectrumHistoryWindowCount);
|
||||
var newestHistorySlot = PositiveModulo(-historyFrames[0].Sequence, SpectrumHistoryWindowCount);
|
||||
var rollingOffset = checked(newestHistorySlot * spectrumSourceLaneCapacity);
|
||||
var samples = new float[width * resourceColumnCapacity];
|
||||
var resourceUploads = new List<AquariumFieldResourceUpload>(historyFrames.Length);
|
||||
for (var historyIndex = 0; historyIndex < historyFrames.Length; historyIndex++)
|
||||
{
|
||||
var historySlot = PositiveModulo(-historyFrames[historyIndex].Sequence, SpectrumHistoryWindowCount);
|
||||
var uploadColumnOffset = checked(historySlot * spectrumSourceLaneCapacity);
|
||||
var samples = new float[width * spectrumSourceLaneCapacity];
|
||||
foreach (var spectrum in historyFrames[historyIndex].Spectra)
|
||||
{
|
||||
if (!sourceIndexById.TryGetValue(spectrum.SourceId, out var sourceIndex))
|
||||
|
|
@ -291,9 +293,16 @@ public sealed class MimirRuntime : IAquariumRuntime
|
|||
continue;
|
||||
}
|
||||
|
||||
var physicalColumn = historySlot * spectrumSourceLaneCapacity + sourceIndex;
|
||||
WriteNormalizedSpectrum(spectrum, samples.AsSpan(physicalColumn * width, width));
|
||||
WriteNormalizedSpectrum(spectrum, samples.AsSpan(sourceIndex * width, width));
|
||||
}
|
||||
|
||||
resourceUploads.Add(new AquariumFieldResourceUpload
|
||||
{
|
||||
ResourceKey = SpectrumFieldResourceKey,
|
||||
Version = unchecked((ulong)Math.Max(0, spectrumHistorySequence)),
|
||||
ElementOffset = checked(uploadColumnOffset * width),
|
||||
Float32Data = samples,
|
||||
});
|
||||
}
|
||||
|
||||
const string domainKey = "mimir:domain:spectrum:field-upload";
|
||||
|
|
@ -323,7 +332,7 @@ public sealed class MimirRuntime : IAquariumRuntime
|
|||
Format: "Float32",
|
||||
Width: width,
|
||||
Height: resourceColumnCapacity,
|
||||
DepthOrCount: samples.Length,
|
||||
DepthOrCount: checked(width * resourceColumnCapacity),
|
||||
StrideBytes: sizeof(float),
|
||||
ValidFromNs: 0,
|
||||
ValidUntilNs: 0,
|
||||
|
|
@ -422,12 +431,7 @@ public sealed class MimirRuntime : IAquariumRuntime
|
|||
ResourceUploads =
|
||||
[
|
||||
.. frame.ResourceUploads,
|
||||
new AquariumFieldResourceUpload
|
||||
{
|
||||
ResourceKey = SpectrumFieldResourceKey,
|
||||
Version = version,
|
||||
Float32Data = samples,
|
||||
},
|
||||
.. resourceUploads,
|
||||
],
|
||||
TubeSplineLowerings = [.. frame.TubeSplineLowerings, .. lowerings],
|
||||
AccumulationWindowSeconds = frame.AccumulationWindowSeconds,
|
||||
|
|
|
|||
Loading…
Reference in a new issue