minor changes to sphere sampling, rng usage

keptsecret · keptsecret · commit 1add8a3b6d3f · 2025-07-23T14:48:06.000+07:00
diff --git a/include/nbl/builtin/hlsl/bxdf/fresnel.hlsl b/include/nbl/builtin/hlsl/bxdf/fresnel.hlsl
@@ -8,6 +8,7 @@
 #include "nbl/builtin/hlsl/cpp_compat.hlsl"
 #include "nbl/builtin/hlsl/concepts.hlsl"
 #include "nbl/builtin/hlsl/numbers.hlsl"
+#include "nbl/builtin/hlsl/complex.hlsl"
 #include "nbl/builtin/hlsl/vector_utils/vector_traits.hlsl"
 
 namespace nbl
@@ -316,6 +317,15 @@ struct Conductor
         return retval;
     }
 
+    static Conductor<T> create(NBL_CONST_REF_ARG(complex_t<T>) eta, scalar_type clampedCosTheta)
+    {
+        Conductor<T> retval;
+        retval.eta = eta.real();
+        retval.etak2 = eta.imag()*eta.imag();
+        retval.clampedCosTheta = clampedCosTheta;
+        return retval;
+    }
+
     T operator()()
     {
         const scalar_type cosTheta2 = clampedCosTheta * clampedCosTheta;
diff --git a/include/nbl/builtin/hlsl/random/dim_adaptor_recursive.hlsl b/include/nbl/builtin/hlsl/random/dim_adaptor_recursive.hlsl
@@ -1,6 +1,7 @@
 #ifndef _NBL_HLSL_RANDOM_DIM_ADAPTOR_RECURSIVE_INCLUDED_
 #define _NBL_HLSL_RANDOM_DIM_ADAPTOR_RECURSIVE_INCLUDED_
 
+#include <nbl/builtin/hlsl/macros.h>
 #include "nbl/builtin/hlsl/type_traits.hlsl"
 
 namespace nbl
@@ -17,7 +18,7 @@ struct DimAdaptorRecursive
     using rng_type = RNG;
     using return_type = vector<uint32_t, DIM>;
 
-    static DimAdaptorRecursive<RNG, DIM> construct(rng_type rng)
+    static DimAdaptorRecursive<RNG, DIM> construct(NBL_REF_ARG(rng_type) rng)
     {
         DimAdaptorRecursive<RNG, DIM> retval;
         retval.rng = rng;
@@ -29,10 +30,7 @@ struct DimAdaptorRecursive
         array_set<return_type, uint32_t> setter;
 
         return_type retval;
-#ifdef __HLSL_VERSION
-        [unroll]
-#endif
-        for (uint32_t i = 0; i < DIM; i++)
+        NBL_UNROLL for (uint32_t i = 0; i < DIM; i++)
             setter(retval, i, rng());
         return retval;
     }
diff --git a/include/nbl/builtin/hlsl/random/lcg.hlsl b/include/nbl/builtin/hlsl/random/lcg.hlsl
@@ -15,7 +15,7 @@ struct Lcg
 {
     using seed_type = uint32_t;
 
-    static Lcg create(NBL_CONST_REF_ARG(seed_type) _state)
+    static Lcg create(const seed_type _state)
 	{
         Lcg retval;
         retval.state = _state;
diff --git a/include/nbl/builtin/hlsl/random/pcg.hlsl b/include/nbl/builtin/hlsl/random/pcg.hlsl
@@ -15,7 +15,7 @@ struct PCG32
 {
     using seed_type = uint32_t;
 
-    static PCG32 construct(NBL_CONST_REF_ARG(seed_type) initialState)
+    static PCG32 construct(const seed_type initialState)
     {
         PCG32 retval;
         retval.state = initialState;
diff --git a/include/nbl/builtin/hlsl/random/xoroshiro.hlsl b/include/nbl/builtin/hlsl/random/xoroshiro.hlsl
@@ -33,7 +33,7 @@ struct Xoroshiro64Star
 	using seed_type = uint32_t2;
 
 	// TODO: create
-	static Xoroshiro64Star construct(NBL_CONST_REF_ARG(seed_type) initialState)
+	static Xoroshiro64Star construct(const seed_type initialState)
 	{
 		Xoroshiro64StateHolder stateHolder = {initialState};
 		return Xoroshiro64Star(stateHolder);
@@ -55,7 +55,7 @@ struct Xoroshiro64StarStar
 	using seed_type = uint32_t2;
 
 	// TODO: create
-	static Xoroshiro64StarStar construct(NBL_CONST_REF_ARG(seed_type) initialState)
+	static Xoroshiro64StarStar construct(const seed_type initialState)
 	{
 		Xoroshiro64StateHolder stateHolder = {initialState};
 		return Xoroshiro64StarStar(stateHolder);
diff --git a/include/nbl/builtin/hlsl/sampling/cos_weighted_spheres.hlsl b/include/nbl/builtin/hlsl/sampling/cos_weighted_spheres.hlsl
@@ -34,18 +34,16 @@ struct ProjectedHemisphere
         return L_z * numbers::inv_pi<float>;
     }
 
-    template<typename U=T NBL_FUNC_REQUIRES(is_scalar_v<U>)
-    static sampling::quotient_and_pdf<vector<U,1>, T> quotient_and_pdf(T L)
+    template<typename U=vector<T,1> >
+    static sampling::quotient_and_pdf<U, T> quotient_and_pdf(T L)
     {
-        using vector_t1 = vector<U,1>;
-        return sampling::quotient_and_pdf<vector_t1, T>::create(hlsl::promote<vector_t1>(1.0), pdf(L));
+        return sampling::quotient_and_pdf<U, T>::create(hlsl::promote<U>(1.0), pdf(L));
     }
 
-    template<typename U=T NBL_FUNC_REQUIRES(is_scalar_v<U>)
-    static sampling::quotient_and_pdf<vector<U,1>, T> quotient_and_pdf(vector_t3 L)
+    template<typename U=vector<T,1> >
+    static sampling::quotient_and_pdf<U, T> quotient_and_pdf(vector_t3 L)
     {
-        using vector_t1 = vector<U,1>;
-        return sampling::quotient_and_pdf<vector_t1, T>::create(hlsl::promote<vector_t1>(1.0), pdf(L.z));
+        return sampling::quotient_and_pdf<U, T>::create(hlsl::promote<U>(1.0), pdf(L.z));
     }
 };
 
@@ -72,18 +70,16 @@ struct ProjectedSphere
         return T(0.5) * hemisphere_t::pdf(L_z);
     }
 
-    template<typename U=T NBL_FUNC_REQUIRES(is_scalar_v<U>)
-    static sampling::quotient_and_pdf<vector<U,1>, T> quotient_and_pdf(T L)
+    template<typename U=vector<T,1> >
+    static sampling::quotient_and_pdf<U, T> quotient_and_pdf(T L)
     {
-        using vector_t1 = vector<U,1>;
-        return sampling::quotient_and_pdf<vector_t1, T>::create(hlsl::promote<vector_t1>(1.0), pdf(L));
+        return sampling::quotient_and_pdf<U, T>::create(hlsl::promote<U>(1.0), pdf(L));
     }
 
-    template<typename U=T NBL_FUNC_REQUIRES(is_scalar_v<U>)
-    static sampling::quotient_and_pdf<vector<U,1>, T> quotient_and_pdf(vector_t3 L)
+    template<typename U=vector<T,1> >
+    static sampling::quotient_and_pdf<U, T> quotient_and_pdf(vector_t3 L)
     {
-        using vector_t1 = vector<U,1>;
-        return sampling::quotient_and_pdf<vector_t1, T>::create(hlsl::promote<vector_t1>(1.0), pdf(L.z));
+        return sampling::quotient_and_pdf<U, T>::create(hlsl::promote<U>(1.0), pdf(L.z));
     }
 };
 
diff --git a/include/nbl/builtin/hlsl/sampling/uniform_spheres.hlsl b/include/nbl/builtin/hlsl/sampling/uniform_spheres.hlsl
@@ -36,11 +36,10 @@ struct UniformHemisphere
         return T(1.0) / (T(2.0) * numbers::pi<T>);
     }
 
-    template<typename U=T NBL_FUNC_REQUIRES(is_scalar_v<U>)
-    static quotient_and_pdf<vector<U,1>, T> quotient_and_pdf()
+    template<typename U=vector<T,1> >
+    static quotient_and_pdf<U, T> quotient_and_pdf()
     {
-        using vector_t1 = vector<U,1>;
-        return quotient_and_pdf<vector_t1, T>::create(hlsl::promote<vector_t1>(1.0), pdf());
+        return quotient_and_pdf<U, T>::create(hlsl::promote<U>(1.0), pdf());
     }
 };
 
@@ -63,11 +62,10 @@ struct UniformSphere
         return T(1.0) / (T(4.0) * numbers::pi<T>);
     }
 
