diff options
| author | assiduous <assiduous@diligentgraphics.com> | 2020-01-24 23:05:34 +0000 |
|---|---|---|
| committer | assiduous <assiduous@diligentgraphics.com> | 2020-01-24 23:05:34 +0000 |
| commit | fef3fe41960a564aee1c02509cf73d8961adf3bd (patch) | |
| tree | f748dc95daafb06cb9fb9f230fbedbb68d668b91 /Graphics | |
| parent | Added WindowsFileSystem::IsDirectory (diff) | |
| download | DiligentCore-fef3fe41960a564aee1c02509cf73d8961adf3bd.tar.gz DiligentCore-fef3fe41960a564aee1c02509cf73d8961adf3bd.zip | |
Updated handling of fatal errors
Diffstat (limited to 'Graphics')
| -rw-r--r-- | Graphics/GraphicsEngineOpenGL/include/pch.h | 30 | ||||
| -rw-r--r-- | Graphics/GraphicsEngineVulkan/include/VulkanErrors.h | 22 |
2 files changed, 26 insertions, 26 deletions
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)); \ } |