From fef3fe41960a564aee1c02509cf73d8961adf3bd Mon Sep 17 00:00:00 2001
From: assiduous <assiduous@diligentgraphics.com>
Date: Fri, 24 Jan 2020 15:05:34 -0800
Subject: Updated handling of fatal errors

---
 Graphics/GraphicsEngineOpenGL/include/pch.h        | 30 +++++++++++-----------
 .../GraphicsEngineVulkan/include/VulkanErrors.h    | 22 ++++++++--------
 2 files changed, 26 insertions(+), 26 deletions(-)

(limited to 'Graphics')

diff --git a/Graphics/GraphicsEngineOpenGL/include/pch.h b/Graphics/GraphicsEngineOpenGL/include/pch.h
index bea72ba0..706fa9a7 100644
--- a/Graphics/GraphicsEngineOpenGL/include/pch.h
+++ b/Graphics/GraphicsEngineOpenGL/include/pch.h
@@ -122,23 +122,23 @@
 #include "RenderDevice.h"
 #include "BaseInterfacesGL.h"
 
-#define CHECK_GL_ERROR(...)                                                                           \
-    do                                                                                                \
-    {                                                                                                 \
-        auto err = glGetError();                                                                      \
-        if (err != GL_NO_ERROR)                                                                       \
-        {                                                                                             \
-            LogError<false>(__FUNCTION__, __FILE__, __LINE__, __VA_ARGS__, "\nGL Error Code: ", err); \
-            UNEXPECTED("Error");                                                                      \
-        }                                                                                             \
+#define CHECK_GL_ERROR(...)                                                                                              \
+    do                                                                                                                   \
+    {                                                                                                                    \
+        auto err = glGetError();                                                                                         \
+        if (err != GL_NO_ERROR)                                                                                          \
+        {                                                                                                                \
+            LogError<false>(/*IsFatal=*/false, __FUNCTION__, __FILE__, __LINE__, __VA_ARGS__, "\nGL Error Code: ", err); \
+            UNEXPECTED("Error");                                                                                         \
+        }                                                                                                                \
     } while (false)
 
-#define CHECK_GL_ERROR_AND_THROW(...)                                                                \
-    do                                                                                               \
-    {                                                                                                \
-        auto err = glGetError();                                                                     \
-        if (err != GL_NO_ERROR)                                                                      \
-            LogError<true>(__FUNCTION__, __FILE__, __LINE__, __VA_ARGS__, "\nGL Error Code: ", err); \
+#define CHECK_GL_ERROR_AND_THROW(...)                                                                                   \
+    do                                                                                                                  \
+    {                                                                                                                   \
+        auto err = glGetError();                                                                                        \
+        if (err != GL_NO_ERROR)                                                                                         \
+            LogError<true>(/*IsFatal=*/false, __FUNCTION__, __FILE__, __LINE__, __VA_ARGS__, "\nGL Error Code: ", err); \
     } while (false)
 
 #ifdef DEVELOPMENT
diff --git a/Graphics/GraphicsEngineVulkan/include/VulkanErrors.h b/Graphics/GraphicsEngineVulkan/include/VulkanErrors.h
index 0e46bba2..5cf1427e 100644
--- a/Graphics/GraphicsEngineVulkan/include/VulkanErrors.h
+++ b/Graphics/GraphicsEngineVulkan/include/VulkanErrors.h
@@ -31,17 +31,17 @@
 #include "DebugUtilities.h"
 #include "VulkanUtilities/VulkanDebug.h"
 
-#define CHECK_VK_ERROR(err, ...)                                                                                                              \
-    {                                                                                                                                         \
-        if (err < 0)                                                                                                                          \
-        {                                                                                                                                     \
-            Diligent::LogError<false>(__FUNCTION__, __FILE__, __LINE__, __VA_ARGS__, "\nVK Error: ", VulkanUtilities::VkResultToString(err)); \
-            UNEXPECTED("Error");                                                                                                              \
-        }                                                                                                                                     \
+#define CHECK_VK_ERROR(err, ...)                                                                                                                                 \
+    {                                                                                                                                                            \
+        if (err < 0)                                                                                                                                             \
+        {                                                                                                                                                        \
+            Diligent::LogError<false>(/*IsFatal=*/false, __FUNCTION__, __FILE__, __LINE__, __VA_ARGS__, "\nVK Error: ", VulkanUtilities::VkResultToString(err)); \
+            UNEXPECTED("Error");                                                                                                                                 \
+        }                                                                                                                                                        \
     }
 
-#define CHECK_VK_ERROR_AND_THROW(err, ...)                                                                                                        \
-    {                                                                                                                                             \
-        if (err < 0)                                                                                                                              \
-            Diligent::LogError<true>(__FUNCTION__, __FILE__, __LINE__, __VA_ARGS__, "\nVK Error Code: ", VulkanUtilities::VkResultToString(err)); \
+#define CHECK_VK_ERROR_AND_THROW(err, ...)                                                                                                                           \
+    {                                                                                                                                                                \
+        if (err < 0)                                                                                                                                                 \
+            Diligent::LogError<true>(/*IsFatal=*/false, __FUNCTION__, __FILE__, __LINE__, __VA_ARGS__, "\nVK Error Code: ", VulkanUtilities::VkResultToString(err)); \
     }
-- 
cgit v1.2.3