Merge branch 'master' into rt_pipeline_asset_conversion

Author: kevyuu

03_DeviceSelectionAndSharedSources/Testers.h

@@ -56,7 +56,7 @@ class IntrospectionTesterBase
 			// if the extension is generic (.glsl or .hlsl) the stage is unknown.
 			// But it can still be overriden from within the source with a `#pragma shader_stage` 
 			options.stage = shaderStage == IShader::E_SHADER_STAGE::ESS_COMPUTE ? shaderStage : IShader::E_SHADER_STAGE::ESS_VERTEX; // TODO: do smth with it
-			options.targetSpirvVersion = device->getPhysicalDevice()->getLimits().spirvVersion;
+			options.preprocessorOptions.targetSpirvVersion = device->getPhysicalDevice()->getLimits().spirvVersion;
 			// we need to perform an unoptimized compilation with source debug info or we'll lose names of variable sin the introspection
 			options.spirvOptimizer = nullptr;
 			options.debugInfoFlags |= IShaderCompiler::E_DEBUG_INFO_FLAGS::EDIF_SOURCE_BIT;

03_DeviceSelectionAndSharedSources/main.cpp

@@ -275,7 +275,7 @@ class DeviceSelectionAndSharedSourcesApp final : public application_templates::M
 			// if the extension is generic (.glsl or .hlsl) the stage is unknown.
 			// But it can still be overriden from within the source with a `#pragma shader_stage` 
 			options.stage = shaderStage == IShader::E_SHADER_STAGE::ESS_COMPUTE ? shaderStage : IShader::E_SHADER_STAGE::ESS_VERTEX; // TODO: do smth with it
-			options.targetSpirvVersion = m_device->getPhysicalDevice()->getLimits().spirvVersion;
+			options.preprocessorOptions.targetSpirvVersion = m_device->getPhysicalDevice()->getLimits().spirvVersion;
 			// we need to perform an unoptimized compilation with source debug info or we'll lose names of variable sin the introspection
 			options.spirvOptimizer = nullptr;
 			options.debugInfoFlags |= IShaderCompiler::E_DEBUG_INFO_FLAGS::EDIF_SOURCE_BIT;

05_StreamingAndBufferDeviceAddressApp/main.cpp

@@ -113,8 +113,8 @@ class StreamingAndBufferDeviceAddressApp final : public application_templates::M
 			// `CAsyncSingleBufferSubAllocator` just allows you suballocate subranges of any `IGPUBuffer` range with deferred/latched frees.
 			constexpr uint32_t DownstreamBufferSize = sizeof(output_t)<<23;
 			constexpr uint32_t UpstreamBufferSize = sizeof(input_t)<<23;
-
-			m_utils = make_smart_refctd_ptr<IUtilities>(smart_refctd_ptr(m_device),smart_refctd_ptr(m_logger),DownstreamBufferSize,UpstreamBufferSize);
+			
+			m_utils = IUtilities::create(smart_refctd_ptr(m_device),smart_refctd_ptr(m_logger),DownstreamBufferSize,UpstreamBufferSize);
 			if (!m_utils)
 				return logFail("Failed to create Utilities!");
 			m_upStreamingBuffer = m_utils->getDefaultUpStreamingBuffer();

09_GeometryCreator/main.cpp

@@ -5,7 +5,6 @@
 
 #include "common.hpp"
 
