Merge branch 'master' of github.com:Devsh-Graphics-Programming/Nabla into hlsl

Author: AnastaZIuk

3rdparty/CMakeLists.txt

@@ -15,6 +15,7 @@ add_subdirectory(simdjson simdjson EXCLUDE_FROM_ALL)
 set(BUILD_SHARED_LIBS ${_OLD_BUILD_SHARED_LIBS})
 set(BUILD_STATIC_LIBS ${_OLD_BUILD_STATIC_LIBS})
 set(BUILD_TESTING ${_OLD_BUILD_TESTING})
+set_property(TARGET simdjson PROPERTY CXX_STANDARD 17)
 
 # openssl
 add_subdirectory(openssl openssl EXCLUDE_FROM_ALL)

CMakeLists.txt

@@ -300,7 +300,7 @@ include(common)
 NBL_UPDATE_SUBMODULES()
 add_subdirectory(${THIRD_PARTY_SOURCE_DIR})
 
-OPTION(NBL_EMBED_BUILTIN_RESOURCES "Embed built-in resources?" ON)
+option(NBL_EMBED_BUILTIN_RESOURCES "Embed built-in resources?" ON)
 
 add_subdirectory(src/nbl) # Nabla code	|	Moved cmakelists.txt from source/Nabla to src/nbl
 

cmake/common.cmake

