swung0x48/MobileGL
1
0
Fork 0
mirror of https://github.com/MobileGL-Dev/MobileGL synced 2026-09-11 21:58:31 +09:00
Code Issues Packages Projects Releases Wiki Activity

[Fix] (Diligent/Buffer): Make all types of buffer mappable.

Browse Source
This commit is contained in:
BZLZHH
2025-06-10 01:54:19 +08:00
parent c5ea0a7bf1
commit 964f483fd5
1 changed files with 42 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MG/MG_GL/Implementations/GL/Buffer/GL_Buffer.cpp
+42 -32
View File
@@ -51,19 +51,24 @@ namespace MG_GL::GL {
Diligent::IBuffer* pBuffer = MG_Diligent::g_BufferMap[buffer]; Diligent::IBuffer* pBuffer = MG_Diligent::g_BufferMap[buffer];
if (pBuffer && bufferObj.data.size() >= end) { if (pBuffer && bufferObj.data.size() >= end) {
void * data; const auto& Desc = pBuffer->GetDesc();
MG_Diligent::g_pContext->MapBuffer(pBuffer, Diligent::MAP_WRITE, if (Desc.Usage == Diligent::USAGE_STAGING || Desc.Usage == Diligent::USAGE_DYNAMIC || Desc.Usage == Diligent::USAGE_UNIFIED) {
Diligent::MAP_FLAG_DISCARD, data); void * data;
MG_Diligent::g_pContext->MapBuffer(pBuffer, Diligent::MAP_WRITE,
Diligent::MAP_FLAG_DISCARD, data);
if (data) { if (data) {
void* dst = static_cast<char*>(data) + offset; void* dst = static_cast<char*>(data) + offset;
const void* src = bufferObj.data.data() + offset; const void* src = bufferObj.data.data() + offset;
memcpy(dst, src, length); memcpy(dst, src, length);
MG_Diligent::g_pContext->UnmapBuffer(pBuffer, Diligent::MAP_WRITE); MG_Diligent::g_pContext->UnmapBuffer(pBuffer, Diligent::MAP_WRITE);
}
} else {
// For USAGE_DEFAULT or USAGE_IMMUTABLE, use UpdateBuffer
MG_Diligent::g_pContext->UpdateBuffer(pBuffer, static_cast<Diligent::Uint64>(offset), static_cast<Diligent::Uint64>(length), bufferObj.data.data() + offset, Diligent::RESOURCE_STATE_TRANSITION_MODE_TRANSITION);
} }
} }
return; return;
} }
MG_State::SetError(result); MG_State::SetError(result);
@@ -133,13 +138,19 @@ namespace MG_GL::GL {
Diligent::IBuffer* pBuffer = MG_Diligent::g_BufferMap[buffer]; Diligent::IBuffer* pBuffer = MG_Diligent::g_BufferMap[buffer];
if (pBuffer) { if (pBuffer) {
void * data; const auto& Desc = pBuffer->GetDesc();
MG_Diligent::g_pContext->MapBuffer(pBuffer, Diligent::MAP_WRITE, if (Desc.Usage == Diligent::USAGE_STAGING || Desc.Usage == Diligent::USAGE_DYNAMIC || Desc.Usage == Diligent::USAGE_UNIFIED) {
Diligent::MAP_FLAG_DISCARD, data); void * data;
MG_Diligent::g_pContext->MapBuffer(pBuffer, Diligent::MAP_WRITE,
Diligent::MAP_FLAG_DISCARD, data);
if (data) { if (data) {
memcpy(data, bufferObj.data.data(), bufferObj.data.size()); memcpy(data, bufferObj.data.data(), bufferObj.data.size());
MG_Diligent::g_pContext->UnmapBuffer(pBuffer, Diligent::MAP_WRITE); MG_Diligent::g_pContext->UnmapBuffer(pBuffer, Diligent::MAP_WRITE);
}
} else {
// For USAGE_DEFAULT or USAGE_IMMUTABLE, use UpdateBuffer
MG_Diligent::g_pContext->UpdateBuffer(pBuffer, 0, bufferObj.data.size(), bufferObj.data.data(), Diligent::RESOURCE_STATE_TRANSITION_MODE_TRANSITION);
} }
} }
@@ -210,16 +221,7 @@ namespace MG_GL::GL {
} }
BuffDesc.Name = name.c_str(); BuffDesc.Name = name.c_str();
BuffDesc.Usage = Diligent::USAGE_DEFAULT;
switch (usage) {
case GL_STATIC_DRAW:
BuffDesc.Usage = Diligent::USAGE_IMMUTABLE;
BuffDesc.CPUAccessFlags = Diligent::CPU_ACCESS_NONE;
break;
default:
BuffDesc.Usage = Diligent::USAGE_DEFAULT;
break;
}
if (pBuffer == nullptr) { if (pBuffer == nullptr) {
Diligent::BufferData BuffData; Diligent::BufferData BuffData;
@@ -306,14 +308,22 @@ namespace MG_GL::GL {
Diligent::IBuffer* pBuffer = MG_Diligent::g_BufferMap[buffer]; Diligent::IBuffer* pBuffer = MG_Diligent::g_BufferMap[buffer];
if (pBuffer) { if (pBuffer) {
void* pMappedData = nullptr; const auto& Desc = pBuffer->GetDesc();
MG_Diligent::g_pContext->MapBuffer(pBuffer, Diligent::MAP_WRITE, Diligent::MAP_FLAG_DISCARD, pMappedData); if (Desc.Usage == Diligent::USAGE_STAGING || Desc.Usage == Diligent::USAGE_DYNAMIC || Desc.Usage == Diligent::USAGE_UNIFIED) {
if (pMappedData) void* pMappedData = nullptr;
{ MG_Diligent::g_pContext->MapBuffer(pBuffer, Diligent::MAP_WRITE, Diligent::MAP_FLAG_DISCARD, pMappedData);
memcpy(static_cast<Diligent::Uint8*>(pMappedData) + offset, data, size); if (pMappedData)
MG_Diligent::g_pContext->UnmapBuffer(pBuffer, Diligent::MAP_WRITE); {
memcpy(static_cast<Diligent::Uint8*>(pMappedData) + offset, data, size);
MG_Diligent::g_pContext->UnmapBuffer(pBuffer, Diligent::MAP_WRITE);
} else {
MG_Util::Debug::LogE("Failed to map buffer for BufferSubData");
}
} else { } else {
MG_Util::Debug::LogE("Failed to map buffer for BufferSubData"); // For USAGE_DEFAULT or USAGE_IMMUTABLE, use UpdateBuffer
MG_Diligent::g_pContext->UpdateBuffer(pBuffer, static_cast<Diligent::Uint64>(offset),
static_cast<Diligent::Uint64>(size), data,
Diligent::RESOURCE_STATE_TRANSITION_MODE_TRANSITION);
} }
} }
} }