Merge Fixes for Geotex streaming#952 (#1002)

Erfan-Ahmadi · Fletterio · AnastaZIuk · web-flow · commit dada0d38b2dd · 2026-02-19T11:07:37.000+04:00
* Fix so that code can run in examples branch

* update examples

* update examples

* ieee754::flipSign update, flipSign_helper::FloatingPoint fix

* Change examples submodule

* Update submodule pointer

* Update CMakePresets.json, forgot to commit and push new n4ce preset

* update examples

* asset::IShaderCompiler::E_DEBUG_INFO_FLAGS::EDIF_NONE for NSC

* add debug info flags to ILogicalDevice::compileShader

* Point submodule to geotex branch

* IUtilities Allow for null (0 sized) staging buffers for download/upload

* Cmake "NBL_SKIP_BUILD_OPTIONS_VALIDATION": "ON"

* Small MonoDeviceApp fix and update examples

* update examples

* Update Vulkan-Headers to 1.4.332

* update 3rdparty/Vulkan-Tools]

* update smoke test to cover n4ce case, update 3rdparty/SPIRV-Tools submodule

* add include/nbl/system/json.h and wipe nlohmann/json_fwd.hpp from public header interface

* fix json ambiguity, update examples_tests submodule

* update examples

* update examples

* update merged examples

* update examples

* Change submodule pointer to point to tgeotex streaming

* update merged examples

* after merge fixes

* Update examples_tests pointer for CAD fix

* Shorten resource archive output path

* update examples

* Split module load paths for build and relocatable package

* Prioritize env and relative paths in relocatable package mode

* update examples

* update examples tests

---------

Co-authored-by: Fletterio &lt;fj.letterio@gmail.com&gt;
Co-authored-by: Arkadiusz Lachowicz &lt;areklachowicz@gmail.com&gt;
Co-authored-by: Arkadiusz Lachowicz &lt;34793522+AnastaZIuk@users.noreply.github.com&gt;
diff --git a/3rdparty/CMakeLists.txt b/3rdparty/CMakeLists.txt
@@ -530,9 +530,6 @@ nbl_install_dir(imath/src/Imath)
 
 nbl_install_file(blake/c/blake3.h)
 
-nbl_install_file_spec(nlohmann_json/include/nlohmann/json_fwd.hpp nlohmann)
-nbl_install_file_spec(nlohmann_json/include/nlohmann/detail/abi_macros.hpp nlohmann/detail)
-
 nbl_install_dir(boost/superproject/libs/preprocessor/include/boost)
 
 nbl_install_file_spec(renderdoc/renderdoc_app.h renderdoc)
diff --git a/3rdparty/Vulkan-Headers b/3rdparty/Vulkan-Headers
@@ -1 +1 @@
-Subproject commit 33d7f512583b8de44d1b6384aa1cf482f92e53e9
+Subproject commit 3dda5a1a87b62fdf3baf4680edc41c00e85a7a22
diff --git a/3rdparty/Vulkan-Tools b/3rdparty/Vulkan-Tools
@@ -1 +1 @@
-Subproject commit 761e7bf2736f3ad326fdfc1b3c1543f4e669fd5c
+Subproject commit 4b6f7101c15e09a8931f2f81c97146d0dfe68bc5
diff --git a/CMakePresets.json b/CMakePresets.json
@@ -295,7 +295,32 @@
 				"CMAKE_BUILD_TYPE": "Debug",
 				"CMAKE_EXPORT_COMPILE_COMMANDS": "ON"
 			}
