Merge pull request #640 from Devsh-Graphics-Programming/timeline_events

Timeline events

Author: devshgraphicsprogramming

examples_tests

@@ -45,7 +45,7 @@ std::function<void(SAssetBundle&)> makeAssetDisposeFunc(const IAssetManager* con
 	@see IAsset
 
 */
-class NBL_API2 IAssetManager : public core::IReferenceCounted, public core::QuitSignalling
+class NBL_API2 IAssetManager : public core::IReferenceCounted
 {
         // the point of those functions is that lambdas returned by them "inherits" friendship
         friend std::function<void(SAssetBundle&)> makeAssetGreetFunc(const IAssetManager* const _mgr);
@@ -150,8 +150,6 @@ class NBL_API2 IAssetManager : public core::IReferenceCounted, public core::Quit
     protected:
 		virtual ~IAssetManager()
 		{
-            quitEventHandler.execute();
-
 			for (size_t i = 0u; i < m_assetCache.size(); ++i)
 				if (m_assetCache[i])
 					delete m_assetCache[i];

include/IVideoCapabilityReporter.h

@@ -53,7 +53,7 @@ inline T determinant(const matrix<T,N,M>& m)
 
 NBL_BIT_OP_GLM_PASSTHROUGH(findLSB,findLSB)
 
-NBL_BIT_OP_GLM_PASSTHROUGH(findMSB,findLSB)
+NBL_BIT_OP_GLM_PASSTHROUGH(findMSB,findMSB)
 
 // inverse not defined cause its implemented via hidden friend
 template<typename T, uint16_t N, uint16_t M>

include/IVideoDriver.h

@@ -66,7 +66,6 @@
 #include "nbl/core/util/to_underlying.h"
 
 // other useful things
-#include "nbl/core/SingleEventHandler.h"
 #include "nbl/core/EventDeferredHandler.h"
 #include "nbl/core/IBuffer.h"
 #include "nbl/core/IReferenceCounted.h"

include/nbl/asset/IAssetManager.h

@@ -148,31 +148,19 @@ class NBL_API2 ILogicalDevice : public core::IReferenceCounted, public IDeviceMe
 
         //! Semaphore Stuff
         virtual core::smart_refctd_ptr<ISemaphore> createSemaphore(const uint64_t initialValue) = 0;
-        //
-        struct SSemaphoreWaitInfo
-        {
-            const ISemaphore* semaphore;
-            uint64_t value;
-        };
-        enum class WAIT_RESULT : uint8_t
-        {
-            TIMEOUT,
-            SUCCESS,
-            DEVICE_LOST,
-            _ERROR
-        };
-        virtual WAIT_RESULT waitForSemaphores(const std::span<const SSemaphoreWaitInfo> infos, const bool waitAll, const uint64_t timeout) = 0;
+        virtual ISemaphore::WAIT_RESULT waitForSemaphores(const std::span<const ISemaphore::SWaitInfo> infos, const bool waitAll, const uint64_t timeout) = 0;
         // Forever waiting variant if you're confident that the fence will eventually be signalled
-        inline WAIT_RESULT blockForSemaphores(const std::span<const SSemaphoreWaitInfo> infos, const bool waitAll=true)
+        inline ISemaphore::WAIT_RESULT blockForSemaphores(const std::span<const ISemaphore::SWaitInfo> infos, const bool waitAll=true)
         {
+            using retval_t = ISemaphore::WAIT_RESULT;
             if (!infos.empty())
             {
-                auto waitStatus = WAIT_RESULT::TIMEOUT;
-                while (waitStatus==WAIT_RESULT::TIMEOUT)
+                auto waitStatus = retval_t::TIMEOUT;
+                while (waitStatus== retval_t::TIMEOUT)
                     waitStatus = waitForSemaphores(infos,waitAll,999999999ull);
                 return waitStatus;
             }
-            return WAIT_RESULT::SUCCESS;
+            return retval_t::SUCCESS;
         }
 
         //! Event Stuff