Commit fef3fe41960a564aee1c02509cf73d8961adf3bd - DiligentCore

Updated handling of fatal errors assiduous 3 years ago

3 changed file(s) with 61 addition(s) and 46 deletion(s). Raw diff Collapse all Expand all

+15

-15

Graphics/GraphicsEngineOpenGL/include/pch.h less more

121	121	#include "RenderDevice.h"
122	122	#include "BaseInterfacesGL.h"
123	123
124		#define CHECK_GL_ERROR(...) \
125		do \
126		{ \
127		auto err = glGetError(); \
128		if (err != GL_NO_ERROR) \
129		{ \
130		LogError<false>(__FUNCTION__, __FILE__, __LINE__, __VA_ARGS__, "\nGL Error Code: ", err); \
131		UNEXPECTED("Error"); \
132		} \
	124	#define CHECK_GL_ERROR(...) \
	125	do \
	126	{ \
	127	auto err = glGetError(); \
	128	if (err != GL_NO_ERROR) \
	129	{ \
	130	LogError<false>(/IsFatal=/false, __FUNCTION__, __FILE__, __LINE__, __VA_ARGS__, "\nGL Error Code: ", err); \
	131	UNEXPECTED("Error"); \
	132	} \
133	133	} while (false)
134	134
135		#define CHECK_GL_ERROR_AND_THROW(...) \
136		do \
137		{ \
138		auto err = glGetError(); \
139		if (err != GL_NO_ERROR) \
140		LogError<true>(__FUNCTION__, __FILE__, __LINE__, __VA_ARGS__, "\nGL Error Code: ", err); \
	135	#define CHECK_GL_ERROR_AND_THROW(...) \
	136	do \
	137	{ \
	138	auto err = glGetError(); \
	139	if (err != GL_NO_ERROR) \
	140	LogError<true>(/IsFatal=/false, __FUNCTION__, __FILE__, __LINE__, __VA_ARGS__, "\nGL Error Code: ", err); \
141	141	} while (false)
142	142
143	143	#ifdef DEVELOPMENT

+11

-11

Graphics/GraphicsEngineVulkan/include/VulkanErrors.h less more

30	30	#include "DebugUtilities.h"
31	31	#include "VulkanUtilities/VulkanDebug.h"
32	32
33		#define CHECK_VK_ERROR(err, ...) \
34		{ \
35		if (err < 0) \
36		{ \
37		Diligent::LogError<false>(__FUNCTION__, __FILE__, __LINE__, __VA_ARGS__, "\nVK Error: ", VulkanUtilities::VkResultToString(err)); \
38		UNEXPECTED("Error"); \
39		} \
	33	#define CHECK_VK_ERROR(err, ...) \
	34	{ \
	35	if (err < 0) \
	36	{ \
	37	Diligent::LogError<false>(/IsFatal=/false, __FUNCTION__, __FILE__, __LINE__, __VA_ARGS__, "\nVK Error: ", VulkanUtilities::VkResultToString(err)); \
	38	UNEXPECTED("Error"); \
	39	} \
40	40	}
41	41
42		#define CHECK_VK_ERROR_AND_THROW(err, ...) \
43		{ \
44		if (err < 0) \
45		Diligent::LogError<true>(__FUNCTION__, __FILE__, __LINE__, __VA_ARGS__, "\nVK Error Code: ", VulkanUtilities::VkResultToString(err)); \
	42	#define CHECK_VK_ERROR_AND_THROW(err, ...) \
	43	{ \
	44	if (err < 0) \
	45	Diligent::LogError<true>(/IsFatal=/false, __FUNCTION__, __FILE__, __LINE__, __VA_ARGS__, "\nVK Error Code: ", VulkanUtilities::VkResultToString(err)); \
46	46	}

+35

-20

Primitives/interface/Errors.h less more

48	48	}
49	49
50	50	template <bool bThrowException, typename... ArgsType>
51		void LogError(const char* Function, const char* FullFilePath, int Line, const ArgsType&... Args)
	51	void LogError(bool IsFatal, const char* Function, const char* FullFilePath, int Line, const ArgsType&... Args)
52	52	{
53	53	std::string FileName(FullFilePath);
54	54

58	58	auto Msg = FormatString(Args...);
59	59	if (DebugMessageCallback != nullptr)
60	60	{
61		DebugMessageCallback(bThrowException ? DebugMessageSeverity::FatalError : DebugMessageSeverity::Error, Msg.c_str(), Function, FileName.c_str(), Line);
	61	DebugMessageCallback(IsFatal ? DebugMessageSeverity::FatalError : DebugMessageSeverity::Error, Msg.c_str(), Function, FileName.c_str(), Line);
62	62	}
63	63	else
64	64	{
65	65	// No callback set - output to cerr
66		std::cerr << "Diligent Engine: " << (bThrowException ? "Fatal Error" : "Error") << " in " << Function << "() (" << FileName << ", " << Line << "): " << Msg << '\n';
	66	std::cerr << "Diligent Engine: " << (IsFatal ? "Fatal Error" : "Error") << " in " << Function << "() (" << FileName << ", " << Line << "): " << Msg << '\n';
67	67	}
68	68	ThrowIf<bThrowException>(std::move(Msg));
69	69	}

72	72
73	73
74	74
75		#define LOG_ERROR(...) \
76		do \
77		{ \
78		Diligent::LogError<false>(__FUNCTION__, __FILE__, __LINE__, ##__VA_ARGS__); \
	75	#define LOG_ERROR(...) \
	76	do \
	77	{ \
	78	Diligent::LogError<false>(/IsFatal=/false, __FUNCTION__, __FILE__, __LINE__, ##__VA_ARGS__); \
79	79	} while (false)
80	80
	81
	82	#define LOG_FATAL_ERROR(...) \
	83	do \
	84	{ \
	85	Diligent::LogError<false>(/IsFatal=/true, __FUNCTION__, __FILE__, __LINE__, ##__VA_ARGS__); \
	86	} while (false)
81	87
82	88	#define LOG_ERROR_ONCE(...) \
83	89	do \

91	97	} while (false)
92	98
93	99
94		#define LOG_ERROR_AND_THROW(...) \
95		do \
96		{ \
97		Diligent::LogError<true>(__FUNCTION__, __FILE__, __LINE__, ##__VA_ARGS__); \
	100	#define LOG_ERROR_AND_THROW(...) \
	101	do \
	102	{ \
	103	Diligent::LogError<true>(/IsFatal=/false, __FUNCTION__, __FILE__, __LINE__, ##__VA_ARGS__); \
	104	} while (false)
	105
	106	#define LOG_FATAL_ERROR_AND_THROW(...) \
	107	do \
	108	{ \
	109	Diligent::LogError<true>(/IsFatal=/true, __FUNCTION__, __FILE__, __LINE__, ##__VA_ARGS__); \
98	110	} while (false)
99	111
100	112

105	117	if (Diligent::DebugMessageCallback != nullptr) Diligent::DebugMessageCallback(Severity, _msg.c_str(), nullptr, nullptr, 0); \
106	118	} while (false)
107	119
108		#define LOG_ERROR_MESSAGE(...) LOG_DEBUG_MESSAGE(Diligent::DebugMessageSeverity::Error, ##__VA_ARGS__)
109		#define LOG_WARNING_MESSAGE(...) LOG_DEBUG_MESSAGE(Diligent::DebugMessageSeverity::Warning, ##__VA_ARGS__)
110		#define LOG_INFO_MESSAGE(...) LOG_DEBUG_MESSAGE(Diligent::DebugMessageSeverity::Info, ##__VA_ARGS__)
	120	#define LOG_FATAL_ERROR_MESSAGE(...) LOG_DEBUG_MESSAGE(Diligent::DebugMessageSeverity::FatalError, ##__VA_ARGS__)
	121	#define LOG_ERROR_MESSAGE(...) LOG_DEBUG_MESSAGE(Diligent::DebugMessageSeverity::Error, ##__VA_ARGS__)
	122	#define LOG_WARNING_MESSAGE(...) LOG_DEBUG_MESSAGE(Diligent::DebugMessageSeverity::Warning, ##__VA_ARGS__)
	123	#define LOG_INFO_MESSAGE(...) LOG_DEBUG_MESSAGE(Diligent::DebugMessageSeverity::Info, ##__VA_ARGS__)
111	124
112	125
113	126	#define LOG_DEBUG_MESSAGE_ONCE(Severity, ...) \

121	134	} \
122	135	} while (false)
123	136
124		#define LOG_ERROR_MESSAGE_ONCE(...) LOG_DEBUG_MESSAGE_ONCE(Diligent::DebugMessageSeverity::Error, ##__VA_ARGS__)
125		#define LOG_WARNING_MESSAGE_ONCE(...) LOG_DEBUG_MESSAGE_ONCE(Diligent::DebugMessageSeverity::Warning, ##__VA_ARGS__)
126		#define LOG_INFO_MESSAGE_ONCE(...) LOG_DEBUG_MESSAGE_ONCE(Diligent::DebugMessageSeverity::Info, ##__VA_ARGS__)
	137	#define LOG_FATAL_ERROR_MESSAGE_ONCE(...) LOG_DEBUG_MESSAGE_ONCE(Diligent::DebugMessageSeverity::FatalError, ##__VA_ARGS__)
	138	#define LOG_ERROR_MESSAGE_ONCE(...) LOG_DEBUG_MESSAGE_ONCE(Diligent::DebugMessageSeverity::Error, ##__VA_ARGS__)
	139	#define LOG_WARNING_MESSAGE_ONCE(...) LOG_DEBUG_MESSAGE_ONCE(Diligent::DebugMessageSeverity::Warning, ##__VA_ARGS__)
	140	#define LOG_INFO_MESSAGE_ONCE(...) LOG_DEBUG_MESSAGE_ONCE(Diligent::DebugMessageSeverity::Info, ##__VA_ARGS__)
127	141
128	142
129	143	#define CHECK(Expr, Severity, ...) \

135	149	} \
136	150	} while (false)
137	151
138		#define CHECK_ERR(Expr, ...) CHECK(Expr, Diligent::DebugMessageSeverity::Error, ##__VA_ARGS__)
139		#define CHECK_WARN(Expr, ...) CHECK(Expr, Diligent::DebugMessageSeverity::Warning, ##__VA_ARGS__)
140		#define CHECK_INFO(Expr, ...) CHECK(Expr, Diligent::DebugMessageSeverity::Info, ##__VA_ARGS__)
	152	#define CHECK_FATAL_ERR(Expr, ...) CHECK(Expr, Diligent::DebugMessageSeverity::FatalError, ##__VA_ARGS__)
	153	#define CHECK_ERR(Expr, ...) CHECK(Expr, Diligent::DebugMessageSeverity::Error, ##__VA_ARGS__)
	154	#define CHECK_WARN(Expr, ...) CHECK(Expr, Diligent::DebugMessageSeverity::Warning, ##__VA_ARGS__)
	155	#define CHECK_INFO(Expr, ...) CHECK(Expr, Diligent::DebugMessageSeverity::Info, ##__VA_ARGS__)
141	156
142	157	#define CHECK_THROW(Expr, ...) \
143	158	do \