video: use NBL_LOG_ERROR in IGPUCommandBuffer.h

alichraghi · alichraghi · commit 2675ce268bb7 · 2024-11-08T13:17:42.000+03:30
Signed-off-by: Ali Cheraghi &lt;alichraghi@proton.me&gt;
diff --git a/include/nbl/video/IGPUCommandBuffer.h b/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>
@@ -716,7 +720,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;
@@ -727,7 +731,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;
@@ -738,7 +742,7 @@ class NBL_API2 IGPUCommandBuffer : public IBackendObject
                 return true;
             if ((range.size&(alignment-1)) && range.size!=asset::SBufferRange<IGPUBuffer>::WholeBuffer)
             {
-                m_logger.log("Size %d not aligned to %d for the command!", system::ILogger::ELL_ERROR, range.size, alignment);
+                NBL_LOG_ERROR("Size %d not aligned to %d for the command!", range.size, alignment);
                 return true;
             }
             return false;
@@ -748,12 +752,12 @@ class NBL_API2 IGPUCommandBuffer : public IBackendObject
         {
             if (!image || !this->isCompatibleDevicewise(image))
             {
-                m_logger.log("invalid image!", system::ILogger::ELL_ERROR);
+                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;
@@ -768,7 +772,7 @@ class NBL_API2 IGPUCommandBuffer : public IBackendObject
                 case IGPUImage::LAYOUT::SHARED_PRESENT:
                     break;
                 default:
-                    m_logger.log("invalid destination image layout!", system::ILogger::ELL_ERROR);
+                    NBL_LOG_ERROR("invalid destination image layout!");
                     return true;
             }
             if (invalidImage(image,IGPUImage::EUF_TRANSFER_DST_BIT))
@@ -777,7 +781,7 @@ class NBL_API2 IGPUCommandBuffer : public IBackendObject
             {
                 if (image->getCreationParameters().samples!=IGPUImage::E_SAMPLE_COUNT_FLAGS::ESCF_1_BIT)
                 {
-                    m_logger.log("destination image sample count must be 1!", system::ILogger::ELL_ERROR);
+                    NBL_LOG_ERROR("destination image sample count must be 1!");
                     return true;
                 }
             }
@@ -792,7 +796,7 @@ class NBL_API2 IGPUCommandBuffer : public IBackendObject
                 case IGPUImage::LAYOUT::SHARED_PRESENT:
                     break;
                 default:
-                    m_logger.log("invalid source image layout!", system::ILogger::ELL_ERROR);
+                    NBL_LOG_ERROR("invalid source image layout!");
                     return true;
             }
             return invalidImage(image,IGPUImage::EUF_TRANSFER_SRC_BIT);
@@ -853,4 +857,5 @@ extern template bool IGPUCommandBuffer::invalidDependency(const SDependencyInfo<
 
 }
 
+#include "nbl/undef_logging_macros.h"
 #endif
diff --git a/src/nbl/video/IGPUCommandBuffer.cpp b/src/nbl/video/IGPUCommandBuffer.cpp
@@ -1440,8 +1440,10 @@ bool IGPUCommandBuffer::clearAttachments(const SClearAttachments& info)
         }
         // https://registry.khronos.org/vulkan/specs/1.3-extensions/man/html/vkCmdClearAttachments.html#VUID-vkCmdClearAttachments-aspectMask-07885
         if (info.clearStencil && asset::isDepthOnlyFormat(depthStencilAttachment.format))
