update master, resolve conflict

Author: keptsecret

3rdparty/Vulkan-Headers

@@ -200,6 +200,6 @@ function(nbl_adjust_flags)
 			list(APPEND _D_NBL_COMPILE_OPTIONS_ $<$<CONFIG:${NBL_MAP_CONFIGURATION_FROM}>:${NBL_TO_CONFIG_COMPILE_OPTIONS}>)
 		endforeach()
 
-		set_directory_properties(PROPERTIES COMPILE_OPTIONS ${_D_NBL_COMPILE_OPTIONS_})
+		set_directory_properties(PROPERTIES COMPILE_OPTIONS "${_D_NBL_COMPILE_OPTIONS_}")
 	endif()
 endfunction()

README.md

@@ -37,16 +37,16 @@ class ICPUSampler : public ISampler, public IAsset
 				};
 				switch (wrapModes[i])
 				{
-					case ISampler::ETC_REPEAT:
+					case ISampler::E_TEXTURE_CLAMP::ETC_REPEAT:
 						repeat();
 						break;
-					case ISampler::ETC_CLAMP_TO_EDGE:
-						texelCoord[i] = core::clamp<int32_t,int32_t>(texelCoord[i],0,mipLastCoord[i]);
+					case ISampler::E_TEXTURE_CLAMP::ETC_CLAMP_TO_EDGE:
+						texelCoord[i] = core::clamp<int32_t, int32_t>(texelCoord[i], 0, mipLastCoord[i]);
 						break;
-					case ISampler::ETC_MIRROR_CLAMP_TO_EDGE:
-						texelCoord[i] = core::clamp<int32_t,int32_t>(texelCoord[i],-int32_t(mipExtent[i]),mipExtent[i]+mipLastCoord[i]);
+					case ISampler::E_TEXTURE_CLAMP::ETC_MIRROR_CLAMP_TO_EDGE:
+						texelCoord[i] = core::clamp<int32_t, int32_t>(texelCoord[i], -int32_t(mipExtent[i]), mipExtent[i] + mipLastCoord[i]);
 						[[fallthrough]];
-					case ISampler::ETC_MIRROR:
+					case ISampler::E_TEXTURE_CLAMP::ETC_MIRROR:
 						{
 							int32_t repeatID = (originalWasNegative+texelCoord[i])/int32_t(mipExtent[i]);
 							repeat();

cmake/adjust/flags.cmake

@@ -330,7 +330,7 @@ class IDescriptorSetLayout : public IDescriptorSetLayoutBase
 				bindings[i].binding = i;
 				bindings[i].type = type;
 				bindings[i].createFlags = SBinding::E_CREATE_FLAGS::ECF_NONE;
-				bindings[i].stageFlags = stageAccessFlags ? stageAccessFlags[i]:asset::IShader::ESS_ALL;
+				bindings[i].stageFlags = stageAccessFlags ? stageAccessFlags[i]:asset::IShader::ESS_ALL_OR_LIBRARY;
 				bindings[i].count = counts ? counts[i]:1u;
 				bindings[i].samplers = nullptr;
 			}

examples_tests

@@ -6,6 +6,7 @@
 #define __NBL_ASSET_I_SAMPLER_H_INCLUDED__
 
 #include "nbl/asset/IDescriptor.h"
+#include "nbl/builtin/hlsl/enums.hlsl"
 
 namespace nbl
 {
@@ -16,23 +17,7 @@ class ISampler : public IDescriptor
 {
 	public:
 		//! Texture coord clamp mode outside [0.0, 1.0]
-		enum E_TEXTURE_CLAMP
-		{
-			//! Texture repeats
-			ETC_REPEAT = 0,
-			//! Texture is clamped to the edge pixel
-			ETC_CLAMP_TO_EDGE,
-			//! Texture is clamped to the border pixel (if exists)
-			ETC_CLAMP_TO_BORDER,
-			//! Texture is alternatingly mirrored (0..1..0..1..0..)
-			ETC_MIRROR,
-			//! Texture is mirrored once and then clamped to edge
-			ETC_MIRROR_CLAMP_TO_EDGE,
-			//! Texture is mirrored once and then clamped to border
-			ETC_MIRROR_CLAMP_TO_BORDER,
-
-			ETC_COUNT
-		};
+		using E_TEXTURE_CLAMP = hlsl::TextureClamp;
 
 		enum E_TEXTURE_BORDER_COLOR
 		{
@@ -75,11 +60,11 @@ class ISampler : public IDescriptor
 		{
 			struct {
 				//! Valeus taken from E_TEXTURE_CLAMP
-				uint32_t TextureWrapU : 3 = ETC_REPEAT;
+				uint32_t TextureWrapU : 3 = E_TEXTURE_CLAMP::ETC_REPEAT;
 				//! Valeus taken from E_TEXTURE_CLAMP
-				uint32_t TextureWrapV : 3 = ETC_REPEAT;
+				uint32_t TextureWrapV : 3 = E_TEXTURE_CLAMP::ETC_REPEAT;
 				//! Valeus taken from E_TEXTURE_CLAMP
-				uint32_t TextureWrapW : 3 = ETC_REPEAT;
+				uint32_t TextureWrapW : 3 = E_TEXTURE_CLAMP::ETC_REPEAT;
 				//! Values taken from E_TEXTURE_BORDER_COLOR
 				uint32_t BorderColor : 3 = ETBC_FLOAT_OPAQUE_BLACK;
 				//! Values taken from E_TEXTURE_FILTER

include/nbl/asset/ICPUSampler.h

@@ -34,7 +34,7 @@ class CBlitImageFilterBase : public impl::CSwizzleableAndDitherableFilterBase<Sw
 				uint8_t*							scratchMemory = nullptr;
 				uint32_t							scratchMemoryByteSize = 0u;
 				_NBL_STATIC_INLINE_CONSTEXPR auto	NumWrapAxes = 3;
-				ISampler::E_TEXTURE_CLAMP			axisWraps[NumWrapAxes] = { ISampler::ETC_REPEAT,ISampler::ETC_REPEAT,ISampler::ETC_REPEAT };
+				ISampler::E_TEXTURE_CLAMP			axisWraps[NumWrapAxes] = { ISampler::E_TEXTURE_CLAMP::ETC_REPEAT,ISampler::E_TEXTURE_CLAMP::ETC_REPEAT,ISampler::E_TEXTURE_CLAMP::ETC_REPEAT };
 				ISampler::E_TEXTURE_BORDER_COLOR	borderColor = ISampler::ETBC_FLOAT_TRANSPARENT_BLACK;
 				IBlitUtilities::E_ALPHA_SEMANTIC	alphaSemantic = IBlitUtilities::EAS_NONE_OR_PREMULTIPLIED;
 				double								alphaRefValue = 0.5; // only required to make sense if `alphaSemantic==EAS_REFERENCE_OR_COVERAGE`
@@ -56,7 +56,7 @@ class CBlitImageFilterBase : public impl::CSwizzleableAndDitherableFilterBase<Sw
 				return false;
 
 			for (auto i=0; i<CStateBase::NumWrapAxes; i++)
-			if (state->axisWraps[i]>=ISampler::ETC_COUNT)
+			if (state->axisWraps[i]>=ISampler::E_TEXTURE_CLAMP::ETC_COUNT)
 				return false;
 
 			if (state->borderColor>=ISampler::ETBC_COUNT)

include/nbl/asset/IDescriptorSetLayout.h

@@ -30,7 +30,7 @@ class CPaddedCopyImageFilter : public CImageFilter<CPaddedCopyImageFilter>, publ
 				virtual ~CState() {}
 
 				_NBL_STATIC_INLINE_CONSTEXPR auto NumWrapAxes = 3;
-				ISampler::E_TEXTURE_CLAMP axisWraps[NumWrapAxes] = {ISampler::ETC_REPEAT,ISampler::ETC_REPEAT,ISampler::ETC_REPEAT};
+				ISampler::E_TEXTURE_CLAMP axisWraps[NumWrapAxes] = {ISampler::E_TEXTURE_CLAMP::ETC_REPEAT,ISampler::E_TEXTURE_CLAMP::ETC_REPEAT,ISampler::E_TEXTURE_CLAMP::ETC_REPEAT};
 				ISampler::E_TEXTURE_BORDER_COLOR borderColor;
 				VkOffset3D relativeOffset;
 				VkExtent3D paddedExtent;
@@ -57,7 +57,7 @@ class CPaddedCopyImageFilter : public CImageFilter<CPaddedCopyImageFilter>, publ
 			// TODO: eventually remove when we can encode blocks
 			for (auto i=0; i<CState::NumWrapAxes; i++)
 			{
-				if ((isBlockCompressionFormat(inFormat)||isBlockCompressionFormat(outFormat))&&state->axisWraps[i]!=ISampler::ETC_REPEAT)
+				if ((isBlockCompressionFormat(inFormat)||isBlockCompressionFormat(outFormat))&&state->axisWraps[i]!=ISampler::E_TEXTURE_CLAMP::ETC_REPEAT)
 					return false;
 			}