Merge pull request #775 from Devsh-Graphics-Programming/ali_cbl

video: improve error logging in `IGPUCommandBuffer`

Author: devshgraphicsprogramming

include/nbl/video/IGPUCommandBuffer.h

@@ -11,6 +11,10 @@
 #include "nbl/video/IGPUCommandPool.h"
 #include "nbl/video/IQueue.h"
 
+#include "git_info.h"
+#define NBL_LOG_FUNCTION m_logger.log
+#include "nbl/logging_macros.h"
+
 // TODO: remove
 #define VK_NO_PROTOTYPES
 #include <vulkan/vulkan.h>
@@ -721,7 +725,7 @@ class NBL_API2 IGPUCommandBuffer : public IBackendObject
                 return true;
             if (!buffer->getCreationParams().usage.hasFlags(usages))
             {
-                m_logger.log("Incorrect `IGPUBuffer` usage flags for the command!", system::ILogger::ELL_ERROR);
+                NBL_LOG_ERROR("Incorrect `IGPUBuffer` usage flags for the command!");
                 return true;
             }
             return false;
@@ -732,7 +736,7 @@ class NBL_API2 IGPUCommandBuffer : public IBackendObject
                 return true;
             if (binding.offset&(alignment-1))
             {
-                m_logger.log("Offset %d not aligned to %d for the command!", system::ILogger::ELL_ERROR, binding.offset, alignment);
+                NBL_LOG_ERROR("Offset %d not aligned to %d for the command!", binding.offset, alignment);
                 return true;
             }
             return false;
@@ -742,17 +746,23 @@ class NBL_API2 IGPUCommandBuffer : public IBackendObject
             if (invalidBufferBinding({range.offset,range.buffer},alignment,usages))
                 return true;
             if ((range.size&(alignment-1)) && range.size!=asset::SBufferRange<IGPUBuffer>::WholeBuffer)
+            {
+                NBL_LOG_ERROR("Size %d not aligned to %d for the command!", range.size, alignment);
                 return true;
+            }
             return false;
         }
 
         inline bool invalidImage(const IGPUImage* image, const IGPUImage::E_USAGE_FLAGS usages) const
         {
             if (!image || !this->isCompatibleDevicewise(image))
+            {
+                NBL_LOG_ERROR("invalid image!");
                 return true;
+            }
             if (!image->getCreationParameters().usage.hasFlags(usages))
             {
-                m_logger.log("Incorrect `IGPUImage` usage flags for the command!", system::ILogger::ELL_ERROR);
+                NBL_LOG_ERROR("Incorrect `IGPUImage` usage flags for the command!");
                 return true;
             }
             return false;
@@ -767,14 +777,18 @@ class NBL_API2 IGPUCommandBuffer : public IBackendObject
                 case IGPUImage::LAYOUT::SHARED_PRESENT:
                     break;
                 default:
+                    NBL_LOG_ERROR("invalid destination image layout!");
                     return true;
             }
             if (invalidImage(image,IGPUImage::EUF_TRANSFER_DST_BIT))
                 return true;
             if constexpr (!clear)
             {
                 if (image->getCreationParameters().samples!=IGPUImage::E_SAMPLE_COUNT_FLAGS::ESCF_1_BIT)
+                {
+                    NBL_LOG_ERROR("destination image sample count must be 1!");
                     return true;
+                }
             }
             return false;
         }
@@ -787,6 +801,7 @@ class NBL_API2 IGPUCommandBuffer : public IBackendObject
                 case IGPUImage::LAYOUT::SHARED_PRESENT:
                     break;
                 default:
+                    NBL_LOG_ERROR("invalid source image layout!");
                     return true;
             }
             return invalidImage(image,IGPUImage::EUF_TRANSFER_SRC_BIT);
@@ -847,4 +862,5 @@ extern template bool IGPUCommandBuffer::invalidDependency(const SDependencyInfo<
 
 }
 
+#include "nbl/undef_logging_macros.h"
 #endif