Merge branch 'master' into bxdf_fixes_non_ct

Author: keptsecret

include/nbl/builtin/hlsl/bxdf/common.hlsl

@@ -1126,14 +1126,15 @@ struct beta
     {
         assert(x >= T(0.999) && y >= T(0.999));
 
-#ifdef __HLSL_VERSION
+// currently throws a boost preprocess error, see: https://github.com/Devsh-Graphics-Programming/Nabla/issues/932
+// #ifdef __HLSL_VERSION
         #pragma dxc diagnostic push
 		#pragma dxc diagnostic ignored "-Wliteral-range"
-#endif
+// #endif
 		const T thresholds[4] = { 0, 5e5, 1e6, 1e15 };	// threshold values gotten from testing when the function returns nan/inf/1
-#ifdef __HLSL_VERSION
+// #ifdef __HLSL_VERSION
         #pragma dxc diagnostic pop
-#endif
+// #endif
 		if (x+y > thresholds[mpl::find_lsb_v<sizeof(T)>])
 			return T(0.0);
 

include/nbl/builtin/hlsl/tgmath/impl.hlsl

@@ -539,14 +539,15 @@ struct l2gamma_helper<T NBL_PARTIAL_REQ_BOT(concepts::FloatingPointScalar<T>) >
 	// implementation derived from Numerical Recipes in C, transformed for log2
 	static T __call(T x)
 	{
-#ifdef __HLSL_VERSION
+// currently throws a boost preprocess error, see: https://github.com/Devsh-Graphics-Programming/Nabla/issues/932
+// #ifdef __HLSL_VERSION
 		#pragma dxc diagnostic push
 		#pragma dxc diagnostic ignored "-Wliteral-range"
-#endif
+// #endif
 		const T thresholds[4] = { 0, 5e4, 1e36, 1e305 };	// threshold values gotten from testing when the function returns nan/inf
-#ifdef __HLSL_VERSION
+// #ifdef __HLSL_VERSION
 		#pragma dxc diagnostic pop
-#endif
+// #endif
 		if (x > thresholds[mpl::find_lsb_v<sizeof(T)>])
 			return bit_cast<T>(numeric_limits<T>::infinity);
 
@@ -588,14 +589,15 @@ struct beta_helper<T NBL_PARTIAL_REQ_BOT(concepts::FloatingPointScalar<T>) >
 	// implementation from Numerical Recipes in C, 2nd ed.
 	static T __call(T v1, T v2)
 	{
-#ifdef __HLSL_VERSION
+// currently throws a boost preprocess error, see: https://github.com/Devsh-Graphics-Programming/Nabla/issues/932
+// #ifdef __HLSL_VERSION
 		#pragma dxc diagnostic push
 		#pragma dxc diagnostic ignored "-Wliteral-range"
-#endif
+// #endif
 		const T thresholds[4] = { 0, 2e4, 1e6, 1e15 };	// threshold values gotten from testing when the function returns nan/inf/1
-#ifdef __HLSL_VERSION
+// #ifdef __HLSL_VERSION
 		#pragma dxc diagnostic pop
-#endif
+// #endif
 		if (v1+v2 > thresholds[mpl::find_lsb_v<sizeof(T)>])
 			return T(0.0);