Merge remote-tracking branch 'origin/master' into bindless_blit

Author: devsh

include/nbl/builtin/hlsl/type_traits.hlsl

@@ -695,7 +695,7 @@ struct unsigned_integer_of_size<8>
     using type = uint64_t;
 };
 template<uint16_t bytesize>
-using unsigned_integer_of_size_t = unsigned_integer_of_size<bytesize>::type;
+using unsigned_integer_of_size_t = typename unsigned_integer_of_size<bytesize>::type;
 
 }
 }

include/nbl/core/hash/blake.h

@@ -4,12 +4,10 @@
 #ifndef _NBL_CORE_HASH_BLAKE3_H_INCLUDED_
 #define _NBL_CORE_HASH_BLAKE3_H_INCLUDED_
 
-
 #include "blake3.h"
 
 #include <span>
 
-
 namespace nbl::core
 {
 struct blake3_hash_t final
@@ -21,7 +19,7 @@ struct blake3_hash_t final
 	uint8_t data[BLAKE3_OUT_LEN];
 };
 
-class blake3_hasher final
+class NBL_API2 blake3_hasher final
 {
 		template<typename T, typename Dummy=void>
 		struct update_impl
@@ -39,31 +37,17 @@ class blake3_hasher final
 		::blake3_hasher m_state;
 
 	public:
-		inline blake3_hasher()
-		{
-			::blake3_hasher_init(&m_state);
-		}
+		blake3_hasher();
 
-		inline blake3_hasher& update(const void* data, const size_t bytes)
-		{
-			::blake3_hasher_update(&m_state,data,bytes);
-			return *this;
-		}
+		blake3_hasher& update(const void* data, const size_t bytes);
 
 		template<typename T>
-		blake3_hasher& operator<<(const T& input)
-		{
-			update_impl<T>::__call(*this,input);
+		blake3_hasher& operator<<(const T& input) {
+			update_impl<T>::__call(*this, input);
 			return *this;
 		}
 
-		explicit inline operator blake3_hash_t() const
-		{
-			blake3_hash_t retval;
-			// the blake3 docs say that the hasher can be finalized multiple times
-			::blake3_hasher_finalize(&m_state,retval.data,sizeof(retval));
-			return retval;
-		}
+		explicit operator blake3_hash_t() const;
 };
 
 // Useful specializations

include/nbl/video/utilities/SIntendedSubmitInfo.h

@@ -251,8 +251,10 @@ struct SIntendedSubmitInfo final : core::Uncopyable
                 }
             }
             // could have just called begin to reset but also need to reset with the release resources flag
-            recordingCmdBuf->cmdbuf->reset(IGPUCommandBuffer::RESET_FLAGS::RELEASE_RESOURCES_BIT);
-            recordingCmdBuf->cmdbuf->begin(IGPUCommandBuffer::USAGE::ONE_TIME_SUBMIT_BIT);
+            if (!recordingCmdBuf->cmdbuf->reset(IGPUCommandBuffer::RESET_FLAGS::RELEASE_RESOURCES_BIT))
+                return false;
+            if (!recordingCmdBuf->cmdbuf->begin(IGPUCommandBuffer::USAGE::ONE_TIME_SUBMIT_BIT))
+                return false;
 
             return true;
         }

src/nbl/CMakeLists.txt

@@ -119,6 +119,7 @@ unset(NABLA_HEADERS_PUBLIC2 ${NBL_TMP_FULL_PATHS})
 
 set(NBL_CORE_SOURCES
 	${NBL_ROOT_PATH}/src/nbl/core/IReferenceCounted.cpp
+	${NBL_ROOT_PATH}/src/nbl/core/hash/blake.cpp
 )
 set(NBL_SYSTEM_SOURCES
 	${NBL_ROOT_PATH}/src/nbl/system/DefaultFuncPtrLoader.cpp
@@ -388,11 +389,6 @@ if(_NBL_BUILD_DPL_)
 	target_link_libraries(Nabla INTERFACE tbb tbbmalloc tbbmalloc_proxy)
 endif()
 
-# blake3
-target_link_libraries(Nabla PUBLIC 
-	blake3
-)
-
 # boost
 target_include_directories(Nabla PUBLIC "${BOOST_PREPROCESSOR_INCLUDE}")
 

src/nbl/asset/utils/CHLSLCompiler.cpp

@@ -352,11 +352,13 @@ std::string CHLSLCompiler::preprocessShader(std::string&& code, IShader::E_SHADE
     }
     catch (boost::wave::preprocess_exception& e)
     {
-        preprocessOptions.logger.log("Boost.Wave %s exception caught!",system::ILogger::ELL_ERROR,e.what());
+        preprocessOptions.logger.log("%s exception caught. %s [%s:%d:%d]",system::ILogger::ELL_ERROR,e.what(),e.description(),e.file_name(),e.line_no(),e.column_no());
+        return {};
     }
     catch (...)
     {
         preprocessOptions.logger.log("Unknown exception caught!",system::ILogger::ELL_ERROR);
+        return {};
     }
 
     // for debugging cause MSVC doesn't like to show more than 21k LoC in TextVisualizer

src/nbl/core/hash/blake.cpp

@@ -0,0 +1,25 @@
+#include "nbl/core/hash/blake.h"
+
+namespace nbl::core
+{
+
+blake3_hasher::blake3_hasher()
+{
+    ::blake3_hasher_init(&m_state);
+}
+
+blake3_hasher& blake3_hasher::update(const void* data, const size_t bytes)
+{
+    ::blake3_hasher_update(&m_state, data, bytes);
+    return *this;
+}
+
+blake3_hasher::operator blake3_hash_t() const
+{
+    blake3_hash_t retval;
+    // the blake3 docs say that the hasher can be finalized multiple times
+    ::blake3_hasher_finalize(&m_state, retval.data, sizeof(retval));
+    return retval;
+}
+
+}