diff --git a/3rdparty/dxc/dxc b/3rdparty/dxc/dxc
index a532a63697..5dae7e7de8 160000
--- a/3rdparty/dxc/dxc
+++ b/3rdparty/dxc/dxc
@@ -1 +1 @@
-Subproject commit a532a63697946c09871f4932e4e0ce6e89a843de
+Subproject commit 5dae7e7de8085cfe8d59c0bd2fc6459ba05b7419
diff --git a/examples_tests b/examples_tests
index efe27fa783..f3cf235197 160000
--- a/examples_tests
+++ b/examples_tests
@@ -1 +1 @@
-Subproject commit efe27fa783347e17c43d795395cd32edf73b049d
+Subproject commit f3cf2351973e1ca247fc31c35db6cdc4c3ced196
diff --git a/include/nbl/builtin/hlsl/bxdf/fresnel.hlsl b/include/nbl/builtin/hlsl/bxdf/fresnel.hlsl
index 6bc40a831a..4c90b19601 100644
--- a/include/nbl/builtin/hlsl/bxdf/fresnel.hlsl
+++ b/include/nbl/builtin/hlsl/bxdf/fresnel.hlsl
@@ -138,7 +138,7 @@ struct ComputeMicrofacetNormal
     // VdotH <= 1-orientedEta2 for orientedEta<1 -> VdotH<0
     // VdotH <= 0 for orientedEta>1
     // so for transmission VdotH<=0, H needs to be flipped to be consistent with oriented eta
-    vector_type unnormalized(const bool _refract)
+    vector_type unnormalized(const bool _refract) NBL_CONST_MEMBER_FUNC
     {
         assert(hlsl::dot(V, L) <= -hlsl::min(orientedEta, scalar_type(1.0) / orientedEta));
         const scalar_type etaFactor = hlsl::mix(scalar_type(1.0), orientedEta, _refract);
@@ -148,7 +148,7 @@ struct ComputeMicrofacetNormal
     }
 
     // returns normalized vector, but NaN when result is length 0
-    vector_type normalized(const bool _refract)
+    vector_type normalized(const bool _refract) NBL_CONST_MEMBER_FUNC
     {
         const vector_type H = unnormalized(_refract);
         return hlsl::normalize<vector_type>(H);
diff --git a/include/nbl/builtin/hlsl/cpp_compat/basic.h b/include/nbl/builtin/hlsl/cpp_compat/basic.h
index 89753d4ba5..778f9bb0ab 100644
--- a/include/nbl/builtin/hlsl/cpp_compat/basic.h
+++ b/include/nbl/builtin/hlsl/cpp_compat/basic.h
@@ -51,7 +51,7 @@ namespace nbl::hlsl
 #define NBL_CONSTEXPR_STATIC_INLINE const static
 #define NBL_CONSTEXPR_INLINE_FUNC inline
 #define NBL_CONSTEXPR_FORCED_INLINE_FUNC inline
-#define NBL_CONST_MEMBER_FUNC 
+#define NBL_CONST_MEMBER_FUNC const
 #define NBL_CONSTEXPR_INLINE_NSPC_SCOPE_VAR const static
 #define NBL_CONSTEXPR_FUNC_SCOPE_VAR const
 #define NBL_CONSTEXPR_OOL_MEMBER const
diff --git a/include/nbl/builtin/hlsl/rwmc/ResolveParameters.hlsl b/include/nbl/builtin/hlsl/rwmc/ResolveParameters.hlsl
index afd5bf0573..e76f35b489 100644
--- a/include/nbl/builtin/hlsl/rwmc/ResolveParameters.hlsl
+++ b/include/nbl/builtin/hlsl/rwmc/ResolveParameters.hlsl
@@ -41,7 +41,7 @@ struct SResolveParameters
 	}
 
 	template<typename SampleType, typename Colorspace = colorspace::scRGB>
-	scalar_t calcLuma(NBL_CONST_REF_ARG(SampleType) col)
+	scalar_t calcLuma(NBL_CONST_REF_ARG(SampleType) col) NBL_CONST_MEMBER_FUNC
 	{
 		return hlsl::dot<SampleType>(hlsl::transpose(Colorspace::ToXYZ())[1], col);
 	}
diff --git a/include/nbl/builtin/hlsl/rwmc/SplattingParameters.hlsl b/include/nbl/builtin/hlsl/rwmc/SplattingParameters.hlsl
index e400ae2c47..8417dc661d 100644
--- a/include/nbl/builtin/hlsl/rwmc/SplattingParameters.hlsl
+++ b/include/nbl/builtin/hlsl/rwmc/SplattingParameters.hlsl
@@ -48,7 +48,7 @@ struct SPackedSplattingParameters
         return retval;
     }
 
-    SSplattingParameters unpack()
+    SSplattingParameters unpack() NBL_CONST_MEMBER_FUNC
     {
         SSplattingParameters retval;
         const float32_t2 unpackedRcpLog2BaseAndLog2BaseRoot = hlsl::unpackHalf2x16(PackedRcpLog2BaseAndLog2BaseRoot);
diff --git a/include/nbl/builtin/hlsl/rwmc/resolve.hlsl b/include/nbl/builtin/hlsl/rwmc/resolve.hlsl
index 348e26bdf3..ee5e090c20 100644
--- a/include/nbl/builtin/hlsl/rwmc/resolve.hlsl
+++ b/include/nbl/builtin/hlsl/rwmc/resolve.hlsl
@@ -46,7 +46,7 @@ struct SResolveAccessorAdaptor
 	NBL_CONSTEXPR_STATIC_INLINE int32_t image_dimension = 2;
 
 	template<typename OutputScalarType, int32_t Dimension>
-	void get(NBL_REF_ARG(output_t) value, vector<uint16_t, 2> uv, uint16_t layer, uint16_t level)
+	void get(NBL_REF_ARG(output_t) value, vector<uint16_t, 2> uv, uint16_t layer, uint16_t level) NBL_CONST_MEMBER_FUNC
 	{
 		typename AccessorType::output_t sampled;
 		accessor.template get<typename AccessorType::output_scalar_t, Dimension>(sampled, uv, layer, level);
@@ -82,7 +82,7 @@ struct SResolver
 		return retval;
 	}
 
-	output_t operator()(NBL_REF_ARG(CascadeAccessor) acc, const int16_t2 coord)
+	output_t operator()(NBL_REF_ARG(CascadeAccessor) acc, const int16_t2 coord) NBL_CONST_MEMBER_FUNC
 	{
 		scalar_t reciprocalBaseI = 1.f;
 		SCascadeSample curr = __sampleCascade(acc, coord, 0u, reciprocalBaseI);
@@ -150,7 +150,7 @@ struct SResolver
 
 	// pseudo private stuff:
 
-	SCascadeSample __sampleCascade(NBL_REF_ARG(CascadeAccessor) acc, int16_t2 coord, uint16_t cascadeIndex, scalar_t reciprocalBaseI)
+	SCascadeSample __sampleCascade(NBL_REF_ARG(CascadeAccessor) acc, int16_t2 coord, uint16_t cascadeIndex, scalar_t reciprocalBaseI) NBL_CONST_MEMBER_FUNC
 	{
 		output_t sampleValue;
 		scalar_t excl_hood_luma_sum = 0.f;