End of Phase O extraction. Final cleanup: - Dropped <ProjectReference> entries to WorldBuilder.Shared and Chorizite.OpenGLSDLBackend from both AcDream.App.csproj and AcDream.Core.csproj. - Added Chorizite.Core NuGet PackageReference to AcDream.Core.csproj (needed by Core.Rendering.Wb.TextureHelpers for TextureFormat enum; previously transitive through the WB project ref). - Added BCnEncoder.Net.ImageSharp (1.1.2) + SixLabors.ImageSharp (3.1.12) as direct PackageReferences to AcDream.App.csproj — previously transitive via Chorizite.OpenGLSDLBackend project; used directly by ObjectMeshManager. Item A (BaseObjectRenderManager static fields): - Inlined CurrentAtlas/CurrentVAO/CurrentIBO into a new RenderStateCache.cs static class (AcDream.App.Rendering.Wb namespace) — the 4 consumers (ManagedGLIndexBuffer, ManagedGLTexture, ManagedGLTextureArray, ParticleBatcher) all reference RenderStateCache.* instead of BaseObjectRenderManager.*. - Dropped using Chorizite.OpenGLSDLBackend.Lib from all 4 consumers and from WbDrawDispatcher (which had it only as a dead import). Item B (ActiveParticleEmitter.ObjectLandblock): - ObjectLandblock? erased to object?; WorldBuilder.Shared.Models.ObjectId? erased to ulong? — both fields are stored but never read by any consumer in our codebase. - Dropped both WB using directives from ActiveParticleEmitter.cs. Item C (IDatReaderWriter / IDatDatabase): - Verbatim copy of both interfaces into IDatReaderWriter.cs in AcDream.App.Rendering.Wb namespace — DatCollectionAdapter and ObjectMeshManager already live in that namespace, so no using changes needed. - Dropped using WorldBuilder.Shared.Services from DatCollectionAdapter.cs and ObjectMeshManager.cs. Additional extractions required by the reference drop: - GeometryUtils.cs: verbatim copy of WorldBuilder.Shared.Lib.GeometryUtils (float-precision overloads only; Vector3d double-precision overloads omitted — ObjectMeshManager uses only the float versions). - Dropped using WorldBuilder.Shared.Lib from ObjectMeshManager.cs. WbMeshAdapter.cs cleanup (spec O-D12): - Deleted _wbDats (DefaultDatReaderWriter) field + ctor init + Dispose call. - Deleted the [indoor-upload] NULL_RESULT diagnostic block (lines ~205-262) — its Phase 2 cell-resolution investigation is complete; its _wbDats.ResolveId dependency goes with this commit. - Deleted _pendingEnvCellRequests field + isPendingEnvCell tracking in Tick(). - Simplified Tick() to a clean drain loop. Deleted SplitFormulaDivergenceTest.cs — one-time N.5b data-collection sweep; job done. Verified acceptance criteria: - Zero <ProjectReference> to WorldBuilder.* / Chorizite.OpenGLSDLBackend.* in any csproj. - Zero 'using WorldBuilder.*' / 'using Chorizite.OpenGLSDLBackend.*' in src/. - DefaultDatReaderWriter referenced in zero places in src/ (comments only). Build green (0 warnings, 0 errors). Tests: 1154 total (-1 from deleted SplitFormulaDivergenceTest), 1146 pass, 8 pre-existing failures (unchanged from baseline — physics/input tests unrelated to this change). Spec: docs/superpowers/specs/2026-05-21-phase-o-dat-path-unification-design.md Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
184 lines
7.1 KiB
C#
184 lines
7.1 KiB
C#
using Chorizite.Core.Render.Enums;
|
|
using Chorizite.Core.Render.Vertex;
|
|
using Silk.NET.OpenGL;
|
|
using BufferUsage = Chorizite.Core.Render.Enums.BufferUsage;
|
|
|
|
namespace AcDream.App.Rendering.Wb {
|
|
/// <summary>
|
|
/// OpenGL index buffer
|
|
/// </summary>
|
|
public unsafe class ManagedGLIndexBuffer : IIndexBuffer {
|
|
private uint bufferId;
|
|
private readonly OpenGLGraphicsDevice _device;
|
|
private void* _mappedPtr;
|
|
private GL GL => _device.GL;
|
|
|
|
/// <inheritdoc />
|
|
public int Size { get; private set; }
|
|
|
|
/// <inheritdoc />
|
|
public BufferUsage Usage { get; private set; }
|
|
|
|
/// <summary>
|
|
/// Initializes a new instance of the <see cref="ManagedGLIndexBuffer"/> class.
|
|
/// </summary>
|
|
/// <param name="usage">Buffer usage</param>
|
|
/// <param name="size">The size of the buffer, in bytes</param>
|
|
public unsafe ManagedGLIndexBuffer(OpenGLGraphicsDevice device, BufferUsage usage, int size) {
|
|
_device = device;
|
|
Size = size;
|
|
Usage = usage;
|
|
|
|
// Generate the buffer
|
|
bufferId = GL.GenBuffer();
|
|
GpuMemoryTracker.TrackResourceAllocation(GpuResourceType.Buffer);
|
|
GLHelpers.CheckErrors(GL);
|
|
|
|
// Allocate the buffer with the specified size but no initial data
|
|
GL.BindBuffer(GLEnum.ElementArrayBuffer, bufferId);
|
|
GLHelpers.CheckErrors(GL);
|
|
|
|
if (_device.HasBufferStorage) {
|
|
var flags = BufferStorageMask.MapWriteBit | BufferStorageMask.MapPersistentBit | BufferStorageMask.MapCoherentBit | BufferStorageMask.DynamicStorageBit;
|
|
GL.BufferStorage(GLEnum.ElementArrayBuffer, (uint)Size, (void*)0, flags);
|
|
_mappedPtr = GL.MapBufferRange(GLEnum.ElementArrayBuffer, 0, (nuint)Size, MapBufferAccessMask.WriteBit | MapBufferAccessMask.PersistentBit | MapBufferAccessMask.CoherentBit);
|
|
} else {
|
|
GL.BufferData(BufferTargetARB.ElementArrayBuffer, (uint)Size, (void*)0, Usage.ToGL());
|
|
}
|
|
GLHelpers.CheckErrors(GL);
|
|
|
|
GpuMemoryTracker.TrackAllocation(Size, GpuResourceType.Buffer);
|
|
}
|
|
|
|
/// <inheritdoc />
|
|
public void SetData(uint[] data) {
|
|
SetData(data.AsSpan());
|
|
}
|
|
|
|
/// <inheritdoc />
|
|
public unsafe void SetData(Span<uint> data) {
|
|
uint dataSize = (uint)data.Length * sizeof(uint);
|
|
|
|
// Ensure the buffer size is sufficient
|
|
if (dataSize > Size) {
|
|
throw new ArgumentException($"Data size ({dataSize} bytes) exceeds buffer size ({Size} bytes).");
|
|
}
|
|
|
|
if (_mappedPtr != null) {
|
|
Span<uint> mappedSpan = new Span<uint>(_mappedPtr, data.Length);
|
|
data.CopyTo(mappedSpan);
|
|
} else {
|
|
GL.BindBuffer(GLEnum.ElementArrayBuffer, bufferId);
|
|
GLHelpers.CheckErrors(GL);
|
|
|
|
fixed (uint* dataPtr = &data[0]) {
|
|
GL.BufferData(GLEnum.ElementArrayBuffer, dataSize, (void*)dataPtr, Usage.ToGL());
|
|
}
|
|
GLHelpers.CheckErrors(GL);
|
|
GL.BindBuffer(GLEnum.ElementArrayBuffer, 0);
|
|
GLHelpers.CheckErrors(GL);
|
|
}
|
|
}
|
|
|
|
|
|
/// <inheritdoc />
|
|
public unsafe void SetSubData(Span<uint> data, int destinationOffsetBytes, int sourceOffsetElements = 0, int lengthElements = 0) {
|
|
if (Usage != BufferUsage.Dynamic) {
|
|
throw new InvalidOperationException("Cannot update a buffer that is not dynamic.");
|
|
}
|
|
|
|
if (lengthElements <= 0) {
|
|
lengthElements = data.Length - sourceOffsetElements;
|
|
}
|
|
|
|
uint dataSizeBytes = (uint)lengthElements * sizeof(uint);
|
|
|
|
if (dataSizeBytes == 0) {
|
|
return;
|
|
}
|
|
|
|
// Make sure we're not trying to write past the end of the buffer
|
|
if (destinationOffsetBytes + dataSizeBytes > Size) {
|
|
throw new ArgumentException($"Update would exceed buffer size. Buffer size: {Size}, Update range: {destinationOffsetBytes} to {destinationOffsetBytes + dataSizeBytes}");
|
|
}
|
|
|
|
if (_mappedPtr != null) {
|
|
Span<uint> mappedSpan = new Span<uint>((byte*)_mappedPtr + destinationOffsetBytes, lengthElements);
|
|
data.Slice(sourceOffsetElements, lengthElements).CopyTo(mappedSpan);
|
|
} else {
|
|
GL.BindBuffer(GLEnum.ElementArrayBuffer, bufferId);
|
|
GLHelpers.CheckErrors(GL);
|
|
|
|
fixed (uint* dataPtr = &data[sourceOffsetElements]) {
|
|
GL.BufferSubData(
|
|
GLEnum.ElementArrayBuffer,
|
|
destinationOffsetBytes,
|
|
dataSizeBytes,
|
|
(void*)dataPtr);
|
|
GLHelpers.CheckErrors(GL);
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
/// <inheritdoc />
|
|
public unsafe void SetSubData(uint[] data, int destinationOffsetBytes, int sourceOffsetElements = 0, int lengthElements = 0) {
|
|
if (Usage != BufferUsage.Dynamic) {
|
|
throw new InvalidOperationException("Cannot update a buffer that is not dynamic.");
|
|
}
|
|
|
|
if (lengthElements <= 0) {
|
|
lengthElements = data.Length - sourceOffsetElements;
|
|
}
|
|
|
|
uint dataSizeBytes = (uint)lengthElements * sizeof(uint);
|
|
|
|
if (dataSizeBytes == 0) {
|
|
return;
|
|
}
|
|
|
|
// Make sure we're not trying to write past the end of the buffer
|
|
if (destinationOffsetBytes + dataSizeBytes > Size) {
|
|
throw new ArgumentException($"Update would exceed buffer size. Buffer size: {Size}, Update range: {destinationOffsetBytes} to {destinationOffsetBytes + dataSizeBytes}");
|
|
}
|
|
|
|
GL.BindBuffer(GLEnum.ElementArrayBuffer, bufferId);
|
|
GLHelpers.CheckErrors(GL);
|
|
|
|
fixed (uint* dataPtr = &data[sourceOffsetElements]) {
|
|
GL.BufferSubData(
|
|
GLEnum.ElementArrayBuffer,
|
|
destinationOffsetBytes,
|
|
dataSizeBytes,
|
|
(void*)dataPtr);
|
|
GLHelpers.CheckErrors(GL);
|
|
}
|
|
}
|
|
|
|
/// <inheritdoc />
|
|
public void Bind() {
|
|
RenderStateCache.CurrentIBO = 0;
|
|
GL.BindBuffer(GLEnum.ElementArrayBuffer, bufferId);
|
|
GLHelpers.CheckErrors(GL);
|
|
}
|
|
|
|
/// <inheritdoc />
|
|
public void Unbind() {
|
|
GL.BindBuffer(GLEnum.ElementArrayBuffer, 0);
|
|
GLHelpers.CheckErrors(GL);
|
|
}
|
|
|
|
public unsafe void Dispose() {
|
|
_device.QueueGLAction(GL => {
|
|
if (bufferId != 0) {
|
|
GL.DeleteBuffer(bufferId);
|
|
GpuMemoryTracker.TrackResourceDeallocation(GpuResourceType.Buffer);
|
|
GLHelpers.CheckErrors(GL);
|
|
GpuMemoryTracker.TrackDeallocation(Size, GpuResourceType.Buffer);
|
|
bufferId = 0;
|
|
_mappedPtr = null;
|
|
}
|
|
});
|
|
}
|
|
}
|
|
}
|