Fixed mapped buffer validation in device context

Author: TheMostDiligent

Graphics/GraphicsEngine/include/DeviceContextBase.hpp

@@ -716,6 +716,9 @@ class DeviceContextBase : public ObjectBase<typename EngineImplTraits::DeviceCon
     struct DbgMappedBufferInfo
     {
         MAP_TYPE MapType;
+        USAGE    Usage;
+
+        RefCntWeakPtr<IBuffer> pBuffer;
     };
     std::unordered_map<IBuffer*, DbgMappedBufferInfo> m_DbgMappedBuffers;
 #endif
@@ -1799,7 +1802,7 @@ inline void DeviceContextBase<ImplementationTraits>::MapBuffer(
 #ifdef DILIGENT_DEBUG
     {
         VERIFY(m_DbgMappedBuffers.find(pBuffer) == m_DbgMappedBuffers.end(), "Buffer '", BuffDesc.Name, "' has already been mapped");
-        m_DbgMappedBuffers[pBuffer] = DbgMappedBufferInfo{MapType};
+        m_DbgMappedBuffers[pBuffer] = DbgMappedBufferInfo{MapType, BuffDesc.Usage, RefCntWeakPtr<IBuffer>{pBuffer}};
     }
 #endif
 
@@ -1852,9 +1855,16 @@ inline void DeviceContextBase<ImplementationTraits>::UnmapBuffer(IBuffer* pBuffe
 #ifdef DILIGENT_DEBUG
     {
         auto MappedBufferIt = m_DbgMappedBuffers.find(pBuffer);
-        VERIFY(MappedBufferIt != m_DbgMappedBuffers.end(), "Buffer '", pBuffer->GetDesc().Name, "' has not been mapped.");
-        VERIFY(MappedBufferIt->second.MapType == MapType, "MapType (", MapType, ") does not match the map type that was used to map the buffer ", MappedBufferIt->second.MapType);
-        m_DbgMappedBuffers.erase(MappedBufferIt);
+        if (MappedBufferIt != m_DbgMappedBuffers.end())
+        {
+            VERIFY(MappedBufferIt->second.MapType == MapType, "MapType (", MapType,
+                   ") does not match the map type that was used to map the buffer ", MappedBufferIt->second.MapType);
+            m_DbgMappedBuffers.erase(MappedBufferIt);
+        }
+        else
+        {
+            UNEXPECTED("Buffer '", pBuffer->GetDesc().Name, "' has not been mapped.");
+        }
     }
 #endif
 }

Graphics/GraphicsEngineD3D12/src/DeviceContextD3D12Impl.cpp

@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019-2025 Diligent Graphics LLC
+ *  Copyright 2019-2026 Diligent Graphics LLC
  *  Copyright 2015-2019 Egor Yusov
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
@@ -1105,14 +1105,17 @@ void DeviceContextD3D12Impl::Flush()
 void DeviceContextD3D12Impl::FinishFrame()
 {
 #ifdef DILIGENT_DEBUG
-    for (const auto& MappedBuffIt : m_DbgMappedBuffers)
+    for (auto& MappedBuffIt : m_DbgMappedBuffers)
     {
-        const BufferDesc& BuffDesc = MappedBuffIt.first->GetDesc();
-        if (BuffDesc.Usage == USAGE_DYNAMIC)
+        if (MappedBuffIt.second.Usage == USAGE_DYNAMIC)
         {
-            LOG_WARNING_MESSAGE("Dynamic buffer '", BuffDesc.Name,
-                                "' is still mapped when finishing the frame. The contents of the buffer and "
-                                "mapped address will become invalid");
+            if (RefCntAutoPtr<IBuffer> pBuffer = MappedBuffIt.second.pBuffer.Lock())
+            {
+                const BufferDesc& BuffDesc = pBuffer->GetDesc();
+                LOG_WARNING_MESSAGE("Dynamic buffer '", BuffDesc.Name,
+                                    "' is still mapped when finishing the frame. The contents of the buffer and "
+                                    "mapped address will become invalid");
+            }
         }
     }
 #endif

Graphics/GraphicsEngineVulkan/src/DeviceContextVkImpl.cpp

@@ -1480,12 +1480,15 @@ void DeviceContextVkImpl::ClearRenderTarget(ITextureView* pView, const void* RGB
 void DeviceContextVkImpl::FinishFrame()
 {
 #ifdef DILIGENT_DEBUG
-    for (const auto& MappedBuffIt : m_DbgMappedBuffers)
+    for (auto& MappedBuffIt : m_DbgMappedBuffers)
     {
-        const BufferDesc& BuffDesc = MappedBuffIt.first->GetDesc();
-        if (BuffDesc.Usage == USAGE_DYNAMIC)
+        if (MappedBuffIt.second.Usage == USAGE_DYNAMIC)
         {
-            LOG_WARNING_MESSAGE("Dynamic buffer '", BuffDesc.Name, "' is still mapped when finishing the frame. The contents of the buffer and mapped address will become invalid");
+            if (RefCntAutoPtr<IBuffer> pBuffer = MappedBuffIt.second.pBuffer.Lock())
+            {
+                const BufferDesc& BuffDesc = pBuffer->GetDesc();
+                LOG_WARNING_MESSAGE("Dynamic buffer '", BuffDesc.Name, "' is still mapped when finishing the frame. The contents of the buffer and mapped address will become invalid");
+            }
         }
     }
 #endif