pragma to silence warning (kind of not working?), beta wo check

Author: keptsecret

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

@@ -927,20 +927,28 @@ struct beta
     }
 
     // removed values that cancel out in beta
+    static T __call_wo_check(T x, T y)
+    {
+        const T l2x = hlsl::log2<T>(x);
+        const T l2y = hlsl::log2<T>(y);
+        const T l2xy = hlsl::log2<T>(x+y);
+
+        return hlsl::exp2<T>((x - T(0.5)) * l2x + (y - T(0.5)) * l2y - (x + y - T(0.5)) * l2xy +
+            numbers::inv_ln2<T> * (__series_part(x) + __series_part(y) - __series_part(x+y)) + T(1.32574806473616));
+    }
+
     static T __call(T x, T y)
     {
         assert(x >= T(0.999) && y >= T(0.999));
 
+        #pragma dxc diagnostic push
+		#pragma dxc diagnostic ignored "-Wliteral-range"
 		const T thresholds[4] = { 0, 5e5, 1e6, 1e15 };	// threshold values gotten from testing when the function returns nan/inf/1
+        #pragma dxc diagnostic pop
 		if (x+y > thresholds[mpl::find_lsb_v<sizeof(T)>])
 			return T(0.0);
 
-        const T l2x = hlsl::log2<T>(x);
-        const T l2y = hlsl::log2<T>(y);
-        const T l2xy = hlsl::log2<T>(x+y);
-
-        return hlsl::exp2<T>((x - T(0.5)) * l2x + (y - T(0.5)) * l2y - (x + y - T(0.5)) * l2xy +
-            numbers::inv_ln2<T> * (__series_part(x) + __series_part(y) - __series_part(x+y)) + T(1.32574806473616));
+        return __call_wo_check(x, y);
     }
 };
 }
@@ -951,6 +959,12 @@ T beta(NBL_CONST_REF_ARG(T) x, NBL_CONST_REF_ARG(T) y)
     return impl::beta<T>::__call(x, y)/impl::beta<T>::__call(1.0, 1.0);
 }
 
+template<typename T>
+T beta_wo_check(NBL_CONST_REF_ARG(T) x, NBL_CONST_REF_ARG(T) y)
+{
+    return impl::beta<T>::__call_wo_check(x, y)/impl::beta<T>::__call_wo_check(1.0, 1.0);
+}
+
 }
 }
 }

include/nbl/builtin/hlsl/bxdf/ndf/ggx.hlsl

@@ -146,7 +146,7 @@ struct GGX<T,false NBL_PARTIAL_REQ_BOT(concepts::FloatingPointScalar<T>) >
                 return 0.0;
             scalar_type onePlusLambda_V = scalar_type(0.5) * (devsh_v / NdotV + scalar_type(1.0));
             scalar_type onePlusLambda_L = scalar_type(0.5) * (devsh_l / NdotL + scalar_type(1.0));
-            G2_over_G1 = bxdf::beta<scalar_type>(onePlusLambda_L, onePlusLambda_V) * onePlusLambda_V;
+            G2_over_G1 = bxdf::beta_wo_check<scalar_type>(onePlusLambda_L, onePlusLambda_V) * onePlusLambda_V;
         }
         else
         {
@@ -245,7 +245,7 @@ struct GGX<T,true NBL_PARTIAL_REQ_BOT(concepts::FloatingPointScalar<T>) >
                 return 0.0;
             scalar_type onePlusLambda_V = scalar_type(0.5) * (devsh_v / NdotV + scalar_type(1.0));
             scalar_type onePlusLambda_L = scalar_type(0.5) * (devsh_l / NdotL + scalar_type(1.0));
-            G2_over_G1 = bxdf::beta<scalar_type>(onePlusLambda_L, onePlusLambda_V) * onePlusLambda_V;
+            G2_over_G1 = bxdf::beta_wo_check<scalar_type>(onePlusLambda_L, onePlusLambda_V) * onePlusLambda_V;
         }
         else
         {

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

@@ -539,9 +539,10 @@ 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)
 	{
-		// TODO: need a way to silence warning about thresholds being too large for T
-		// affected by DXC issue: https://github.com/microsoft/DirectXShaderCompiler/issues/7722
+		#pragma dxc diagnostic push
+		#pragma dxc diagnostic ignored "-Wliteral-range"
 		const T thresholds[4] = { 0, 5e4, 1e36, 1e305 };	// threshold values gotten from testing when the function returns nan/inf
+		#pragma dxc diagnostic pop
 		if (x > thresholds[mpl::find_lsb_v<sizeof(T)>])
 			return bit_cast<T>(numeric_limits<T>::infinity);
 
@@ -583,7 +584,10 @@ 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)
 	{
+		#pragma dxc diagnostic push
+		#pragma dxc diagnostic ignored "-Wliteral-range"
 		const T thresholds[4] = { 0, 2e4, 1e6, 1e15 };	// threshold values gotten from testing when the function returns nan/inf/1
+		#pragma dxc diagnostic pop
 		if (v1+v2 > thresholds[mpl::find_lsb_v<sizeof(T)>])
 			return T(0.0);