-    template<typename U=T NBL_FUNC_REQUIRES(is_scalar_v<U>)
-    static quotient_and_pdf<vector<U,1>, T> quotient_and_pdf()
+    template<typename U=vector<T,1> >
+    static quotient_and_pdf<U, T> quotient_and_pdf()
     {
-        using vector_t1 = vector<U,1>;
-        return quotient_and_pdf<vector_t1, T>::create(hlsl::promote<vector_t1>(1.0), pdf());
+        return quotient_and_pdf<U, T>::create(hlsl::promote<U>(1.0), pdf());
     }
 };
 }

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ struct Lcg`
`15`	`15`	`{`
`16`	`16`	`using seed_type = uint32_t;`
`17`	`17`
`18`		`- static Lcg create(NBL_CONST_REF_ARG(seed_type) _state)`
	`18`	`+ static Lcg create(const seed_type _state)`
`19`	`19`	`{`
`20`	`20`	`Lcg retval;`
`21`	`21`	`retval.state = _state;`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ struct PCG32`
`15`	`15`	`{`
`16`	`16`	`using seed_type = uint32_t;`
`17`	`17`
`18`		`- static PCG32 construct(NBL_CONST_REF_ARG(seed_type) initialState)`
	`18`	`+ static PCG32 construct(const seed_type initialState)`
`19`	`19`	`{`
`20`	`20`	`PCG32 retval;`
`21`	`21`	`retval.state = initialState;`
Original file line number	Diff line number	Diff line change
`@@ -34,18 +34,16 @@ struct ProjectedHemisphere`
`34`	`34`	`return L_z * numbers::inv_pi<float>;`
`35`	`35`	`}`
`36`	`36`
`37`		`- template<typename U=T NBL_FUNC_REQUIRES(is_scalar_v<U>)`
`38`		`- static sampling::quotient_and_pdf<vector<U,1>, T> quotient_and_pdf(T L)`
	`37`	`+ template<typename U=vector<T,1> >`
	`38`	`+ static sampling::quotient_and_pdf<U, T> quotient_and_pdf(T L)`
`39`	`39`	`{`
`40`		`- using vector_t1 = vector<U,1>;`
`41`		`- return sampling::quotient_and_pdf<vector_t1, T>::create(hlsl::promote<vector_t1>(1.0), pdf(L));`
	`40`	`+ return sampling::quotient_and_pdf<U, T>::create(hlsl::promote<U>(1.0), pdf(L));`
`42`	`41`	`}`
`43`	`42`
`44`		`- template<typename U=T NBL_FUNC_REQUIRES(is_scalar_v<U>)`
`45`		`- static sampling::quotient_and_pdf<vector<U,1>, T> quotient_and_pdf(vector_t3 L)`
	`43`	`+ template<typename U=vector<T,1> >`
	`44`	`+ static sampling::quotient_and_pdf<U, T> quotient_and_pdf(vector_t3 L)`
`46`	`45`	`{`
`47`		`- using vector_t1 = vector<U,1>;`
`48`		`- return sampling::quotient_and_pdf<vector_t1, T>::create(hlsl::promote<vector_t1>(1.0), pdf(L.z));`
	`46`	`+ return sampling::quotient_and_pdf<U, T>::create(hlsl::promote<U>(1.0), pdf(L.z));`
`49`	`47`	`}`
`50`	`48`	`};`
`51`	`49`
`@@ -72,18 +70,16 @@ struct ProjectedSphere`
`72`	`70`	`return T(0.5) * hemisphere_t::pdf(L_z);`
`73`	`71`	`}`
`74`	`72`
`75`		`- template<typename U=T NBL_FUNC_REQUIRES(is_scalar_v<U>)`
`76`		`- static sampling::quotient_and_pdf<vector<U,1>, T> quotient_and_pdf(T L)`
	`73`	`+ template<typename U=vector<T,1> >`
	`74`	`+ static sampling::quotient_and_pdf<U, T> quotient_and_pdf(T L)`
`77`	`75`	`{`
`78`		`- using vector_t1 = vector<U,1>;`
`79`		`- return sampling::quotient_and_pdf<vector_t1, T>::create(hlsl::promote<vector_t1>(1.0), pdf(L));`
	`76`	`+ return sampling::quotient_and_pdf<U, T>::create(hlsl::promote<U>(1.0), pdf(L));`
`80`	`77`	`}`
`81`	`78`
`82`		`- template<typename U=T NBL_FUNC_REQUIRES(is_scalar_v<U>)`
`83`		`- static sampling::quotient_and_pdf<vector<U,1>, T> quotient_and_pdf(vector_t3 L)`
	`79`	`+ template<typename U=vector<T,1> >`
	`80`	`+ static sampling::quotient_and_pdf<U, T> quotient_and_pdf(vector_t3 L)`
`84`	`81`	`{`
`85`		`- using vector_t1 = vector<U,1>;`
`86`		`- return sampling::quotient_and_pdf<vector_t1, T>::create(hlsl::promote<vector_t1>(1.0), pdf(L.z));`
	`82`	`+ return sampling::quotient_and_pdf<U, T>::create(hlsl::promote<U>(1.0), pdf(L.z));`
`87`	`83`	`}`
`88`	`84`	`};`
`89`	`85`
Original file line number	Diff line number	Diff line change
`@@ -36,11 +36,10 @@ struct UniformHemisphere`
`36`	`36`	`return T(1.0) / (T(2.0) * numbers::pi<T>);`
`37`	`37`	`}`
`38`	`38`
`39`		`- template<typename U=T NBL_FUNC_REQUIRES(is_scalar_v<U>)`
`40`		`- static quotient_and_pdf<vector<U,1>, T> quotient_and_pdf()`
	`39`	`+ template<typename U=vector<T,1> >`
	`40`	`+ static quotient_and_pdf<U, T> quotient_and_pdf()`
`41`	`41`	`{`
`42`		`- using vector_t1 = vector<U,1>;`
`43`		`- return quotient_and_pdf<vector_t1, T>::create(hlsl::promote<vector_t1>(1.0), pdf());`
	`42`	`+ return quotient_and_pdf<U, T>::create(hlsl::promote<U>(1.0), pdf());`
`44`	`43`	`}`
`45`	`44`	`};`
`46`	`45`
`@@ -63,11 +62,10 @@ struct UniformSphere`
`63`	`62`	`return T(1.0) / (T(4.0) * numbers::pi<T>);`
`64`	`63`	`}`
`65`	`64`
`66`		`- template<typename U=T NBL_FUNC_REQUIRES(is_scalar_v<U>)`
`67`		`- static quotient_and_pdf<vector<U,1>, T> quotient_and_pdf()`
	`65`	`+ template<typename U=vector<T,1> >`
	`66`	`+ static quotient_and_pdf<U, T> quotient_and_pdf()`
`68`	`67`	`{`
`69`		`- using vector_t1 = vector<U,1>;`
`70`		`- return quotient_and_pdf<vector_t1, T>::create(hlsl::promote<vector_t1>(1.0), pdf());`
	`68`	`+ return quotient_and_pdf<U, T>::create(hlsl::promote<U>(1.0), pdf());`
`71`	`69`	`}`
`72`	`70`	`};`
`73`	`71`	`}`