Merge branch 'master' into nahim_complex_fft_workgroup

Author: Fletterio

.gitmodules

@@ -96,3 +96,6 @@
 [submodule "3rdparty/blake"]
 	path = 3rdparty/blake
 	url = [email protected]:Devsh-Graphics-Programming/BLAKE3.git
+[submodule "3rdparty/imguizmo"]
+	path = 3rdparty/imguizmo
+	url = [email protected]:Devsh-Graphics-Programming/ImGuizmo.git

3rdparty/CMakeLists.txt

@@ -292,6 +292,9 @@ if(NBL_BUILD_IMGUI)
 	else()
 		target_compile_options(implot PRIVATE -Wall -Wextra -pedantic -Werror -mavx2 -Ofast)
 	endif()
+	
+	set(IMGUIZMO_BUILD_EXAMPLE OFF)
+	add_subdirectory(imguizmo EXCLUDE_FROM_ALL)
 endif()
 
 add_library(aesGladman OBJECT
@@ -384,7 +387,7 @@ if (NBL_BUILD_MITSUBA_LOADER)
 	list(APPEND NBL_3RDPARTY_TARGETS expat)
 endif()
 if (NBL_BUILD_IMGUI)
-	list(APPEND NBL_3RDPARTY_TARGETS imgui)
+	list(APPEND NBL_3RDPARTY_TARGETS imgui implot imguizmo)
 endif()
 if(ENABLE_HLSL)
 	list(APPEND NBL_3RDPARTY_TARGETS HLSL)

3rdparty/imguizmo

@@ -53,7 +53,8 @@ Below are some tasks that are open for contribution. If you start working on a t
 - Radix Sort (Vulkan Compute)
 - Bitonic Sort (Vulkan Compute)
 - Merge Path (Vulkan Compute)
-- [GPU flip fluid simulation task idea](https://www.youtube.com/watch?v=okQzAJM7LcE) -> discord [thread](https://discord.com/channels/318590007881236480/374061825454768129/1257988553112027186) for more info  
+- [GPU flip fluid simulation task idea](https://www.youtube.com/watch?v=okQzAJM7LcE) -> discord [thread](https://discord.com/channels/318590007881236480/374061825454768129/1257988553112027186) for more info
+- [Exact Distance Transform on a GPU](https://docs.google.com/document/d/1iUF0ilFbWVWr5JfPtR8D8z7OdmbhUJXK-eoR_7u4-50/edit)
 
  **[Issues](https://github.com/Devsh-Graphics-Programming/Nabla/issues) also count as free tasks.** We also have old issues from previous generation **[here](https://github.com/buildaworldnet/IrrlichtBAW/issues?q=is%3Aissue+is%3Aopen+sort%3Aupdated-desc)**.
 

CONTRIBUTING.md

@@ -44,6 +44,8 @@ struct SBasicViewParameters
 } PACK_STRUCT;
 #include "nbl/nblunpack.h"
 
+static_assert(sizeof(SBasicViewParameters) == sizeof(float) * (4 * 4 + 2 * 3 * 4));
+
 }}
 
 #endif

include/nbl/asset/asset_utils.h

@@ -10,7 +10,6 @@
 namespace nbl::video
 {
 
-#if 0 // TODO: port
 class CDumbPresentationOracle : public IPresentationOracle
 {
 	public:
@@ -19,8 +18,7 @@ class CDumbPresentationOracle : public IPresentationOracle
 			reset();
 		}
 
-		~CDumbPresentationOracle() {
-		}
+		~CDumbPresentationOracle() {}
 
 		inline void reportBeginFrameRecord() override
 		{
@@ -53,16 +51,16 @@ class CDumbPresentationOracle : public IPresentationOracle
 
 		inline double getDeltaTimeInMicroSeconds() const {return dt;}
 
-		inline std::chrono::microseconds acquireNextImage(ISwapchain* swapchain, IGPUSemaphore* acquireSemaphore, IGPUFence* fence, uint32_t* imageNumber) override
+		inline std::chrono::microseconds acquireNextImage(ISwapchain* swapchain, ISwapchain::SAcquireInfo info, uint32_t* imageNumber) override
 		{
-			swapchain->acquireNextImage(acquireSemaphore,fence,imageNumber);
+			swapchain->acquireNextImage(info, imageNumber);
 			reportEndFrameRecord();
 			const auto retval = getNextPresentationTimeStamp();
 			reportBeginFrameRecord();
 			return retval;
 		}
 
-		inline void present(ILogicalDevice* device, ISwapchain* swapchain, IQueue* queue, IGPUSemaphore* renderFinishedSemaphore, const uint32_t imageNumber) override
+		inline void present(ILogicalDevice* device, ISwapchain* swapchain, ISwapchain::SAcquireInfo info, const uint32_t imageNumber) override
 		{
 			// literally cant do anything here in this dumb algorithm
 		}
@@ -89,7 +87,6 @@ class CDumbPresentationOracle : public IPresentationOracle
 		std::chrono::steady_clock::time_point lastTime;
 		std::chrono::microseconds nextPresentationTimeStamp;
 };
-#endif
 
 }
 

include/nbl/video/utilities/CDumbPresentationOracle.h

@@ -8,7 +8,6 @@
 
 namespace nbl::video
 {
-#if 0 // TODO: port
 class IPresentationOracle
 {
     public:
@@ -17,13 +16,12 @@ class IPresentationOracle
         virtual void reportEndFrameRecord() = 0;
 
         //! wraps image acquire, could inject timings and queries before and after to obtain frame presentation data
-        virtual std::chrono::microseconds acquireNextImage(ISwapchain* swapchain, IGPUSemaphore* acquireSemaphore, IGPUFence* fence, uint32_t* imageNumber) = 0;
+        virtual std::chrono::microseconds acquireNextImage(ISwapchain* swapchain, ISwapchain::SAcquireInfo info, uint32_t* imageNumber) = 0;
 
         // TODO: Actually start using this in CommonAPI of the examples
         //! wraps image acquire, could inject timings and queries before and after to obtain frame presentation data
-        virtual void present(nbl::video::ILogicalDevice* device, nbl::video::ISwapchain* swapchain, nbl::video::IQueue* queue, nbl::video::IGPUSemaphore* renderFinishedSemaphore, const uint32_t imageNumer) = 0;
+        virtual void present(ILogicalDevice* device, ISwapchain* swapchain, ISwapchain::SAcquireInfo info, const uint32_t imageNumber) = 0;
 };
-#endif
 }
 
 #endif // __NBL_VIDEO_I_PRESENTATION_ORACLE__H_INCLUDED__

include/nbl/video/utilities/IPresentationOracle.h

@@ -766,7 +766,7 @@ namespace nbl::ext::imgui
 		for (auto const& subscriber : m_subscribers)
 			subscriber.listener();
 
-		ImGui::Render();
+		ImGui::Render(); // note it doesn't touch GPU or graphics API at all, internal call - open the function def for more details
 	}
 
 	void UI::BeginWindow(char const* windowName)