move x-macro to def/undef headers

Author: tad1

include/nbl/logging_macros.h

@@ -0,0 +1,8 @@
+#ifdef __GIT_INFO_H_INCLUDED__
+// when "git_info.h" is included
+#	define LOG(SEVERITY, FORMAT, ...) LOG_FUNCTION(FORMAT" [%s][%s - %s:%d]", SEVERITY, __VA_ARGS__, nbl::gtml::nabla_git_info.commitShortHash, __FUNCTION__, __FILE__, __LINE__);
+#	define LOG_ERROR(FORMAT, ...) LOG(nbl::system::ILogger::ELL_ERROR, FORMAT, __VA_ARGS__)
+#else
+#	define LOG(SEVERITY, FORMAT, ...) LOG_FUNCTION(FORMAT" [%s - %s:%d]", SEVERITY, __VA_ARGS__, __FUNCTION__, __FILE__, __LINE__);
+#	define LOG_ERROR(FORMAT, ...) LOG(nbl::system::ILogger::ELL_ERROR, FORMAT, __VA_ARGS__)
+#endif

include/nbl/undef_logging_macros.h

@@ -0,0 +1,3 @@
+#undef LOG
+#undef LOG_ERROR
+#undef LOG_FUNCTION

include/nbl/video/ILogicalDevice.h

@@ -15,9 +15,8 @@
 #include "nbl/video/CJITIncludeLoader.h"
 
 #include "git_info.h"
-
 #define LOG_FUNCTION m_logger.log
-#define LOG_ERROR(FORMAT, ...) LOG_FUNCTION(FORMAT" [%s][%s - %s:%d]", nbl::system::ILogger::ELL_ERROR, __VA_ARGS__, nbl::gtml::nabla_git_info.commitShortHash , __FUNCTION__, __FILE__, __LINE__);
+#include "nbl/logging_macros.h"
 
 namespace nbl::video
 {
@@ -1469,6 +1468,5 @@ inline bool ILogicalDevice::validateMemoryBarrier(const uint32_t queueFamilyInde
 
 } // namespace nbl::video
 
-#undef LOG_FUNCTION
-#undef LOG_ERROR
+#include "nbl/undef_logging_macros.h"
 #endif //_NBL_VIDEO_I_LOGICAL_DEVICE_H_INCLUDED_

src/nbl/video/ILogicalDevice.cpp

@@ -1,14 +1,13 @@
 #include "nbl/video/IPhysicalDevice.h"
 
 #include "git_info.h"
+#define LOG_FUNCTION m_logger.log
+#include "nbl/logging_macros.h"
 
 using namespace nbl;
 using namespace nbl::video;
 
 
-#define LOG_FUNCTION m_logger.log
-#define LOG_ERROR(FORMAT, ...) LOG_FUNCTION(FORMAT" [%s][%s - %s:%d]", nbl::system::ILogger::ELL_ERROR, __VA_ARGS__, nbl::gtml::nabla_git_info.commitShortHash , __FUNCTION__, __FILE__, __LINE__);
-
 ILogicalDevice::ILogicalDevice(core::smart_refctd_ptr<const IAPIConnection>&& api, const IPhysicalDevice* const physicalDevice, const SCreationParams& params, const bool runningInRenderdoc)
     : m_api(api), m_physicalDevice(physicalDevice), m_enabledFeatures(params.featuresToEnable), m_compilerSet(params.compilerSet),
     m_logger(m_physicalDevice->getDebugCallback() ? m_physicalDevice->getDebugCallback()->getLogger():nullptr)
@@ -941,4 +940,6 @@ bool ILogicalDevice::createGraphicsPipelines(
             return false;
         }
     return true;
-}
+}
+
+#include "nbl/undef_logging_macros.h"

src/nbl/video/IQueue.cpp

@@ -4,10 +4,8 @@
 #include "nbl/video/TimelineEventHandlers.h"
 
 #include "git_info.h"
-
 #define LOG_FUNCTION logger->log
-#define LOG(SEVERITY, FORMAT, ...) LOG_FUNCTION(FORMAT" [%s][%s - %s:%d]", SEVERITY, __VA_ARGS__, nbl::gtml::nabla_git_info.commitShortHash , __FUNCTION__, __FILE__, __LINE__);
-#define LOG_ERROR(FORMAT, ...) LOG(nbl::system::ILogger::ELL_ERROR, FORMAT, __VA_ARGS__)
+#include "nbl/logging_macros.h"
 
 namespace nbl::video
 {
@@ -143,4 +141,6 @@ uint32_t IQueue::cullResources(const ISemaphore* sema)
     return m_submittedResources->poll().eventsLeft;
 }
 
-}
+} // namespace nbl::video
+
+#include "nbl/undef_logging_macros.h"