-		}
+		},
+		{
+            "name": "n4ce-configure-windows-msvc",
+            "hidden": false,
+            "binaryDir": "build/production/n4ce",
+            "cacheVariables": {
+                "NBL_STATIC_BUILD": "OFF",
+				"NBL_SKIP_BUILD_OPTIONS_VALIDATION": "ON",
+                "CMAKE_SUPPRESS_REGENERATION": "OFF",
+                "NBL_COMPILER_DYNAMIC_RUNTIME": "ON",
+                "NBL_EMBED_BUILTIN_RESOURCES": "ON",
+                "NBL_UPDATE_GIT_SUBMODULE": "OFF",
+                "NBL_COMPILE_WITH_CUDA": "OFF",
+                "NBL_BUILD_OPTIX": "OFF",
+                "NBL_BUILD_MITSUBA_LOADER": "OFF",
+                "NBL_BUILD_RADEON_RAYS": "OFF",
+                "_NBL_COMPILE_WITH_OPEN_EXR_": "ON",
+                "NBL_EXPLICIT_MODULE_LOAD_LOG": "ON",
+                "NBL_CPACK_NO_BUILD_DIRECTORY_MODULES": "ON",
+                "GIT_FAIL_IF_NONZERO_EXIT": "OFF"
+            },
+            "displayName": "[N4CE]: Dynamic library target, Visual Studio 17 2022 generator, MSVC v143 toolset",
+            "description": "Configure as dynamic library with Visual Studio 17 2022 generator and MSVC v143 toolset",
+            "generator": "Visual Studio 17 2022",
+            "toolset": "v143"
+        }
 	],
 	"buildPresets": [
 		{
diff --git a/cmake/common.cmake b/cmake/common.cmake
@@ -1656,7 +1656,11 @@ function(NBL_CREATE_RESOURCE_ARCHIVE)
 		return()
 	endif()
 
-	set(IMPL_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/${IMPL_TARGET}")
+	if(DEFINED NBL_ROOT_PATH_BINARY AND NBL_ROOT_PATH_BINARY)
+		set(IMPL_OUTPUT_DIRECTORY "${NBL_ROOT_PATH_BINARY}/${IMPL_TARGET}")
+	else()
+		set(IMPL_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/${IMPL_TARGET}")
+	endif()
 
 	set(_BUNDLE_ARCHIVE_ABSOLUTE_PATH_ "")
 	get_filename_component(_BUNDLE_SEARCH_DIRECTORY_ "${IMPL_BIND}" ABSOLUTE)
diff --git a/examples_tests b/examples_tests
@@ -1 +1 @@
-Subproject commit 655aa991e96c8e1466d3c61c16f0d12fa36e86df
+Subproject commit 02c94ed67f500188fbfd1fcb4a9b9b18eb426926
diff --git a/include/nbl/application_templates/MonoDeviceApplication.hpp b/include/nbl/application_templates/MonoDeviceApplication.hpp
@@ -24,7 +24,8 @@ class MonoDeviceApplication : public virtual MonoSystemMonoLoggerApplication
 		virtual bool onAppTerminated() override
 		{
 			// break the circular references from queues tracking submit resources
-			m_device->waitIdle();
+			if (m_device)
+				m_device->waitIdle();
 			m_device = nullptr;
 			m_api = nullptr;
 			return base_t::onAppTerminated();
diff --git a/include/nbl/asset/utils/IShaderCompiler.h b/include/nbl/asset/utils/IShaderCompiler.h
@@ -12,9 +12,7 @@
 
 #include "nbl/asset/IShader.h"
 #include "nbl/asset/utils/ISPIRVOptimizer.h"
-
-// Less leakage than "nlohmann/json.hpp" only forward declarations
-#include "nlohmann/json_fwd.hpp"
+#include "nbl/system/json.h"
 
 #include "nbl/builtin/hlsl/enums.hlsl"
 
@@ -111,11 +109,10 @@ class NBL_API2 IShaderCompiler : public core::IReferenceCounted
 		//
 		struct SMacroDefinition
 		{
-			friend void to_json(nlohmann::json&, const SMacroDefinition&);
-			friend void from_json(const nlohmann::json&, SMacroDefinition&);
-
 			std::string_view identifier;
 			std::string_view definition;
+
+			friend struct system::json::adl_serializer<SMacroDefinition>;
 		};
 
 		//
@@ -222,9 +219,8 @@ class NBL_API2 IShaderCompiler : public core::IReferenceCounted
 							inline bool isStandardInclude() const { return standardInclude; }
 
 						private:
-							friend void to_json(nlohmann::json& j, const SEntry::SPreprocessingDependency& dependency);
-							friend void from_json(const nlohmann::json& j, SEntry::SPreprocessingDependency& dependency);
 							friend class CCache;
+							friend struct system::json::adl_serializer<SEntry::SPreprocessingDependency>;
 
 							// path or identifier
 							system::path requestingSourceDir = "";
@@ -258,8 +254,7 @@ class NBL_API2 IShaderCompiler : public core::IReferenceCounted
 							friend class SCompilerArgs;
 							friend class SEntry;
 							friend class CCache;
-							friend void to_json(nlohmann::json&, const SPreprocessorArgs&);
-							friend void from_json(const nlohmann::json&, SPreprocessorArgs&);
+							friend struct system::json::adl_serializer<SPreprocessorArgs>;
 
 							// Default constructor needed for json serialization of SCompilerArgs
 							SPreprocessorArgs() {};
@@ -301,8 +296,7 @@ class NBL_API2 IShaderCompiler : public core::IReferenceCounted
 						private:
 							friend class SEntry;
 							friend class CCache;
-							friend void to_json(nlohmann::json&, const SCompilerArgs&);
-							friend void from_json(const nlohmann::json&, SCompilerArgs&);
+							friend struct system::json::adl_serializer<SCompilerArgs>;
 
 							// Default constructor needed for json serialization of SEntry
 							SCompilerArgs() {}
diff --git a/include/nbl/builtin/hlsl/ieee754.hlsl b/include/nbl/builtin/hlsl/ieee754.hlsl
@@ -261,8 +261,8 @@ struct flipSignIfRHSNegative_helper<Vectorial, FloatingPoint NBL_PARTIAL_REQ_BOT
 };
 }
 
-template <typename T, typename U>
-NBL_CONSTEXPR_FUNC T flipSign(T val, U flip)
+template <typename T, typename U = bool>
+NBL_CONSTEXPR_FUNC T flipSign(T val, U flip = true)
 {
 	return impl::flipSign_helper<T, U>::__call(val, flip);
 }
diff --git a/include/nbl/system/IApplicationFramework.h b/include/nbl/system/IApplicationFramework.h
@@ -114,11 +114,19 @@ class IApplicationFramework : public core::IReferenceCounted
                 return true;
             };
 
-            if (not load(module.dxc, { install.dxc, env.dxc, build.dxc, rel.dxc }))
+            #ifdef NBL_RELOCATABLE_PACKAGE
+            if (not load(module.dxc, { env.dxc, rel.dxc, install.dxc }))
+            #else
+            if (not load(module.dxc, { build.dxc }))
+            #endif
                 return false;
 
             #ifdef _NBL_SHARED_BUILD_
-            if (not load(module.nabla, { install.nabla, env.nabla, build.nabla, rel.nabla }))
+            #ifdef NBL_RELOCATABLE_PACKAGE
+            if (not load(module.nabla, { env.nabla, rel.nabla, install.nabla }))
+            #else
+            if (not load(module.nabla, { build.nabla }))
+            #endif
                 return false;
             #endif
 
@@ -234,4 +242,4 @@ class IApplicationFramework : public core::IReferenceCounted
     }
 #endif
 
-#endif
+#endif
diff --git a/include/nbl/system/json.h b/include/nbl/system/json.h
@@ -0,0 +1,15 @@
+#ifndef _NBL_SYSTEM_JSON_H_INCLUDED_
+#define _NBL_SYSTEM_JSON_H_INCLUDED_
+
+namespace nbl::system::json {
+    template<typename T, typename SFINAE = void> struct adl_serializer;
+}
+
+#define NBL_JSON_IMPL_BIND_ADL_SERIALIZER(T)        \
+namespace nlohmann {                                \
+    template<>                                      \
+    struct adl_serializer<typename T::value_t>      \
+        : T {};                                     \
+}
+
+#endif // _NBL_SYSTEM_JSON_H_INCLUDED_
diff --git a/include/nbl/video/ILogicalDevice.h b/include/nbl/video/ILogicalDevice.h
@@ -831,6 +831,7 @@ class NBL_API2 ILogicalDevice : public core::IReferenceCounted, public IDeviceMe
             asset::IShaderCompiler::CCache* writeCache = nullptr;
             std::span<const asset::IShaderCompiler::SMacroDefinition> extraDefines = {};
             hlsl::ShaderStage stage = hlsl::ShaderStage::ESS_ALL_OR_LIBRARY;
+            core::bitflag<asset::IShaderCompiler::E_DEBUG_INFO_FLAGS> debugInfoFlags = asset::IShaderCompiler::E_DEBUG_INFO_FLAGS::EDIF_NONE;
         };
         core::smart_refctd_ptr<asset::IShader> compileShader(const SShaderCreationParameters& creationParams);
 