+        {
             NBL_LOG_ERROR("depth only asset can't be cleared with the 'clearStencil' parameter!");
-        return false;
+            return false;
+        }
     }
     for (auto i=0; i<sizeof(info.clearColorMask)*8; i++)
     {
@@ -1556,7 +1558,7 @@ bool IGPUCommandBuffer::drawIndirect(const asset::SBufferBinding<const IGPUBuffe
     if (!m_cmdpool->m_commandListPool.emplace<IGPUCommandPool::CIndirectCmd>(m_commandList,core::smart_refctd_ptr<const IGPUBuffer>(binding.buffer)))
     {
         NBL_LOG_ERROR("out of host memory!");
-        return true;
+        return false;
     }
 
     m_noCommands = false;
@@ -1571,7 +1573,7 @@ bool IGPUCommandBuffer::drawIndexedIndirect(const asset::SBufferBinding<const IG
     if (!m_cmdpool->m_commandListPool.emplace<IGPUCommandPool::CIndirectCmd>(m_commandList, core::smart_refctd_ptr<const IGPUBuffer>(binding.buffer)))
     {
         NBL_LOG_ERROR("out of host memory!");
-        return true;
+        return false;
     }
 
     m_noCommands = false;
@@ -1586,7 +1588,7 @@ bool IGPUCommandBuffer::drawIndirectCount(const asset::SBufferBinding<const IGPU
     if (!m_cmdpool->m_commandListPool.emplace<IGPUCommandPool::CDrawIndirectCountCmd>(m_commandList, core::smart_refctd_ptr<const IGPUBuffer>(indirectBinding.buffer), core::smart_refctd_ptr<const IGPUBuffer>(countBinding.buffer)))
     {
         NBL_LOG_ERROR("out of host memory!");
-        return true;
+        return false;
     }
 
     m_noCommands = false;
@@ -1601,7 +1603,7 @@ bool IGPUCommandBuffer::drawIndexedIndirectCount(const asset::SBufferBinding<con
     if (!m_cmdpool->m_commandListPool.emplace<IGPUCommandPool::CDrawIndirectCountCmd>(m_commandList, core::smart_refctd_ptr<const IGPUBuffer>(indirectBinding.buffer), core::smart_refctd_ptr<const IGPUBuffer>(countBinding.buffer)))
     {
         NBL_LOG_ERROR("out of host memory!");
-        return true;
+        return false;
     }
 
     m_noCommands = false;

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,10 @@`
`11`	`11`	`#include "nbl/video/IGPUCommandPool.h"`
`12`	`12`	`#include "nbl/video/IQueue.h"`
`13`	`13`
	`14`	`+#include "git_info.h"`
	`15`	`+#define NBL_LOG_FUNCTION m_logger.log`
	`16`	`+#include "nbl/logging_macros.h"`
	`17`	`+`
`14`	`18`	`// TODO: remove`
`15`	`19`	`#define VK_NO_PROTOTYPES`
`16`	`20`	`#include <vulkan/vulkan.h>`
`@@ -716,7 +720,7 @@ class NBL_API2 IGPUCommandBuffer : public IBackendObject`
`716`	`720`	`return true;`
`717`	`721`	`if (!buffer->getCreationParams().usage.hasFlags(usages))`
`718`	`722`	`{`
`719`		- m_logger.log("Incorrect `IGPUBuffer` usage flags for the command!", system::ILogger::ELL_ERROR);
	`723`	+ NBL_LOG_ERROR("Incorrect `IGPUBuffer` usage flags for the command!");
`720`	`724`	`return true;`
`721`	`725`	`}`
`722`	`726`	`return false;`
`@@ -727,7 +731,7 @@ class NBL_API2 IGPUCommandBuffer : public IBackendObject`
`727`	`731`	`return true;`
`728`	`732`	`if (binding.offset&(alignment-1))`
`729`	`733`	`{`
`730`		`- m_logger.log("Offset %d not aligned to %d for the command!", system::ILogger::ELL_ERROR, binding.offset, alignment);`
	`734`	`+ NBL_LOG_ERROR("Offset %d not aligned to %d for the command!", binding.offset, alignment);`
`731`	`735`	`return true;`
`732`	`736`	`}`
`733`	`737`	`return false;`
`@@ -738,7 +742,7 @@ class NBL_API2 IGPUCommandBuffer : public IBackendObject`
`738`	`742`	`return true;`
`739`	`743`	`if ((range.size&(alignment-1)) && range.size!=asset::SBufferRange<IGPUBuffer>::WholeBuffer)`
`740`	`744`	`{`
`741`		`- m_logger.log("Size %d not aligned to %d for the command!", system::ILogger::ELL_ERROR, range.size, alignment);`
	`745`	`+ NBL_LOG_ERROR("Size %d not aligned to %d for the command!", range.size, alignment);`
`742`	`746`	`return true;`
`743`	`747`	`}`
`744`	`748`	`return false;`
`@@ -748,12 +752,12 @@ class NBL_API2 IGPUCommandBuffer : public IBackendObject`
`748`	`752`	`{`
`749`	`753`	`if (!image \|\| !this->isCompatibleDevicewise(image))`
`750`	`754`	`{`
`751`		`- m_logger.log("invalid image!", system::ILogger::ELL_ERROR);`
	`755`	`+ NBL_LOG_ERROR("invalid image!");`
`752`	`756`	`return true;`
`753`	`757`	`}`
`754`	`758`	`if (!image->getCreationParameters().usage.hasFlags(usages))`
`755`	`759`	`{`
`756`		- m_logger.log("Incorrect `IGPUImage` usage flags for the command!", system::ILogger::ELL_ERROR);
	`760`	+ NBL_LOG_ERROR("Incorrect `IGPUImage` usage flags for the command!");
`757`	`761`	`return true;`
`758`	`762`	`}`
`759`	`763`	`return false;`
`@@ -768,7 +772,7 @@ class NBL_API2 IGPUCommandBuffer : public IBackendObject`
`768`	`772`	`case IGPUImage::LAYOUT::SHARED_PRESENT:`
`769`	`773`	`break;`
`770`	`774`	`default:`
`771`		`- m_logger.log("invalid destination image layout!", system::ILogger::ELL_ERROR);`
	`775`	`+ NBL_LOG_ERROR("invalid destination image layout!");`
`772`	`776`	`return true;`
`773`	`777`	`}`
`774`	`778`	`if (invalidImage(image,IGPUImage::EUF_TRANSFER_DST_BIT))`
`@@ -777,7 +781,7 @@ class NBL_API2 IGPUCommandBuffer : public IBackendObject`
`777`	`781`	`{`
`778`	`782`	`if (image->getCreationParameters().samples!=IGPUImage::E_SAMPLE_COUNT_FLAGS::ESCF_1_BIT)`
`779`	`783`	`{`
`780`		`- m_logger.log("destination image sample count must be 1!", system::ILogger::ELL_ERROR);`
	`784`	`+ NBL_LOG_ERROR("destination image sample count must be 1!");`
`781`	`785`	`return true;`
`782`	`786`	`}`
`783`	`787`	`}`
`@@ -792,7 +796,7 @@ class NBL_API2 IGPUCommandBuffer : public IBackendObject`
`792`	`796`	`case IGPUImage::LAYOUT::SHARED_PRESENT:`
`793`	`797`	`break;`
`794`	`798`	`default:`
`795`		`- m_logger.log("invalid source image layout!", system::ILogger::ELL_ERROR);`
	`799`	`+ NBL_LOG_ERROR("invalid source image layout!");`
`796`	`800`	`return true;`
`797`	`801`	`}`
`798`	`802`	`return invalidImage(image,IGPUImage::EUF_TRANSFER_SRC_BIT);`
`@@ -853,4 +857,5 @@ extern template bool IGPUCommandBuffer::invalidDependency(const SDependencyInfo<`
`853`	`857`
`854`	`858`	`}`
`855`	`859`
	`860`	`+#include "nbl/undef_logging_macros.h"`
`856`	`861`	`#endif`
Original file line number	Diff line number	Diff line change
`@@ -1440,8 +1440,10 @@ bool IGPUCommandBuffer::clearAttachments(const SClearAttachments& info)`
`1440`	`1440`	`}`
`1441`	`1441`	`// https://registry.khronos.org/vulkan/specs/1.3-extensions/man/html/vkCmdClearAttachments.html#VUID-vkCmdClearAttachments-aspectMask-07885`
`1442`	`1442`	`if (info.clearStencil && asset::isDepthOnlyFormat(depthStencilAttachment.format))`
	`1443`	`+ {`
`1443`	`1444`	`NBL_LOG_ERROR("depth only asset can't be cleared with the 'clearStencil' parameter!");`
`1444`		`- return false;`
	`1445`	`+ return false;`
	`1446`	`+ }`
`1445`	`1447`	`}`
`1446`	`1448`	`for (auto i=0; i<sizeof(info.clearColorMask)*8; i++)`
`1447`	`1449`	`{`
`@@ -1556,7 +1558,7 @@ bool IGPUCommandBuffer::drawIndirect(const asset::SBufferBinding<const IGPUBuffe`
`1556`	`1558`	`if (!m_cmdpool->m_commandListPool.emplace<IGPUCommandPool::CIndirectCmd>(m_commandList,core::smart_refctd_ptr<const IGPUBuffer>(binding.buffer)))`
`1557`	`1559`	`{`
`1558`	`1560`	`NBL_LOG_ERROR("out of host memory!");`
`1559`		`- return true;`
	`1561`	`+ return false;`
`1560`	`1562`	`}`
`1561`	`1563`
`1562`	`1564`	`m_noCommands = false;`
`@@ -1571,7 +1573,7 @@ bool IGPUCommandBuffer::drawIndexedIndirect(const asset::SBufferBinding<const IG`
`1571`	`1573`	`if (!m_cmdpool->m_commandListPool.emplace<IGPUCommandPool::CIndirectCmd>(m_commandList, core::smart_refctd_ptr<const IGPUBuffer>(binding.buffer)))`
`1572`	`1574`	`{`
`1573`	`1575`	`NBL_LOG_ERROR("out of host memory!");`
`1574`		`- return true;`
	`1576`	`+ return false;`
`1575`	`1577`	`}`
`1576`	`1578`
`1577`	`1579`	`m_noCommands = false;`
`@@ -1586,7 +1588,7 @@ bool IGPUCommandBuffer::drawIndirectCount(const asset::SBufferBinding<const IGPU`
`1586`	`1588`	`if (!m_cmdpool->m_commandListPool.emplace<IGPUCommandPool::CDrawIndirectCountCmd>(m_commandList, core::smart_refctd_ptr<const IGPUBuffer>(indirectBinding.buffer), core::smart_refctd_ptr<const IGPUBuffer>(countBinding.buffer)))`
`1587`	`1589`	`{`
`1588`	`1590`	`NBL_LOG_ERROR("out of host memory!");`
`1589`		`- return true;`
	`1591`	`+ return false;`
`1590`	`1592`	`}`
`1591`	`1593`
`1592`	`1594`	`m_noCommands = false;`
`@@ -1601,7 +1603,7 @@ bool IGPUCommandBuffer::drawIndexedIndirectCount(const asset::SBufferBinding<con`
`1601`	`1603`	`if (!m_cmdpool->m_commandListPool.emplace<IGPUCommandPool::CDrawIndirectCountCmd>(m_commandList, core::smart_refctd_ptr<const IGPUBuffer>(indirectBinding.buffer), core::smart_refctd_ptr<const IGPUBuffer>(countBinding.buffer)))`
`1602`	`1604`	`{`
`1603`	`1605`	`NBL_LOG_ERROR("out of host memory!");`
`1604`		`- return true;`
	`1606`	`+ return false;`
`1605`	`1607`	`}`
`1606`	`1608`
`1607`	`1609`	`m_noCommands = false;`