fix final little things after testing with real world usage

Author: devsh

examples_tests

@@ -31,7 +31,7 @@ struct __ptr
     {
         i *= sizeof(T);
         uint32_t2 newAddr = addr;
-        AddCarryOutput<T> lsbAddRes = spirv::addCarry<uint32_t>(addr[0],i);
+        spirv::AddCarryOutput<uint32_t> lsbAddRes = spirv::addCarry<uint32_t>(addr[0],i);
         newAddr[0] = lsbAddRes.result;
         newAddr[1] += lsbAddRes.carry;
         return __ptr::create(newAddr);
@@ -40,20 +40,23 @@ struct __ptr
     {
         i *= sizeof(T);
         uint32_t2 newAddr = addr;
-        AddCarryOutput<T> lsbSubRes = spirv::subBorrow<uint32_t>(addr[0],i);
+        spirv::AddCarryOutput<uint32_t> lsbSubRes = spirv::subBorrow<uint32_t>(addr[0],i);
         newAddr[0] = lsbSubRes.result;
         newAddr[1] -= lsbSubRes.carry;
         return __ptr::create(newAddr);
     }
 
-    template< uint64_t alignment=alignment_of_v<T> >
-    __ref<T,alignment,false> deref()
+    template<uint64_t alignment=alignment_of_v<T>, bool _restrict=false>
+    __ref<T,alignment,_restrict> deref()
     {
         // TODO: assert(addr&uint64_t(alignment-1)==0);
-        __ref<T,alignment,false> retval;
+        __ref<T,alignment,_restrict> retval;
         retval.__init(spirv::bitcast<spirv::bda_pointer_t<T>,uint32_t2>(addr));
         return retval;
     }
+    
+    template<uint64_t alignment=alignment_of_v<T> >
+    __ref<T,alignment,true> deref_restrict() {return deref<alignment,true>();}
 
     //! Dont use these, to avoid emitting shaderUint64 capability when compiling for crappy mobile GPUs
     static this_t create(const uint64_t _addr)

include/nbl/builtin/hlsl/bda/__ptr.hlsl

@@ -4,8 +4,9 @@
 #ifndef _NBL_BUILTIN_HLSL_BDA_REF_INCLUDED_
 #define _NBL_BUILTIN_HLSL_BDA_REF_INCLUDED_
 
+// TODO: this shouldn't be included IMHO
 #include "nbl/builtin/hlsl/functional.hlsl"
-#include "nbl/builtin/hlsl/bda/struct_declare.hlsl"
+#include "nbl/builtin/hlsl/spirv_intrinsics/core.hlsl"
 
 namespace nbl
 {

include/nbl/builtin/hlsl/bda/__ref.hlsl

@@ -4,7 +4,12 @@
 #ifndef _NBL_BUILTIN_HLSL_BDA_STRUCT_DECLARE_INCLUDED_
 #define _NBL_BUILTIN_HLSL_BDA_STRUCT_DECLARE_INCLUDED_
 
+#include "nbl/builtin/hlsl/type_traits.hlsl"
 #include "nbl/builtin/hlsl/mpl.hlsl"
+#ifdef  __HLSL_VERSION
+#include "nbl/builtin/hlsl/bda/__ptr.hlsl"
+#endif //  __HLSL_VERSION
+
 
 namespace nbl
 {
@@ -52,7 +57,6 @@ template<typename T, int32_t MemberIx>
 NBL_CONSTEXPR uint64_t member_offset_v = member_offset<T,MemberIx>::value;
 
 // stuff needed to compute alignment of the struct properly
-#ifdef __HLSL_VERSION
 namespace impl
 {
 template<typename T, uint32_t N>
@@ -69,7 +73,6 @@ struct default_alignment<T,0>
 template<typename T, typename MemberCount=member_count<T> >
 NBL_CONSTEXPR uint32_t default_alignment_v = default_alignment<T,MemberCount::value>::value;
 }
-#endif
 }
 }
 }

include/nbl/builtin/hlsl/bda/struct_declare.hlsl

@@ -10,6 +10,8 @@ namespace nbl
 {
 namespace hlsl
 {
+namespace spirv
+{
 
 template<typename T NBL_STRUCT_CONSTRAINABLE>
 struct AddCarryOutput;
@@ -30,7 +32,8 @@ struct SubBorrowOutput<T NBL_PARTIAL_REQ_BOT(concepts::UnsignedIntegral<T>) >
 	T result;
 	T borrow;
 };
+
+}
 }
 }
-
 #endif