diff --git a/include/nbl/video/utilities/IUtilities.h b/include/nbl/video/utilities/IUtilities.h
@@ -37,8 +37,10 @@ class NBL_API2 IUtilities : public core::IReferenceCounted
             , m_allocationAlignment(allocationAlignment)
             , m_allocationAlignmentForBufferImageCopy(allocationAlignmentForBufferImageCopy)
         {
-            m_defaultDownloadBuffer->getBuffer()->setObjectDebugName(("Default Download Buffer of Utilities "+std::to_string(ptrdiff_t(this))).c_str());
-            m_defaultUploadBuffer->getBuffer()->setObjectDebugName(("Default Upload Buffer of Utilities "+std::to_string(ptrdiff_t(this))).c_str());
+            if (m_defaultDownloadBuffer)
+                m_defaultDownloadBuffer->getBuffer()->setObjectDebugName(("Default Download Buffer of Utilities "+std::to_string(ptrdiff_t(this))).c_str());
+            if (m_defaultUploadBuffer)
+                m_defaultUploadBuffer->getBuffer()->setObjectDebugName(("Default Upload Buffer of Utilities "+std::to_string(ptrdiff_t(this))).c_str());
         }
         
         IUtilities() = delete;
@@ -94,6 +96,7 @@ class NBL_API2 IUtilities : public core::IReferenceCounted
             core::smart_refctd_ptr<StreamingTransientDataBufferMT<> > defaultDownloadBuffer = nullptr;
 
             // Try Create Download Buffer
