Added some spirv intrinsics

Author: Przemog1

include/nbl/builtin/hlsl/cpp_compat/intrinsics.hlsl

@@ -5,6 +5,7 @@
 #include <nbl/builtin/hlsl/type_traits.hlsl>
 #include <nbl/builtin/hlsl/vector_utils/vector_traits.hlsl>
 #include <nbl/builtin/hlsl/array_accessors.hlsl>
+#include <nbl/builtin/hlsl/spirv_intrinsics/GLSL.std.450.hlsl>
 
 #ifndef __HLSL_VERSION
 #include <algorithm>
@@ -18,7 +19,7 @@ namespace hlsl
 {
 
 template<typename Integer>
-int bitCount(const Integer& val)
+int bitCount(NBL_CONST_REF_ARG(Integer) val)
 {
 #ifdef __HLSL_VERSION
 
@@ -117,7 +118,7 @@ template<typename Integer>
 int findLSB(NBL_CONST_REF_ARG(Integer) val)
 {
 #ifdef __HLSL_VERSION
-
+	return spirv::findILsb(val);
 #else
 	if (is_signed_v<Integer>)
 	{
@@ -140,7 +141,14 @@ template<typename Integer>
 int findMSB(NBL_CONST_REF_ARG(Integer) val)
 {
 #ifdef __HLSL_VERSION
-
+	if (is_signed_v<Integer>)
+	{
+		return spirv::findSMsb(val);
+	}
+	else
+	{
+		return spirv::findUMsb(val);
+	}
 #else
 	if (is_signed_v<Integer>)
 	{
@@ -164,7 +172,7 @@ template<typename T> //requires ::nbl::hlsl::is_floating_point_v<T>
 inline T floor(NBL_CONST_REF_ARG(T) val)
 {
 #ifdef __HLSL_VERSION
-
+	return spirv::Floor(val);
 #else
 	return glm::floor(val);
 #endif
@@ -221,7 +229,7 @@ template<typename T>
 inline T min(NBL_CONST_REF_ARG(T) a, NBL_CONST_REF_ARG(T) b)
 {
 #ifdef __HLSL_VERSION
-
+	min(a, b);
 #else
 	return std::min(a, b);
 #endif
@@ -237,7 +245,7 @@ template<typename FloatingPoint>
 inline FloatingPoint isnan(NBL_CONST_REF_ARG(FloatingPoint) val)
 {
 #ifdef __HLSL_VERSION
-	return spirv::isnan(val);
+	return spirv::IsNan(val);
 #else
 	return std::isnan(val);
 #endif
@@ -247,7 +255,7 @@ template<typename FloatingPoint>
 inline FloatingPoint isinf(NBL_CONST_REF_ARG(FloatingPoint) val)
 {
 #ifdef __HLSL_VERSION
-	return spirv::isinf(val);
+	return spirv::IsInf(val);
 #else
 	return std::isinf(val);
 #endif
@@ -257,17 +265,17 @@ template<typename  T>
 inline T exp2(NBL_CONST_REF_ARG(T) val)
 {
 #ifdef __HLSL_VERSION
-	
+	return spirv::Exp2(val);
 #else
 	return std::exp2(val);
 #endif
 }
 
-template<typename T>
-inline T rsqrt(T x)
+template<typename FloatingPoint>
+inline FloatingPoint rsqrt(FloatingPoint x)
 {
 #ifdef __HLSL_VERSION
-	
+	return spirv::InverseSqrt(x);
 #else
 	return 1.0f / std::sqrt(x);
 #endif

include/nbl/builtin/hlsl/spirv_intrinsics/core.hlsl

@@ -250,6 +250,14 @@ template<typename Integral>
 [[vk::ext_instruction( spv::OpBitReverse )]]
 enable_if_t<is_integral_v<Integral>, Integral> bitFieldReverse( Integral base );
 
+template<typename FloatingPoint>
+[[vk::ext_instruction( spv::OpIsNan )]]
+enable_if_t<is_floating_point_v<FloatingPoint>, bool> IsNan(FloatingPoint val);
+
+template<typename FloatingPoint>
+[[vk::ext_instruction( spv::OpIsInf )]]
+enable_if_t<is_floating_point_v<FloatingPoint>, bool> IsInf(FloatingPoint val);
+
 }
 
 #endif

include/nbl/builtin/hlsl/spirv_intrinsics/glsl.std.450.hlsl

@@ -14,17 +14,29 @@ namespace spirv
 
 // Find MSB and LSB restricted to 32-bit width component types https://registry.khronos.org/SPIR-V/specs/unified1/GLSL.std.450.html
 
-template<typename Integral NBL_FUNC_REQUIRES(is_integral_v<Integral> && (sizeof(scalar_type_t<Integral>) == 4))
-	[[vk::ext_instruction(GLSLstd450::GLSLstd450FindILsb, "GLSL.std.450")]]
-Integral findILsb(Integral value);
+template<typename Integral>
+[[vk::ext_instruction(GLSLstd450::GLSLstd450FindILsb, "GLSL.std.450")]]
+enable_if_t<is_integral_v<Integral> && (sizeof(scalar_type_t<Integral>) == 4), Integral> findILsb(Integral value);
 
-template<typename Integral NBL_FUNC_REQUIRES(is_integral_v<Integral> && (sizeof(scalar_type_t<Integral>) == 4))
-	[[vk::ext_instruction(GLSLstd450::GLSLstd450FindSMsb, "GLSL.std.450")]]
-Integral findSMsb(Integral value);
+template<typename Integral>
+[[vk::ext_instruction(GLSLstd450::GLSLstd450FindSMsb, "GLSL.std.450")]]
+enable_if_t<is_integral_v<Integral> && (sizeof(scalar_type_t<Integral>) == 4), Integral> findSMsb(Integral value);
 
-template<typename Integral NBL_FUNC_REQUIRES(is_integral_v<Integral> && (sizeof(scalar_type_t<Integral>) == 4))
-	[[vk::ext_instruction(GLSLstd450::GLSLstd450FindUMsb, "GLSL.std.450")]]
-Integral findUMsb(Integral value);
+template<typename Integral>
+[[vk::ext_instruction(GLSLstd450::GLSLstd450FindUMsb, "GLSL.std.450")]]
+enable_if_t<is_integral_v<Integral> && (sizeof(scalar_type_t<Integral>) == 4), Integral> findUMsb(Integral value);
+
+template<typename T>
+[[vk::ext_instruction(GLSLstd450::GLSLstd450Exp2, "GLSL.std.450")]]
+enable_if_t<is_fundamental<T>::value, T> Exp2(T val);
+
+template<typename FloatingPoint>
+[[vk::ext_instruction(GLSLstd450::GLSLstd450InverseSqrt, "GLSL.std.450")]]
+enable_if_t<is_floating_point_v<FloatingPoint>, FloatingPoint> InverseSqrt(FloatingPoint val);
+
+template<typename FloatingPoint>
+[[vk::ext_instruction(GLSLstd450::GLSLstd450Floor, "GLSL.std.450")]]
+enable_if_t<is_floating_point_v<FloatingPoint>, FloatingPoint> Floor(FloatingPoint val);
 
 }
 }