layers: Refactor

layers/gpu_validation/debug_printf.cpp

@@ -236,7 +236,14 @@ void DebugPrintf::PostCallRecordQueueSubmit(VkQueue queue, uint32_t submitCount,
     bool device_lost = (result == VK_ERROR_DEVICE_LOST);
 
     if (aborted) return;
-    if (!((result == VK_SUCCESS) || (device_lost && use_uncached_buffer))) return;
+
+    if (result != VK_SUCCESS) {
+        if (!use_uncached_buffer) {
+            return;
+        } else if (!device_lost) {
+            return;  // VK_ERROR_OUT_OF_HOST_MEMORY or VK_ERROR_OUT_OF_DEVICE_MEMORY
+        }
+    }
 
     bool buffers_present = false;
     // Don't QueueWaitIdle if there's nothing to process
@@ -822,12 +829,11 @@ void DebugPrintf::AllocateDebugPrintfResources(const VkCommandBuffer cmd_buffer,
     result = vmaMapMemory(vmaAllocator, output_block.allocation, reinterpret_cast<void **>(&output_block.data));
     if (result == VK_SUCCESS) {
         memset(output_block.data, 0, output_buffer_size);
+        // Mapping may fail after DEVICE_LOST. Keep it mapped for now in such case.
+        // Will be unmapped in debug_printf_state::CommandBuffer::Process
         if (!use_uncached_buffer) {
             vmaUnmapMemory(vmaAllocator, output_block.allocation);
             output_block.data = nullptr;
-        } else {
-            // Mapping may fail after DEVICE_LOST. Keep it mapped for now.
-            // Will be unmapped in debug_printf_state::CommandBuffer::Process
         }
     }