Merge branch 'master' into descriptor_lifetime_tracking

Author: achalpandeyy

examples_tests

@@ -14,13 +14,8 @@ namespace nbl::system
 class IApplicationFramework
 {
 	public:
-        IApplicationFramework(
-            const system::path& _localInputCWD, 
-            const system::path& _localOutputCWD, 
-            const system::path& _sharedInputCWD, 
-            const system::path& _sharedOutputCWD) : 
-            localInputCWD(_localInputCWD), localOutputCWD(_localOutputCWD), sharedInputCWD(_sharedInputCWD), sharedOutputCWD(_sharedOutputCWD)
-		{
+        static void GlobalsInit()
+        {
             #ifdef _NBL_PLATFORM_WINDOWS_
             // TODO: @AnastaZIuk also provide define constants for DXC install dir!
             const HRESULT dxcLoad = CSystemWin32::delayLoadDLL("dxcompiler.dll",{system::path(_DXC_DLL_).parent_path()});
@@ -31,7 +26,19 @@ class IApplicationFramework
             const HRESULT nablaLoad = CSystemWin32::delayLoadDLL(_NABLA_DLL_NAME_,{_NABLA_OUTPUT_DIR_,_NABLA_INSTALL_DIR_});
             assert(SUCCEEDED(nablaLoad));
             #endif
+            #else
+            // nothing else needs to be done cause we have RPath
             #endif
+        }
+
+        IApplicationFramework(
+            const system::path& _localInputCWD, 
+            const system::path& _localOutputCWD, 
+            const system::path& _sharedInputCWD, 
+            const system::path& _sharedOutputCWD) : 
+            localInputCWD(_localInputCWD), localOutputCWD(_localOutputCWD), sharedInputCWD(_sharedInputCWD), sharedOutputCWD(_sharedOutputCWD)
+		{
+            GlobalsInit();
 		}
 
         virtual void setSystem(core::smart_refctd_ptr<nbl::system::ISystem>&& system) = 0;
@@ -47,6 +54,8 @@ class IApplicationFramework
 
         virtual void workLoopBody() = 0;
         virtual bool keepRunning() = 0;
+
+        // TODO: refactor/hide
         std::vector<std::string> argv;
 
     protected:

include/nbl/system/IApplicationFramework.h

@@ -14,7 +14,7 @@ class IFile : public IFileBase, private ISystem::IFutureManipulator
 		{
 			const IFileBase* constThis = this;
 			const auto* ptr = reinterpret_cast<const std::byte*>(constThis->getMappedPointer());
-			if (ptr)
+			if (ptr || sizeToRead==0ull)
 			{
 				const size_t size = getSize();
 				if (offset+sizeToRead>size)
@@ -28,7 +28,7 @@ class IFile : public IFileBase, private ISystem::IFutureManipulator
 		inline void write(ISystem::future_t<size_t>& fut, const void* buffer, size_t offset, size_t sizeToWrite)
 		{
 			auto* ptr = reinterpret_cast<std::byte*>(getMappedPointer());
-			if (ptr)
+			if (ptr || sizeToWrite==0ull)
 			{
 				// TODO: growable mappings
 				if (offset+sizeToWrite>getSize())

include/nbl/system/IFile.h

@@ -31,7 +31,7 @@ class ILogger : public core::IReferenceCounted
 			ELL_ERROR = 16
 		};
 
-		void log(const std::string_view& fmtString, E_LOG_LEVEL logLevel = ELL_DEBUG, ...)
+		inline void log(const std::string_view& fmtString, E_LOG_LEVEL logLevel = ELL_DEBUG, ...)
 		{
 			if (logLevel & m_logLevelMask.value)
 			{
@@ -48,12 +48,12 @@ class ILogger : public core::IReferenceCounted
 		}
 
 	protected:
-		static core::bitflag<E_LOG_LEVEL> defaultLogMask();
+		NBL_API2 static core::bitflag<E_LOG_LEVEL> defaultLogMask();
 
 		ILogger(core::bitflag<E_LOG_LEVEL> logLevelMask) : m_logLevelMask(logLevelMask) {}
 
 		virtual void log_impl(const std::string_view& fmtString, E_LOG_LEVEL logLevel, va_list args) = 0;
-		virtual std::string constructLogString(const std::string_view& fmtString, E_LOG_LEVEL logLevel, va_list l)
+		inline virtual std::string constructLogString(const std::string_view& fmtString, E_LOG_LEVEL logLevel, va_list l)
 		{
 			using namespace std::literals;
 			using namespace std::chrono;
@@ -115,38 +115,38 @@ class ILogger : public core::IReferenceCounted
 class logger_opt_ptr final
 {
 	public:
-		logger_opt_ptr(ILogger* const _logger) : logger(_logger) {}
-		~logger_opt_ptr() = default;
+		inline logger_opt_ptr(ILogger* const _logger) : logger(_logger) {}
+		inline ~logger_opt_ptr() = default;
 
 		template<typename... Args>
-		void log(const std::string_view& fmtString, ILogger::E_LOG_LEVEL logLevel = ILogger::ELL_DEBUG, Args&&... args) const
+		inline void log(const std::string_view& fmtString, ILogger::E_LOG_LEVEL logLevel = ILogger::ELL_DEBUG, Args&&... args) const
 		{
 			if (logger != nullptr)
 				return logger->log(fmtString, logLevel, std::forward<Args>(args)...);
 		}
 
-		ILogger* get() const { return logger; }
+		inline ILogger* get() const { return logger; }
 	private:
 		mutable ILogger* logger;
 };
 
 class logger_opt_smart_ptr final
 {
 	public:
-		logger_opt_smart_ptr(core::smart_refctd_ptr<ILogger>&& _logger) : logger(std::move(_logger)) {}
-		logger_opt_smart_ptr(std::nullptr_t t) : logger(nullptr) {}
-		~logger_opt_smart_ptr() = default;
+		inline logger_opt_smart_ptr(core::smart_refctd_ptr<ILogger>&& _logger) : logger(std::move(_logger)) {}
+		inline logger_opt_smart_ptr(std::nullptr_t t) : logger(nullptr) {}
+		inline ~logger_opt_smart_ptr() = default;
 
 		template<typename... Args>
-		void log(const std::string_view& fmtString, ILogger::E_LOG_LEVEL logLevel = ILogger::ELL_DEBUG, Args&&... args) const
+		inline void log(const std::string_view& fmtString, ILogger::E_LOG_LEVEL logLevel = ILogger::ELL_DEBUG, Args&&... args) const
 		{
 			if (logger.get() != nullptr)
 				return logger->log(fmtString, logLevel, std::forward<Args>(args)...);
 		}
 
-		ILogger* getRaw() const { return logger.get(); }
-		logger_opt_ptr getOptRawPtr() const { return logger_opt_ptr(logger.get()); }
-		const core::smart_refctd_ptr<ILogger>& get() const { return logger; }
+		inline ILogger* getRaw() const { return logger.get(); }
+		inline logger_opt_ptr getOptRawPtr() const { return logger_opt_ptr(logger.get()); }
+		inline const core::smart_refctd_ptr<ILogger>& get() const { return logger; }
 
 	private:
 		mutable core::smart_refctd_ptr<ILogger> logger;