Couple of minor updates to D3D12 and Vulkan device context implementations

1 files changed, 9 insertions, 4 deletions

diff --git a/Graphics/GraphicsEngineD3D12/src/DeviceContextD3D12Impl.cpp b/Graphics/GraphicsEngineD3D12/src/DeviceContextD3D12Impl.cpp
index 6cee61df..64361e5d 100644
--- a/Graphics/GraphicsEngineD3D12/src/DeviceContextD3D12Impl.cpp
+++ b/Graphics/GraphicsEngineD3D12/src/DeviceContextD3D12Impl.cpp
@@ -120,7 +120,7 @@ namespace Diligent
         if (m_State.NumCommands != 0)
         {
             LOG_ERROR_MESSAGE(m_bIsDeferred ? 
-                                "There are outstanding commands in the deferred context being destroyed, which indicates that FinishCommandList() has not been called." :
+                                "There are outstanding commands in deferred context #", m_ContextId, " being destroyed, which indicates that FinishCommandList() has not been called." :
                                 "There are outstanding commands in the immediate context being destroyed, which indicates the context has not been Flush()'ed.",
                               " This is unexpected and may result in synchronization errors");
         }
@@ -577,7 +577,12 @@ namespace Diligent
 
     void DeviceContextD3D12Impl::Flush()
     {
-        VERIFY(!m_bIsDeferred, "Flush() should only be called for immediate contexts");
+        if (m_bIsDeferred)
+        {
+            LOG_ERROR_MESSAGE("Flush() should only be called for immediate contexts");
+            return;
+        }
+
         Flush(true);
     }
 
@@ -586,7 +591,7 @@ namespace Diligent
         if (GetNumCommandsInCtx() != 0)
         {
             LOG_ERROR_MESSAGE(m_bIsDeferred ? 
-                "There are outstanding commands in the deferred device context when finishing the frame. This is an error and may cause unpredicted behaviour. Close all deferred contexts and execute them before finishing the frame" :
+                "There are outstanding commands in deferred device context #", m_ContextId, " when finishing the frame. This is an error and may cause unpredicted behaviour. Close all deferred contexts and execute them before finishing the frame" :
                 "There are outstanding commands in the immediate device context when finishing the frame. This is an error and may cause unpredicted behaviour. Call Flush() to submit all commands for execution before finishing the frame");
         }
 
@@ -1072,7 +1077,7 @@ namespace Diligent
     {
         if (m_bIsDeferred)
         {
-            LOG_ERROR("Only immediate context can execute command list");
+            LOG_ERROR_MESSAGE("Only immediate context can execute command list");
             return;
         }
         // First execute commands in this context