Bug fix

Author: Przemog1

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

@@ -40,7 +40,7 @@ vector<T, 3> cross(NBL_CONST_REF_ARG(vector<T, 3>) lhs, NBL_CONST_REF_ARG(vector
 }
 
 template<typename T>
-int clamp(NBL_CONST_REF_ARG(T) val, NBL_CONST_REF_ARG(T) min, NBL_CONST_REF_ARG(T) max)
+T clamp(NBL_CONST_REF_ARG(T) val, NBL_CONST_REF_ARG(T) min, NBL_CONST_REF_ARG(T) max)
 {
 #ifdef __HLSL_VERSION
 
@@ -173,7 +173,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);
+	return spirv::floor(val);
 #else
 	return glm::floor(val);
 #endif
@@ -246,7 +246,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
@@ -256,7 +256,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
@@ -266,22 +266,17 @@ template<typename  T>
 inline T exp2(NBL_CONST_REF_ARG(T) val)
 {
 #ifdef __HLSL_VERSION
-	return spirv::Exp2(val);
+	return spirv::exp2(val);
 #else
 	return std::exp2(val);
 #endif
 }
 
-#ifdef __HLSL_VERSION
-#define EXP2_SPECIALIZATION_RETUR_VAL spirv::Exp2(float(val))
-#else
-#define EXP2_SPECIALIZATION_RETUR_VAL std::exp2(val)
-#endif
 #define DEFINE_EXP2_SPECIALIZATION(TYPE)\
 template<>\
 inline TYPE exp2(NBL_CONST_REF_ARG(TYPE) val)\
 {\
-	return EXP2_SPECIALIZATION_RETUR_VAL;\
+	return _static_cast<TYPE>(1ull << val);\
 }\
 
 DEFINE_EXP2_SPECIALIZATION(int16_t)
@@ -295,7 +290,7 @@ template<typename FloatingPoint>
 inline FloatingPoint rsqrt(FloatingPoint x)
 {
 #ifdef __HLSL_VERSION
-	return spirv::InverseSqrt(x);
+	return spirv::inverseSqrt(x);
 #else
 	return 1.0f / std::sqrt(x);
 #endif
@@ -304,4 +299,4 @@ inline FloatingPoint rsqrt(FloatingPoint x)
 }
 }
 
-#endif
+#endif

include/nbl/builtin/hlsl/shapes/beziers.hlsl

@@ -407,7 +407,7 @@ struct Quadratic
         // p'(1/2) = 2(C-A)
 
         // exponent so large it would wipe the mantissa on any relative operation
-        const float_t PARAMETER_THRESHOLD = hlsl::exp2(24);
+        const float_t PARAMETER_THRESHOLD = exp2(24);
         Candidates candidates;
 
         float_t2 Bdiv2 = B*0.5;

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

@@ -252,11 +252,11 @@ 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);
+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);
+enable_if_t<is_floating_point_v<FloatingPoint>, bool> isInf(FloatingPoint val);
 
 }
 

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

@@ -28,15 +28,15 @@ enable_if_t<is_integral_v<Integral> && (sizeof(scalar_type_t<Integral>) == 4), I
 
 template<typename FloatingPoint>
 [[vk::ext_instruction(GLSLstd450::GLSLstd450Exp2, "GLSL.std.450")]]
-enable_if_t<is_floating_point<FloatingPoint>::value, FloatingPoint> Exp2(FloatingPoint val);
+enable_if_t<is_floating_point<FloatingPoint>::value, FloatingPoint> exp2(FloatingPoint val);
 
 template<typename FloatingPoint>
 [[vk::ext_instruction(GLSLstd450::GLSLstd450InverseSqrt, "GLSL.std.450")]]
-enable_if_t<is_floating_point_v<FloatingPoint>, FloatingPoint> InverseSqrt(FloatingPoint val);
+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);
+enable_if_t<is_floating_point_v<FloatingPoint>, FloatingPoint> floor(FloatingPoint val);
 
 }
 }