mirror of
https://github.com/MobileGL-Dev/MobileGL
synced 2026-09-08 04:08:32 +09:00
Create 6 / Flywheel 1.0.6 now renders correctly with both flywheel:instancing and flywheel:indirect on DirectGLES and DirectVulkan (verified in-game on Adreno 830: waterwheels and cogwheels solid, animated, correct pairing, no crashes across all four combinations). - MG_State/MG_Impl: sync explicitly-ranged SSBO bindings of FLUSH_EXPLICIT persistent maps to the backend before compute dispatches. Flywheel writes its scatter-copy descriptors into the staging ring's persistent map and never flushes that span (UB per spec, works on drivers whose maps alias GPU-visible memory); our maps alias the CPU shadow, so the descriptors never reached the GPU: the scatter compute copied nothing (GLES: empty draw commands) or stale garbage (Vulkan: wild indirect commands ending in VK_ERROR_DEVICE_LOST). - MG_Impl/MG_Backend: real glFenceSync objects backed by backend fences (GLES: native ES syncs guarded by context generation and owner thread; Vulkan: buffer-manager frame serials), replacing always-signaled stubs that let Flywheel reclaim staging memory the GPU still reads. - MG_Backend/DirectGLES: compute dispatches now run the same per-program resource sync as draws (uniform-block bindings and sampler units must be re-established through the API because layout(binding) is stripped from transpiled ESSL) and rebind texture units afterwards; the cull shader used to read a stale _FlwFrameUniforms binding and the depth-pyramid downsample sampled a stale unit-0 texture, zeroing the Hi-Z pyramid and occlusion-culling all Flywheel geometry. Image uniforms are excluded from glUniform1i (ES bakes their unit via layout(binding)); image-unit sync is clamped to the device limit; eliminated/SSBO-classified uniform blocks are skipped. - MG_Backend/DirectGLES: gl_BaseInstance in native indirect draws reads the GPU-written command buffer through an injected mg_IndirectParams SSBO view addressed per draw instead of the zero CPU shadow; layout(binding) is preserved for SSBO/image declarations (ES has no API rebinding for them); the ES context ownership claim moved to a global atomic owner thread with an EGL ground-truth check, and deferred buffer op state is mutex-guarded, so ops cannot silently no-op after context migration. - MG_Backend/DirectVulkan: new RebaseInstanceIndexPass rewrites vertex InstanceIndex loads to (InstanceIndex - BaseInstance). glslang's relaxed Vulkan mode aliases gl_InstanceID to InstanceIndex, which includes firstInstance, but GL's gl_InstanceID is zero-based - draws with nonzero baseInstance paired meshes with wrong instance data (cogwheel drawn as a waterwheel, another wheel collapsed invisible). Gated on the shaderDrawParameters device feature. Sampled-read barriers additionally cover the compute stage (the Hi-Z downsample samples the depth attachment from compute), and short uniform-buffer ranges keep the existing zero-padding. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
315 lines
12 KiB
C++
315 lines
12 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_dataPtr(MakeShared<Data>()),
|
|
m_ownsStagingData{} {}
|
|
|
|
BufferObject::~BufferObject() {
|
|
if (m_backendResource && g_bufferBackendOps && g_bufferBackendOps->OnDestroy) {
|
|
g_bufferBackendOps->OnDestroy(std::move(m_backendResource));
|
|
}
|
|
}
|
|
|
|
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::Respecify(SizeT size, const void* data) {
|
|
ReleaseMemory();
|
|
m_size = size;
|
|
m_dataPtr->reserve(std::bit_ceil(size)); // power-of-2 reserve
|
|
m_dataPtr->resize(size);
|
|
if (data && size > 0) {
|
|
Memcpy(m_dataPtr->data(), 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_dataPtr->reserve(std::bit_ceil(size));
|
|
m_dataPtr->resize(size);
|
|
if (data) {
|
|
Memcpy(m_dataPtr->data(), data, size);
|
|
} else if (size > 0) {
|
|
Memset(m_dataPtr->data(), 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_dataPtr->data() + atOffset, data.data, data.size);
|
|
NotifySubData(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
|
|
if (!(m_mappingAccess & BufferMappingAccessBit::FlushExplicit)) { // if we didn't flush explicitly
|
|
if (!(m_mappingAccess & BufferMappingAccessBit::Persistent)) {
|
|
Memcpy(m_dataPtr->data() + 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);
|
|
|
|
if (!(m_mappingAccess & BufferMappingAccessBit::Persistent)) {
|
|
Memcpy(m_dataPtr->data() + start, m_stagingData.data() + offset, length);
|
|
}
|
|
NotifyFlushMappedRange({start, end}, m_mappingAccess);
|
|
}
|
|
|
|
void BufferObject::SyncPersistentMappedRange() {
|
|
if (!m_isMapped) 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;
|
|
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_dataPtr->data() + 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_dataPtr->data() + atOffset, data.data, data.size);
|
|
NotifySubData(atOffset, data.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);
|
|
|
|
const Uint8* srcData = src->m_dataPtr->data() + srcOffset;
|
|
Memcpy(m_dataPtr->data() + dstOffset, srcData, size);
|
|
NotifySubData(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_dataPtr->data(), m_size);
|
|
}
|
|
|
|
return m_stagingData.data();
|
|
}
|
|
}
|
|
|
|
return m_dataPtr->data();
|
|
}
|
|
|
|
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;
|
|
return m_dataPtr->data() + 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_dataPtr->data() + range.start, m_stagingData.size());
|
|
}
|
|
|
|
return m_stagingData.data();
|
|
} else {
|
|
m_ownsStagingData = false;
|
|
return m_dataPtr->data() + range.start;
|
|
}
|
|
}
|
|
|
|
const SharedPtr<Data>& BufferObject::GetDataReadOnly() const {
|
|
return m_dataPtr;
|
|
}
|
|
|
|
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_backendResource;
|
|
}
|
|
|
|
void BufferObject::SetBackendResource(SharedPtr<BackendBufferResource> resource) {
|
|
m_backendResource = 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) {
|
|
return const_cast<Uint8*>(m_dataPtr->data()) + m_mappedRange.start;
|
|
}
|
|
if (m_ownsStagingData) {
|
|
return const_cast<Uint8*>(m_stagingData.data());
|
|
}
|
|
return const_cast<Uint8*>(m_dataPtr->data()) + 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
|