Added DebugMessageCallback to EngineCreation attribs

2 files changed, 53 insertions, 23 deletions

diff --git a/Primitives/interface/DebugOutput.h b/Primitives/interface/DebugOutput.h
new file mode 100644
index 00000000..969c8dd1
--- /dev/null
+++ b/Primitives/interface/DebugOutput.h
@@ -0,0 +1,52 @@
+/*     Copyright 2015-2018 Egor Yusov
+ *  
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF ANY PROPRIETARY RIGHTS.
+ *
+ *  In no event and under no legal theory, whether in tort (including negligence), 
+ *  contract, or otherwise, unless required by applicable law (such as deliberate 
+ *  and grossly negligent acts) or agreed to in writing, shall any Contributor be
+ *  liable for any damages, including any direct, indirect, special, incidental, 
+ *  or consequential damages of any character arising as a result of this License or 
+ *  out of the use or inability to use the software (including but not limited to damages 
+ *  for loss of goodwill, work stoppage, computer failure or malfunction, or any and 
+ *  all other commercial damages or losses), even if such Contributor has been advised 
+ *  of the possibility of such damages.
+ */
+
+#pragma once
+
+#include "BasicTypes.h"
+
+namespace Diligent
+{
+
+/// Describes debug message severity
+enum class DebugMessageSeverity : Int32
+{
+    /// Information message
+    Info = 0,
+
+    /// Warning message
+    Warning,
+
+    /// Error, with potential recovery
+    Error,
+
+    /// Fatal error - recovery is not possible
+    FatalError
+};
+
+using DebugMessageCallbackType = void(*)(DebugMessageSeverity, const Char* Message, const char* Function, const char* File, int Line);
+extern DebugMessageCallbackType DebugMessageCallback;
+
+void SetDebugMessageCallback(DebugMessageCallbackType DbgMessageCallback);
+
+}
diff --git a/Primitives/interface/Errors.h b/Primitives/interface/Errors.h
index faee22b5..1a1a4a4f 100644
--- a/Primitives/interface/Errors.h
+++ b/Primitives/interface/Errors.h
@@ -27,34 +27,12 @@
 #include <string>
 #include <iostream>
 
-#include "BasicTypes.h"
+#include "DebugOutput.h"
 #include "FormatMessage.h"
 
 namespace Diligent
 {
 
-/// Describes debug message severity
-enum class DebugMessageSeverity : Int32
-{
-    /// Information message
-    Info = 0,
-
-    /// Warning message
-    Warning,
-
-    /// Error, with potential recovery
-    Error,
-
-    /// Fatal error - recovery is not possible
-    FatalError
-};
-
-using DebugMessageCallbackType = void(*)(DebugMessageSeverity, const Char* Message, const char* Function, const char* File, int Line);
-extern DebugMessageCallbackType DebugMessageCallback;
-
-void SetDebugMessageCallback(DebugMessageCallbackType DbgMessageCallback);
-
-
 template<bool>
 void ThrowIf(std::string &&)
 {