@@ -221,7 +221,6 @@ macro(nbl_create_ext_library_project EXT_NAME LIB_HEADERS LIB_SOURCES LIB_INCLUD
 	add_dependencies(${LIB_NAME} Nabla)
 
 	get_target_property(_NBL_NABLA_TARGET_BINARY_DIR_ Nabla BINARY_DIR)
-	get_target_property(_BUILTIN_RESOURCES_INCLUDE_SEARCH_DIRECTORY_ nblBuiltinResourceData BUILTIN_RESOURCES_INCLUDE_SEARCH_DIRECTORY)
 
 	target_include_directories(${LIB_NAME}
 		PUBLIC ${_NBL_NABLA_TARGET_BINARY_DIR_}/build/import
@@ -231,9 +230,17 @@ macro(nbl_create_ext_library_project EXT_NAME LIB_HEADERS LIB_SOURCES LIB_INCLUD
 		PUBLIC ${CMAKE_SOURCE_DIR}/include
 		PUBLIC ${CMAKE_SOURCE_DIR}/src
 		PUBLIC ${CMAKE_SOURCE_DIR}/source/Nabla
-		PUBLIC ${_BUILTIN_RESOURCES_INCLUDE_SEARCH_DIRECTORY_}
 		PRIVATE ${LIB_INCLUDES}
 	)
+	
+	if(NBL_EMBED_BUILTIN_RESOURCES)
+		get_target_property(_BUILTIN_RESOURCES_INCLUDE_SEARCH_DIRECTORY_ nblBuiltinResourceData BUILTIN_RESOURCES_INCLUDE_SEARCH_DIRECTORY)
+		
+		target_include_directories(${LIB_NAME}
+			PUBLIC ${_BUILTIN_RESOURCES_INCLUDE_SEARCH_DIRECTORY_}
+		)
+	endif()
+	
 	add_dependencies(${LIB_NAME} Nabla)
 	target_link_libraries(${LIB_NAME} PUBLIC Nabla)
 	target_compile_options(${LIB_NAME} PUBLIC ${LIB_OPTIONS})

examples_tests

@@ -32,8 +32,9 @@ class IBuffer : public core::IBuffer, public IDescriptor
             EUF_VERTEX_BUFFER_BIT = 0x00000080,
             EUF_INDIRECT_BUFFER_BIT = 0x00000100,
             EUF_SHADER_DEVICE_ADDRESS_BIT = 0x00020000,
-            EUF_TRANSFORM_FEEDBACK_BUFFER_BIT_EXT = 0x00000800,
-            EUF_TRANSFORM_FEEDBACK_COUNTER_BUFFER_BIT_EXT = 0x00001000,
+            // we will not expose transform feedback
+			//EUF_TRANSFORM_FEEDBACK_BUFFER_BIT_EXT = 0x00000800,
+            //EUF_TRANSFORM_FEEDBACK_COUNTER_BUFFER_BIT_EXT = 0x00001000,
             EUF_CONDITIONAL_RENDERING_BIT_EXT = 0x00000200,
             EUF_ACCELERATION_STRUCTURE_BUILD_INPUT_READ_ONLY_BIT = 0x00080000,
             EUF_ACCELERATION_STRUCTURE_STORAGE_BIT = 0x00100000,

include/nbl/asset/IBuffer.h

@@ -1,9 +1,8 @@
-// Copyright (C) 2018-2020 - DevSH Graphics Programming Sp. z O.O.
+// Copyright (C) 2018-2023 - DevSH Graphics Programming Sp. z O.O.
 // This file is part of the "Nabla Engine".
 // For conditions of distribution and use, see copyright notice in nabla.h
-
-#ifndef __NBL_ASSET_I_IMAGE_H_INCLUDED__
-#define __NBL_ASSET_I_IMAGE_H_INCLUDED__
+#ifndef _NBL_ASSET_I_IMAGE_H_INCLUDED_
+#define _NBL_ASSET_I_IMAGE_H_INCLUDED_
 
 #include "nbl/core/util/bitflag.h"
 #include "nbl/core/containers/refctd_dynamic_array.h"
@@ -136,18 +135,18 @@ class IImage : public IDescriptor
 		};
 		struct SSubresourceRange
 		{
-			E_ASPECT_FLAGS	aspectMask = E_ASPECT_FLAGS::EAF_NONE;
-			uint32_t		baseMipLevel = 0u;
-			uint32_t		levelCount = 0u;
-			uint32_t		baseArrayLayer = 0u;
-			uint32_t		layerCount = 0u;
+			core::bitflag<E_ASPECT_FLAGS>	aspectMask = E_ASPECT_FLAGS::EAF_NONE;
+			uint32_t						baseMipLevel = 0u;
+			uint32_t						levelCount = 0u;
+			uint32_t						baseArrayLayer = 0u;
+			uint32_t						layerCount = 0u;
 		};
 		struct SSubresourceLayers
 		{
-			E_ASPECT_FLAGS	aspectMask = E_ASPECT_FLAGS::EAF_NONE;
-			uint32_t		mipLevel = 0u;
-			uint32_t		baseArrayLayer = 0u;
-			uint32_t		layerCount = 0u;
+			core::bitflag<E_ASPECT_FLAGS>	aspectMask = E_ASPECT_FLAGS::EAF_NONE;
+			uint32_t						mipLevel = 0u;
+			uint32_t						baseArrayLayer = 0u;
+			uint32_t						layerCount = 0u;
 
 			auto operator<=>(const SSubresourceLayers&) const = default;
 		};
@@ -214,7 +213,7 @@ class IImage : public IDescriptor
 			inline bool					isValid() const
 			{
 				// TODO: more complex check of compatible aspects when planar format support arrives
-				if (srcSubresource.aspectMask^dstSubresource.aspectMask)
+				if ((srcSubresource.aspectMask^dstSubresource.aspectMask).value)
 					return false;
 
 				if (srcSubresource.layerCount!=dstSubresource.layerCount)
@@ -235,14 +234,14 @@ class IImage : public IDescriptor
 		};
 		struct SCreationParams
 		{
-			E_TYPE										type;
-			E_SAMPLE_COUNT_FLAGS						samples;
-			E_FORMAT									format;
-			VkExtent3D									extent;
-			uint32_t									mipLevels;
-			uint32_t									arrayLayers;
-			core::bitflag<E_CREATE_FLAGS>				flags = ECF_NONE;
-			core::bitflag<E_USAGE_FLAGS>				usage = EUF_NONE;
+			E_TYPE							type;
+			E_SAMPLE_COUNT_FLAGS			samples;
+			E_FORMAT						format;
+			VkExtent3D						extent;
+			uint32_t						mipLevels;
+			uint32_t						arrayLayers;
+			core::bitflag<E_CREATE_FLAGS>	flags = ECF_NONE;
+			core::bitflag<E_USAGE_FLAGS>	usage = EUF_NONE;
 
 			inline bool operator==(const SCreationParams& rhs) const
 			{
@@ -329,6 +328,8 @@ class IImage : public IDescriptor
 					return false;
 				if (_params.extent.width != _params.extent.height)
 					return false;
+				if (_params.extent.depth > 1u)
+					return false;
 				if (_params.arrayLayers < 6u)
 					return false;
 				if (_params.samples != ESCF_1_BIT)
@@ -587,7 +588,7 @@ class IImage : public IDescriptor
 				//if (!formatHasAspects(m_creationParams.format,subresource.aspectMask))
 					//return false;
 				// The aspectMask member of imageSubresource must only have a single bit set
-				if (!core::bitCount(static_cast<uint32_t>(subresource.aspectMask)) == 1u)
+				if (!core::bitCount<uint32_t>(subresource.aspectMask.value) == 1u)
 					return false;
 				if (subresource.mipLevel >= m_creationParams.mipLevels)
 					return false;
@@ -716,7 +717,7 @@ class IImage : public IDescriptor
 			for (auto it2=it+1u; it2!=pRegionsEnd; it2++)
 			{
 				const auto& subresource2 = it2->getDstSubresource();
-				if (!(subresource2.aspectMask&subresource.aspectMask))
+				if (!(subresource2.aspectMask&subresource.aspectMask).value)
 					continue;
 				if (subresource2.mipLevel!=subresource.mipLevel)
 					continue;