-
 class GeometryCreatorApp final : public MonoWindowApplication, public BuiltinResourcesApplication
 {
 	using device_base_t = MonoWindowApplication;

11_FFT/main.cpp

@@ -95,7 +95,7 @@ class FFT_Test final : public application_templates::MonoDeviceApplication, publ
 		constexpr uint32_t DownstreamBufferSize = sizeof(scalar_t) << 23;
 		constexpr uint32_t UpstreamBufferSize = sizeof(scalar_t) << 23;
 
-		m_utils = make_smart_refctd_ptr<IUtilities>(smart_refctd_ptr(m_device), smart_refctd_ptr(m_logger), DownstreamBufferSize, UpstreamBufferSize);
+		m_utils = IUtilities::create(smart_refctd_ptr(m_device), smart_refctd_ptr(m_logger), DownstreamBufferSize, UpstreamBufferSize);
 		if (!m_utils)
 			return logFail("Failed to create Utilities!");
 		m_upStreamingBuffer = m_utils->getDefaultUpStreamingBuffer();

21_LRUCacheUnitTest/main.cpp

@@ -5,6 +5,7 @@
 
 // I've moved out a tiny part of this example into a shared header for reuse, please open and read it.
 #include "nbl/application_templates/MonoSystemMonoLoggerApplication.hpp"
+#include <ranges>
 
 using namespace nbl;
 using namespace core;
@@ -180,6 +181,38 @@ class LRUCacheTestApp final : public nbl::application_templates::MonoSystemMonoL
 			cache3.insert(1, "bar");
 			cache3.clear();
 
+			// Cache iterator test
+			constexpr uint32_t cache4Size = 10;
+			ResizableLRUCache<uint32_t, uint32_t> cache4(cache4Size);
+			for (auto i = 0u; i < cache4Size; i++)
+			{
+				cache4.insert(i, i);
+			}
+			// Default iterator is MRU -> LRU
+			uint32_t counter = cache4Size - 1;
+			for (auto& pair : cache4)
+			{
+				assert(pair.first == counter && pair.second == counter);
+				counter--;
+			}
+			// Reverse LRU -> MRU traversal
+			counter = 0u;
+			for (auto it = cache4.crbegin(); it != cache4.crend(); it++)
+			{
+				assert(it->first == counter && it->second == counter);
+				counter++;
+			}
+
+			// Cache copy test
+			ResizableLRUCache<uint32_t, uint32_t> cache4Copy(cache4);
+			for (auto it = cache4.cbegin(), itCopy = cache4Copy.cbegin(); it != cache4.cend(); it++, itCopy++)
+			{
+				assert(*it == *itCopy);
+				// Assert deep copy
+				assert(it.operator->() != itCopy.operator->());
+
+			}
+
 			// Besides the disposal function that gets called when evicting, we need to check that the Cache properly destroys all resident `Key,Value` pairs when destroyed
 			struct Foo
 			{
@@ -208,15 +241,13 @@ class LRUCacheTestApp final : public nbl::application_templates::MonoSystemMonoL
 
 			int destroyCounter = 0;
 			{
-				ResizableLRUCache<int, Foo> cache4(10u);
+				ResizableLRUCache<int, Foo> cache5(10u);
 				for (int i = 0; i < 10; i++)
-					cache4.insert(i, Foo(&destroyCounter));
+					cache5.insert(i, Foo(&destroyCounter));
 				int x = 0;
 			}
-			
 			assert(destroyCounter == 10);
 
-
 			m_logger->log("all good");
 
 			m_textureLRUCache = std::unique_ptr<TextureLRUCache>(new TextureLRUCache(1024u));

22_CppCompat/ITester.h

@@ -71,7 +71,7 @@ class ITester
 
             asset::IShaderCompiler::SCompilerOptions options = {};
             options.stage = shaderStage;
-            options.targetSpirvVersion = m_device->getPhysicalDevice()->getLimits().spirvVersion;
+            options.preprocessorOptions.targetSpirvVersion = m_device->getPhysicalDevice()->getLimits().spirvVersion;
             options.spirvOptimizer = nullptr;
             options.debugInfoFlags |= asset::IShaderCompiler::E_DEBUG_INFO_FLAGS::EDIF_SOURCE_BIT;
             options.preprocessorOptions.sourceIdentifier = source->getFilepathHint();

23_Arithmetic2UnitTest/CMakeLists.txt

@@ -1,25 +1,15 @@
-
-include(common RESULT_VARIABLE RES)
-if(NOT RES)
-	message(FATAL_ERROR "common.cmake not found. Should be in {repo_root}/cmake directory")
-endif()
-
-nbl_create_executable_project("" "" "" "" "${NBL_EXECUTABLE_PROJECT_CREATION_PCH_TARGET}")
-
-if(NBL_EMBED_BUILTIN_RESOURCES)
-	set(_BR_TARGET_ ${EXECUTABLE_NAME}_builtinResourceData)
-	set(RESOURCE_DIR "app_resources")
-
-	get_filename_component(_SEARCH_DIRECTORIES_ "${CMAKE_CURRENT_SOURCE_DIR}" ABSOLUTE)
-	get_filename_component(_OUTPUT_DIRECTORY_SOURCE_ "${CMAKE_CURRENT_BINARY_DIR}/src" ABSOLUTE)
-	get_filename_component(_OUTPUT_DIRECTORY_HEADER_ "${CMAKE_CURRENT_BINARY_DIR}/include" ABSOLUTE)
-
-    file(GLOB_RECURSE BUILTIN_RESOURCE_FILES RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}/${RESOURCE_DIR}" CONFIGURE_DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/${RESOURCE_DIR}/*")
-    foreach(RES_FILE ${BUILTIN_RESOURCE_FILES})
-      LIST_BUILTIN_RESOURCE(RESOURCES_TO_EMBED "${RES_FILE}")
-    endforeach()
-
-	ADD_CUSTOM_BUILTIN_RESOURCES(${_BR_TARGET_} RESOURCES_TO_EMBED "${_SEARCH_DIRECTORIES_}" "${RESOURCE_DIR}" "nbl::this_example::builtin" "${_OUTPUT_DIRECTORY_HEADER_}" "${_OUTPUT_DIRECTORY_SOURCE_}")
-
-	LINK_BUILTIN_RESOURCES_TO_TARGET(${EXECUTABLE_NAME} ${_BR_TARGET_})
-endif()
+include(common)
+
+nbl_create_executable_project("" "" "" "")
+
+NBL_CREATE_RESOURCE_ARCHIVE(
+	NAMESPACE nbl::this_example::builtin
+	TARGET ${EXECUTABLE_NAME}_builtins
+	LINK_TO ${EXECUTABLE_NAME}
+	BIND app_resources
+	BUILTINS
+		common.hlsl
+		shaderCommon.hlsl
+		testSubgroup.comp.hlsl
+		testWorkgroup.comp.hlsl
+)

23_Arithmetic2UnitTest/app_resources/shaderCommon.hlsl

@@ -1,4 +1,4 @@
-#include "common.hlsl"
+#include "app_resources/common.hlsl"
 
 using namespace nbl;
 using namespace hlsl;

23_Arithmetic2UnitTest/app_resources/testSubgroup.comp.hlsl

@@ -7,7 +7,7 @@
 #include "nbl/builtin/hlsl/subgroup2/arithmetic_portability.hlsl"
 #include "nbl/builtin/hlsl/subgroup2/arithmetic_params.hlsl"
 
-#include "shaderCommon.hlsl"
+#include "app_resources/shaderCommon.hlsl"
 #include "nbl/builtin/hlsl/workgroup2/basic.hlsl"
 
 template<class Binop, class device_capabilities>