mirror of
https://github.com/MobileGL-Dev/MobileGL
synced 2026-09-08 04:08:32 +09:00
Introduce a Mesa pipe_resource-style PipeResource that owns a GL buffer's bytes and its backend GPU resource, abstracting WHERE the authoritative bytes live: - Shadow mode (non-persistent buffers): a CPU Vector; the backend keeps its own GPU copy in sync via BufferBackendOps, exactly as before. - Persistent mode (coherent GL_MAP_PERSISTENT maps): the backend's host-visible, COHERENT, persistently-mapped GPU memory is the single source of truth. The app writes into it directly, every reader resolves against it, and NO per-write backend transfer happens. The CPU shadow is released. BufferObject no longer owns a raw shadow Vector; it holds a PipeResource and exposes one accessor, MappedData(), that all readers go through. Every buffer-data consumer (UBO payload, PBO texture upload, indirect draws, resident/streamed uploads, both backends) was migrated from GetDataReadOnly()->data() to MappedData(), so a persistent buffer's readers see GPU memory - not a stale shadow. That stale-shadow inconsistency is what corrupted rendering (wrong UBOs -> misplaced/"lost" vertices) in the first zero-copy attempt (625c8a6, reverted in 896cafc); routing every consumer through one accessor makes it structurally impossible. Backends provide the map via BufferBackendOps::AcquirePersistentMap: - DirectVulkan: a HOST_VISIBLE|HOST_COHERENT (required, not just requested), persistently mapped resident VkBuffer carrying every usage, seeded from the shadow, never recreated; AcquireResidentSlice binds it directly. - DirectGLES: EXT_buffer_storage immutable persistent+coherent glMapBufferRange, falling back to the shadow when the extension is absent. Fixes the ~7GB GpuMemory OOM + 100%-CPU/ANR running modern Blaze3D Minecraft on both Magma and Espryt (per-draw whole-buffer re-upload of the coherent persistent ring buffer), without the coherency/stale-read hazards of the reverted attempt. BufferTest: zero-copy stress guard (15,360 draws -> 0 per-draw transfers, and every reader resolves to GPU memory) + a shadow-fallback test. Host suite: 203/203 pass. Device verification pending.
358 lines
15 KiB
C++
358 lines
15 KiB
C++
// MobileGL - MobileGL/MG_State/GLState/BufferState/BufferObject.cpp
|
|
// Copyright (c) 2025-2026 MobileGL-Dev
|
|
// Licensed under the GNU Lesser General Public License v3.0:
|
|
// https://www.gnu.org/licenses/gpl-3.0.txt
|
|
// https://www.gnu.org/licenses/lgpl-3.0.txt
|
|
// SPDX-License-Identifier: LGPL-3.0-only
|
|
// End of Source File Header
|
|
|
|
#include "BufferObject.h"
|
|
#include <algorithm>
|
|
|
|
namespace MobileGL::MG_State::GLState {
|
|
namespace {
|
|
const BufferBackendOps* g_bufferBackendOps = nullptr;
|
|
}
|
|
|
|
void SetBufferBackendOps(const BufferBackendOps* ops) {
|
|
g_bufferBackendOps = ops;
|
|
}
|
|
|
|
const BufferBackendOps* GetBufferBackendOps() {
|
|
return g_bufferBackendOps;
|
|
}
|
|
|
|
BufferObject::BufferObject(Uint externalIndex)
|
|
: m_externalIndex(externalIndex), m_size(0), m_usage(BufferUsage::StaticDraw), m_isMapped(false),
|
|
m_mappingAccess(BufferMappingAccessBit::Null), m_mappedRange({0, 0}), m_ownsStagingData{} {}
|
|
|
|
BufferObject::~BufferObject() {
|
|
if (m_resource.Backend() && g_bufferBackendOps && g_bufferBackendOps->OnDestroy) {
|
|
g_bufferBackendOps->OnDestroy(m_resource.ReleaseBackend());
|
|
}
|
|
}
|
|
|
|
void BufferObject::NotifyRespecify() {
|
|
++m_changeSerial;
|
|
if (g_bufferBackendOps && g_bufferBackendOps->Respecify) {
|
|
g_bufferBackendOps->Respecify(*this);
|
|
}
|
|
}
|
|
|
|
void BufferObject::NotifySubData(SizeT offset, SizeT size) {
|
|
++m_changeSerial;
|
|
if (size == 0) return;
|
|
if (g_bufferBackendOps && g_bufferBackendOps->SubData) {
|
|
g_bufferBackendOps->SubData(*this, offset, size);
|
|
}
|
|
}
|
|
|
|
void BufferObject::NotifyFlushMappedRange(Range1D range, Flags<BufferMappingAccessBit> appAccess) {
|
|
++m_changeSerial;
|
|
if (range.start >= range.end) return;
|
|
if (g_bufferBackendOps && g_bufferBackendOps->FlushMappedRange) {
|
|
g_bufferBackendOps->FlushMappedRange(*this, range, appAccess);
|
|
}
|
|
}
|
|
|
|
void BufferObject::NotifyContentWrite(SizeT offset, SizeT size) {
|
|
if (m_resource.IsGpuResident()) {
|
|
// The write already landed in coherent GPU memory; the backend has no separate
|
|
// copy to sync. Only bump the serial so cached transient slices invalidate.
|
|
++m_changeSerial;
|
|
return;
|
|
}
|
|
NotifySubData(offset, size);
|
|
}
|
|
|
|
void BufferObject::Respecify(SizeT size, const void* data) {
|
|
ReleaseMemory();
|
|
m_size = size;
|
|
m_resource.ResizeShadow(size);
|
|
if (data && size > 0) {
|
|
Memcpy(m_resource.Bytes(), data, size);
|
|
}
|
|
m_isImmutableStorage = false;
|
|
m_storageFlags = 0;
|
|
NotifyRespecify();
|
|
}
|
|
|
|
void BufferObject::Resize(SizeT size) {
|
|
Respecify(size, nullptr);
|
|
}
|
|
|
|
void BufferObject::AllocateImmutableStorage(SizeT size, const void* data, GLbitfield storageFlags) {
|
|
ReleaseMemory();
|
|
m_size = size;
|
|
m_resource.ResizeShadow(size);
|
|
if (data) {
|
|
Memcpy(m_resource.Bytes(), data, size);
|
|
} else if (size > 0) {
|
|
Memset(m_resource.Bytes(), 0, size);
|
|
}
|
|
m_isImmutableStorage = true;
|
|
m_storageFlags = storageFlags;
|
|
NotifyRespecify();
|
|
}
|
|
|
|
void BufferObject::UploadData(DataPtr data, SizeT atOffset) {
|
|
MOBILEGL_ASSERT(atOffset + data.size <= m_size,
|
|
"UploadData out of bounds: atOffset (%zu) + data.size (%zu) > m_size (%zu)", atOffset,
|
|
data.size, m_size);
|
|
MOBILEGL_ASSERT(!m_isMapped || (m_mappingAccess & BufferMappingAccessBit::Persistent),
|
|
"Cannot upload data while buffer is non-persistently mapped.");
|
|
Memcpy(m_resource.Bytes() + atOffset, data.data, data.size);
|
|
NotifyContentWrite(atOffset, data.size);
|
|
}
|
|
|
|
void BufferObject::SetUsage(BufferUsage usage) {
|
|
m_usage = usage;
|
|
}
|
|
|
|
void BufferObject::ReleaseMemory() {
|
|
if (!m_isMapped) return;
|
|
|
|
if (m_mappingAccess & BufferMappingAccessBit::Write) { // if we wrote to the buffer
|
|
// A persistent GPU-resident map wrote straight into coherent GPU memory, so
|
|
// there is nothing to copy back and no range to push down on unmap.
|
|
if (!m_resource.IsGpuResident() &&
|
|
!(m_mappingAccess & BufferMappingAccessBit::FlushExplicit)) { // if we didn't flush explicitly
|
|
if (!(m_mappingAccess & BufferMappingAccessBit::Persistent)) {
|
|
Memcpy(m_resource.Bytes() + m_mappedRange.start, m_stagingData.data(),
|
|
m_mappedRange.end - m_mappedRange.start);
|
|
}
|
|
NotifyFlushMappedRange(m_mappedRange, m_mappingAccess);
|
|
}
|
|
|
|
m_stagingData.clear();
|
|
}
|
|
|
|
m_isMapped = false;
|
|
m_mappingAccess = BufferMappingAccessBit::Null;
|
|
m_mappedRange = {0, 0};
|
|
m_ownsStagingData = false;
|
|
}
|
|
|
|
void BufferObject::FlushMemoryRange(SizeT offset, SizeT length) {
|
|
MOBILEGL_ASSERT(m_isMapped, "Buffer must be mapped to flush memory range.");
|
|
MOBILEGL_ASSERT((m_mappingAccess & BufferMappingAccessBit::FlushExplicit),
|
|
"Buffer must be mapped with FlushExplicit access to flush memory range.");
|
|
MOBILEGL_ASSERT((m_mappingAccess & BufferMappingAccessBit::Write),
|
|
"Buffer must be mapped with Write access to flush memory range.");
|
|
|
|
SizeT start = m_mappedRange.start + offset;
|
|
SizeT end = start + length;
|
|
MOBILEGL_ASSERT(end <= m_mappedRange.end, "Flush range out of bounds: mappedRange.end (%zu) < end (%zu)",
|
|
m_mappedRange.end, end);
|
|
|
|
// FLUSH_EXPLICIT maps are never GPU-resident (only coherent maps are adopted), so
|
|
// the staged bytes must be copied into the shadow before the backend reads them.
|
|
if (!(m_mappingAccess & BufferMappingAccessBit::Persistent)) {
|
|
Memcpy(m_resource.Bytes() + start, m_stagingData.data() + offset, length);
|
|
}
|
|
NotifyFlushMappedRange({start, end}, m_mappingAccess);
|
|
}
|
|
|
|
void BufferObject::SyncPersistentMappedRange() {
|
|
if (!m_isMapped) return;
|
|
// GPU-resident: the app already wrote directly into coherent GPU memory. This is
|
|
// the whole point of the persistent-map path - the per-draw whole-buffer re-upload
|
|
// that used to run here is gone.
|
|
if (m_resource.IsGpuResident()) return;
|
|
if (!(m_mappingAccess & BufferMappingAccessBit::Persistent)) return;
|
|
if (!(m_mappingAccess & BufferMappingAccessBit::Write)) return;
|
|
if (m_mappingAccess & BufferMappingAccessBit::FlushExplicit) return;
|
|
if (m_mappedRange.start >= m_mappedRange.end) return;
|
|
|
|
NotifySubData(m_mappedRange.start, m_mappedRange.end - m_mappedRange.start);
|
|
}
|
|
|
|
void BufferObject::SyncMappedRangeForGpuRead(Range1D range) {
|
|
if (!m_isMapped) return;
|
|
// GPU-resident maps already alias GPU-visible memory; nothing to push.
|
|
if (m_resource.IsGpuResident()) return;
|
|
if (!(m_mappingAccess & BufferMappingAccessBit::Persistent)) return;
|
|
if (!(m_mappingAccess & BufferMappingAccessBit::Write)) return;
|
|
// Non-FLUSH_EXPLICIT persistent maps are already covered wholesale by
|
|
// SyncPersistentMappedRange.
|
|
if (!(m_mappingAccess & BufferMappingAccessBit::FlushExplicit)) return;
|
|
|
|
const SizeT start = std::max(range.start, m_mappedRange.start);
|
|
const SizeT end = std::min({range.end, m_mappedRange.end, m_size});
|
|
if (start >= end) return;
|
|
|
|
NotifySubData(start, end - start);
|
|
}
|
|
|
|
void BufferObject::WritebackFromBackend(DataPtr data, SizeT atOffset) {
|
|
MOBILEGL_ASSERT(atOffset + data.size <= m_size,
|
|
"WritebackFromBackend out of bounds: atOffset (%zu) + data.size (%zu) > m_size (%zu)", atOffset,
|
|
data.size, m_size);
|
|
Memcpy(m_resource.Bytes() + atOffset, data.data, data.size);
|
|
++m_changeSerial;
|
|
}
|
|
|
|
void BufferObject::UploadSubData(DataPtr data, SizeT atOffset) {
|
|
MOBILEGL_ASSERT(!m_isMapped || (m_mappingAccess & BufferMappingAccessBit::Persistent),
|
|
"Cannot upload sub data while buffer is non-persistently mapped.");
|
|
MOBILEGL_ASSERT(atOffset + data.size <= m_size,
|
|
"UploadSubData out of bounds: atOffset (%zu) + data.size (%zu) > m_size (%zu)", atOffset,
|
|
data.size, m_size);
|
|
|
|
Memcpy(m_resource.Bytes() + atOffset, data.data, data.size);
|
|
NotifyContentWrite(atOffset, data.size);
|
|
}
|
|
|
|
void BufferObject::DownloadSubData(void* dst, SizeT atOffset, SizeT size) const {
|
|
MOBILEGL_ASSERT(atOffset + size <= m_size,
|
|
"DownloadSubData out of bounds: atOffset (%zu) + size (%zu) > m_size (%zu)", atOffset, size,
|
|
m_size);
|
|
Memcpy(dst, m_resource.Bytes() + atOffset, size);
|
|
}
|
|
|
|
void BufferObject::CopyDataFrom(const SharedPtr<BufferObject>& src, SizeT srcOffset, SizeT dstOffset, SizeT size) {
|
|
MOBILEGL_ASSERT(!m_isMapped || (m_mappingAccess & BufferMappingAccessBit::Persistent),
|
|
"Cannot copy data while destination buffer is non-persistently mapped.");
|
|
MOBILEGL_ASSERT(!src->IsMapped() || (src->GetMappingAccess() & BufferMappingAccessBit::Persistent),
|
|
"Cannot copy data from a buffer that is non-persistently mapped.");
|
|
MOBILEGL_ASSERT(srcOffset + size <= src->GetSize(),
|
|
"Source buffer copy out of bounds: srcOffset (%zu) + size (%zu) > src->GetSize() (%zu)",
|
|
srcOffset, size, src->GetSize());
|
|
MOBILEGL_ASSERT(dstOffset + size <= m_size,
|
|
"Destination buffer copy out of bounds: dstOffset (%zu) + size (%zu) > m_size (%zu)", dstOffset,
|
|
size, m_size);
|
|
|
|
Memcpy(m_resource.Bytes() + dstOffset, src->m_resource.Bytes() + srcOffset, size);
|
|
NotifyContentWrite(dstOffset, size);
|
|
}
|
|
|
|
void* BufferObject::AcquireMemory(Bool markMapped, Bool read, Bool write) {
|
|
if (markMapped) {
|
|
m_isMapped = true;
|
|
m_mappingAccess = (read ? BufferMappingAccessBit::Read : BufferMappingAccessBit::Null) |
|
|
(write ? BufferMappingAccessBit::Write : BufferMappingAccessBit::Null);
|
|
m_mappedRange = {0, m_size};
|
|
|
|
if (m_mappingAccess & BufferMappingAccessBit::Write) {
|
|
m_stagingData.resize(m_size);
|
|
m_ownsStagingData = true;
|
|
|
|
if (!(m_mappingAccess &
|
|
(BufferMappingAccessBit::InvalidateRange | BufferMappingAccessBit::InvalidateBuffer))) {
|
|
Memcpy(m_stagingData.data(), m_resource.Bytes(), m_size);
|
|
}
|
|
|
|
return m_stagingData.data();
|
|
}
|
|
}
|
|
|
|
return m_resource.Bytes();
|
|
}
|
|
|
|
void* BufferObject::AcquireMemoryRange(Range1D range, Flags<BufferMappingAccessBit> access) {
|
|
MOBILEGL_ASSERT(range.end <= m_size && range.start <= range.end,
|
|
"AcquireMemoryRange out of bounds: range (%zu, %zu) exceeds m_size (%zu)", range.start,
|
|
range.end, m_size);
|
|
m_isMapped = true;
|
|
m_mappingAccess = access;
|
|
m_mappedRange = range;
|
|
|
|
if (access & BufferMappingAccessBit::Persistent) {
|
|
m_ownsStagingData = false;
|
|
// Zero-copy: for a coherent (non-FLUSH_EXPLICIT) persistent write map, ask the
|
|
// active backend for host-visible, coherent GPU storage and adopt it as the
|
|
// single source of truth. The backend seeds it from the current shadow before
|
|
// returning; AdoptPersistentMap then releases the shadow. Falls back to the
|
|
// shadow when the backend declines (returns null). Only attempted once - the
|
|
// storage is immutable and outlives unmap/remap.
|
|
if (!m_resource.IsGpuResident() && (access & BufferMappingAccessBit::Write) &&
|
|
!(access & BufferMappingAccessBit::FlushExplicit) && g_bufferBackendOps &&
|
|
g_bufferBackendOps->AcquirePersistentMap) {
|
|
if (void* base = g_bufferBackendOps->AcquirePersistentMap(*this)) {
|
|
m_resource.AdoptPersistentMap(base);
|
|
}
|
|
}
|
|
return m_resource.Bytes() + range.start;
|
|
}
|
|
|
|
if (access & BufferMappingAccessBit::Write) {
|
|
m_stagingData.resize(range.end - range.start);
|
|
m_ownsStagingData = true;
|
|
|
|
if (!(access & (BufferMappingAccessBit::InvalidateRange | BufferMappingAccessBit::InvalidateBuffer))) {
|
|
Memcpy(m_stagingData.data(), m_resource.Bytes() + range.start, m_stagingData.size());
|
|
}
|
|
|
|
return m_stagingData.data();
|
|
} else {
|
|
m_ownsStagingData = false;
|
|
return m_resource.Bytes() + range.start;
|
|
}
|
|
}
|
|
|
|
const Uint8* BufferObject::MappedData() const {
|
|
return m_resource.Bytes();
|
|
}
|
|
|
|
Bool BufferObject::IsBackendPersistentMapped() const {
|
|
return m_resource.IsGpuResident();
|
|
}
|
|
|
|
SizeT BufferObject::GetSize() const {
|
|
return m_size;
|
|
}
|
|
|
|
Bool BufferObject::IsImmutableStorage() const {
|
|
return m_isImmutableStorage;
|
|
}
|
|
|
|
BufferUsage BufferObject::GetUsage() const {
|
|
return m_usage;
|
|
}
|
|
|
|
Uint64 BufferObject::GetChangeSerial() const {
|
|
return m_changeSerial;
|
|
}
|
|
|
|
const SharedPtr<BackendBufferResource>& BufferObject::GetBackendResource() const {
|
|
return m_resource.Backend();
|
|
}
|
|
|
|
void BufferObject::SetBackendResource(SharedPtr<BackendBufferResource> resource) {
|
|
m_resource.SetBackend(std::move(resource));
|
|
}
|
|
|
|
Bool BufferObject::IsMapped() const {
|
|
return m_isMapped;
|
|
}
|
|
|
|
Range1D BufferObject::GetMappedRange() const {
|
|
return m_isMapped ? m_mappedRange : Range1D{0, 0};
|
|
}
|
|
|
|
void* BufferObject::GetMappedPointer() const {
|
|
if (!m_isMapped) return nullptr;
|
|
if (m_mappingAccess & BufferMappingAccessBit::Persistent) {
|
|
// GPU-resident maps return the coherent GPU pointer; shadow-backed persistent
|
|
// maps return the shadow. m_resource.Bytes() resolves both.
|
|
return const_cast<Uint8*>(m_resource.Bytes()) + m_mappedRange.start;
|
|
}
|
|
if (m_ownsStagingData) {
|
|
return const_cast<Uint8*>(m_stagingData.data());
|
|
}
|
|
return const_cast<Uint8*>(m_resource.Bytes()) + m_mappedRange.start;
|
|
}
|
|
|
|
Flags<BufferMappingAccessBit> BufferObject::GetMappingAccess() const {
|
|
return m_isMapped ? m_mappingAccess : BufferMappingAccessBit::Null;
|
|
}
|
|
|
|
GLbitfield BufferObject::GetStorageFlags() const {
|
|
return m_storageFlags;
|
|
}
|
|
|
|
Uint BufferObject::GetExternalIndex() const {
|
|
return m_externalIndex;
|
|
}
|
|
} // namespace MobileGL::MG_State::GLState
|