+            if (downstreamSize > 0u)
             {
                 IGPUBuffer::SCreationParams streamingBufferCreationParams = {};
                 streamingBufferCreationParams.size = downstreamSize;
@@ -127,6 +130,7 @@ class NBL_API2 IUtilities : public core::IReferenceCounted
                 defaultDownloadBuffer = core::make_smart_refctd_ptr<StreamingTransientDataBufferMT<>>(asset::SBufferRange<video::IGPUBuffer>{0ull,downstreamSize,std::move(buffer)},maxStreamingBufferAllocationAlignment,minStreamingBufferAllocationSize);
             }
             // Try Create Upload Buffer
+            if (upstreamSize > 0u)
             {
                 IGPUBuffer::SCreationParams streamingBufferCreationParams = {};
                 streamingBufferCreationParams.size = upstreamSize;
@@ -374,6 +378,11 @@ class NBL_API2 IUtilities : public core::IReferenceCounted
         //!     * data must not be nullptr
         inline bool updateBufferRangeViaStagingBuffer(SIntendedSubmitInfo& nextSubmit, const asset::SBufferRange<IGPUBuffer>& bufferRange, IUpstreamingDataProducer& callback)
         {
+            if (!m_defaultUploadBuffer)
+            {
+                m_logger.log("no staging buffer available for upload. check `upstreamSize` passed to `IUtilities::create`",system::ILogger::ELL_ERROR);
+                return false;
+            }
             if (!bufferRange.isValid() || !bufferRange.buffer->getCreationParams().usage.hasFlags(asset::IBuffer::EUF_TRANSFER_DST_BIT))
             {
                 m_logger.log("Invalid `bufferRange` or buffer has no `EUF_TRANSFER_DST_BIT` usage flag, cannot `updateBufferRangeViaStagingBuffer`!", system::ILogger::ELL_ERROR);
@@ -623,6 +632,11 @@ class NBL_API2 IUtilities : public core::IReferenceCounted
         template<typename IntendedSubmitInfo> requires std::is_same_v<std::decay_t<IntendedSubmitInfo>, SIntendedSubmitInfo>
         inline bool downloadBufferRangeViaStagingBuffer(const std::function<data_consumption_callback_t>& consumeCallback, IntendedSubmitInfo&& nextSubmit, const asset::SBufferRange<IGPUBuffer>& srcBufferRange)
         {
+            if (!m_defaultDownloadBuffer)
+            {
+                m_logger.log("no staging buffer available for download. check `downstreamSize` passed to `IUtilities::create`",system::ILogger::ELL_ERROR);
+                return false;
+            }
             if (!srcBufferRange.isValid() || !srcBufferRange.buffer->getCreationParams().usage.hasFlags(asset::IBuffer::EUF_TRANSFER_SRC_BIT))
             {
                 m_logger.log("Invalid `srcBufferRange` or buffer has no `EUF_TRANSFER_SRC_BIT` usage flag, cannot `downloadBufferRangeViaStagingBuffer`!",system::ILogger::ELL_ERROR);
diff --git a/smoke/CMakeLists.txt b/smoke/CMakeLists.txt
@@ -28,6 +28,7 @@ find_package(Nabla REQUIRED CONFIG
 
 add_executable(smoke main.cpp pch.hpp cdb.ps1)
 target_link_libraries(smoke PRIVATE Nabla::Nabla)
+target_compile_definitions(smoke PRIVATE _AFXDLL)
 target_precompile_headers(smoke PRIVATE pch.hpp)
 
 set(CMAKE_CTEST_ARGUMENTS --verbose)
diff --git a/smoke/main.cpp b/smoke/main.cpp
@@ -1,3 +1,5 @@
+#include <afxwin.h>
+
 #define ENABLE_SMOKE
 
 using namespace nbl;
@@ -36,45 +38,86 @@ class Smoke final : public system::IApplicationFramework
             return false;
         }
 
-        exportGpuProfiles();
+        if (!AfxWinInit(GetModuleHandle(nullptr), nullptr, GetCommandLineA(), 0))
+        {
+            std::cerr << "[ERROR]: Could not init AFX, terminating!\n";
+            return false;
+        }
+
+        try {
+            createAfxDummyWindow(320, 240, nullptr, _T("Dummy 1"));
+            exportGpuProfiles();
+            createAfxDummyWindow(320, 240, nullptr, _T("Dummy 2"));
+        }
+        catch (const std::exception& e) { 
+            std::cerr << "[ERROR]: " << e.what() << '\n';
+            return false;
+        }
+        catch (...) {
+            std::cerr << "[ERROR]: Unknown exception!\n";
+            return false;
+        }
 
         return true;
     }
 
     void workLoopBody() override {}
     bool keepRunning() override { return false; }
 
+    bool onAppTerminated() override
+    {
+        AfxWinTerm();
+        return true;
+    }
+
 private:
     static void exportGpuProfiles()
     {
-        std::string arg2 = "-o";
-        std::string buf;
-        std::string arg1;
-        std::string arg3;
+        std::string buf, arg1, arg2 = "-o", arg3;
 
         for (size_t i = 0;; i++)
         {
-            auto stringifiedIndex = std::to_string(i);
-            arg1 = "--json=" + stringifiedIndex;
-            arg3 = "device_" + stringifiedIndex + ".json";
-            std::array<const char*, 3> args = { arg1.data(), arg2.data(), arg3.data() };
+            auto six = std::to_string(i);
+            arg1 = "--json=" + six;
+            arg3 = "device_" + six + ".json";
 
+            auto args = std::to_array<const char*>({ arg1.data(), arg2.data(), arg3.data()});
             int code = nbl::video::vulkaninfo(args);
 
             if (code != 0)
                 break;
 
-            // print out file content
             std::ifstream input(arg3);
             
             while (std::getline(input, buf))
-            {
                 std::cout << buf << "\n";
-            }
 
             std::cout << "\n\n";
         }
     }
+
+    static bool createAfxDummyWindow(int w, int h, HWND parent, LPCTSTR windowName)
+    {
+        CWnd wnd;
+        LPCTSTR cls = AfxRegisterWndClass(0, ::LoadCursor(nullptr, IDC_ARROW));
+        if (!cls) return false;
+
+        if (!wnd.CreateEx(0, cls, windowName, WS_POPUP | WS_VISIBLE, 0, 0, w, h, parent, nullptr))
+            return false;
+
+        MSG msg {};
+        const ULONGLONG end = GetTickCount64() + 1000;
+        while (GetTickCount64() < end) {
+            while (PeekMessage(&msg, nullptr, 0, 0, PM_REMOVE)) {
+                TranslateMessage(&msg);
+                DispatchMessage(&msg);
+            }
+            Sleep(1);
+        }
+
+        wnd.DestroyWindow();
+        return true;
+    }
 };
 
 NBL_MAIN_FUNC(Smoke)
diff --git a/src/nbl/CMakeLists.txt b/src/nbl/CMakeLists.txt
@@ -805,6 +805,7 @@ target_include_directories(Nabla PUBLIC
 
 target_compile_definitions(Nabla INTERFACE 
 	"$<BUILD_INTERFACE:${INTERFACE_BUILD_DEFINITIONS}>"
+	"$<INSTALL_INTERFACE:NBL_RELOCATABLE_PACKAGE>"
 )
 
 if(NBL_STATIC_BUILD)
diff --git a/src/nbl/asset/utils/IShaderCompiler.cpp b/src/nbl/asset/utils/IShaderCompiler.cpp
diff --git a/src/nbl/asset/utils/shaderCompiler_serialization.h b/src/nbl/asset/utils/shaderCompiler_serialization.h
diff --git a/src/nbl/video/ILogicalDevice.cpp b/src/nbl/video/ILogicalDevice.cpp
diff --git a/src/nbl/video/utilities/IUtilities.cpp b/src/nbl/video/utilities/IUtilities.cpp
diff --git a/tools/nsc/main.cpp b/tools/nsc/main.cpp

Original file line number	Diff line number	Diff line change
`@@ -261,8 +261,8 @@ struct flipSignIfRHSNegative_helper<Vectorial, FloatingPoint NBL_PARTIAL_REQ_BOT`
`261`	`261`	`};`
`262`	`262`	`}`
`263`	`263`
`264`		`-template <typename T, typename U>`
`265`		`-NBL_CONSTEXPR_FUNC T flipSign(T val, U flip)`
	`264`	`+template <typename T, typename U = bool>`
	`265`	`+NBL_CONSTEXPR_FUNC T flipSign(T val, U flip = true)`
`266`	`266`	`{`
`267`	`267`	`return impl::flipSign_helper<T, U>::__call(val, flip);`
`268`	`268`	`}`