mirror of
https://github.com/MobileGL-Dev/MobileGL
synced 2026-09-11 05:38:31 +09:00
[Fix, Test] (MG_State, DirectVulkan): order host writes to an adopted store after recorded GPU work - a SubData issued after a dispatch landed in coherent memory before the deferred dispatch executed, so its increments overwrote the newer bytes; un-skip the DirectVulkan half of the SubData-after-dispatch scenario
This commit is contained in:
@@ -253,6 +253,18 @@ namespace MobileGL::MG_State::GLState {
|
||||
"UploadSubData out of bounds: atOffset (%zu) + data.size (%zu) > m_size (%zu)", atOffset,
|
||||
data.size, m_size);
|
||||
|
||||
// An adopted store's Bytes() IS the memory the GPU reads, and a backend that
|
||||
// defers work (DirectVulkan's frame command buffer) may still be holding a
|
||||
// recorded-but-unsubmitted dispatch that GL orders this write AFTER. Writing
|
||||
// the mapping now would land the bytes underneath that dispatch - its
|
||||
// increments then execute on top of the newer data and invert the call order.
|
||||
// Retire the pending GPU writes first, as FillSubData already does. Shadow-
|
||||
// backed stores need none of this: the Memcpy below touches only the shadow,
|
||||
// and the backend's SubData op does its own ordering against in-flight work.
|
||||
if (m_resource.IsGpuResident()) {
|
||||
SyncGpuWrites();
|
||||
}
|
||||
|
||||
Memcpy(m_resource.Bytes() + atOffset, data.data, data.size);
|
||||
NotifyContentWrite(atOffset, data.size);
|
||||
}
|
||||
@@ -305,6 +317,12 @@ namespace MobileGL::MG_State::GLState {
|
||||
size, m_size);
|
||||
|
||||
src->SyncGpuWrites();
|
||||
// The DESTINATION needs the same ordering as UploadSubData: an adopted store is
|
||||
// written in place, so pending recorded GPU writes to it must retire before the
|
||||
// copy lands or they would execute on top of it.
|
||||
if (m_resource.IsGpuResident()) {
|
||||
SyncGpuWrites();
|
||||
}
|
||||
Memcpy(m_resource.Bytes() + dstOffset, src->m_resource.Bytes() + srcOffset, size);
|
||||
NotifyContentWrite(dstOffset, size);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user