Merge pull request #136 from Devsh-Graphics-Programming/revert-135-accesors_fix

Revert "Refactoring accessor usage in examples"

Author: devshgraphicsprogramming

10_CountingSort/app_resources/prefix_sum_shader.comp.hlsl

@@ -11,9 +11,9 @@ groupshared uint32_t sdata[BucketCount];
 
 struct SharedAccessor
 {
-    void get(const uint32_t index, NBL_REF_ARG(uint32_t) value)
+    uint32_t get(const uint32_t index)
     {
-        value = sdata[index];
+        return sdata[index];
     }
 
     void set(const uint32_t index, const uint32_t value)
@@ -46,7 +46,7 @@ void main(uint32_t3 ID : SV_GroupThreadID, uint32_t3 GroupID : SV_GroupID)
     params.minimum = pushData.minimum;
     params.maximum = pushData.maximum;
 
-    using Counter = nbl::hlsl::sort::counting < WorkgroupSize, BucketCount, PtrAccessor, PtrAccessor, PtrAccessor, SharedAccessor, PtrAccessor::type_t>;
+    using Counter = nbl::hlsl::sort::counting < WorkgroupSize, BucketCount, PtrAccessor, PtrAccessor, PtrAccessor, SharedAccessor>;
     Counter counter = Counter::create(nbl::hlsl::glsl::gl_WorkGroupID().x);
 
     const Ptr input_ptr = Ptr::create(pushData.inputKeyAddress);

10_CountingSort/app_resources/scatter_shader.comp.hlsl

@@ -11,9 +11,9 @@ groupshared uint32_t sdata[BucketCount];
 
 struct SharedAccessor
 {
-    void get(const uint32_t index, NBL_REF_ARG(uint32_t) value)
+    uint32_t get(const uint32_t index)
     {
-        value = sdata[index];
+        return sdata[index];
     }
 
     void set(const uint32_t index, const uint32_t value)
@@ -34,7 +34,6 @@ struct SharedAccessor
 
 struct DoublePtrAccessor
 {
-    using type_t = uint32_t;
     static DoublePtrAccessor create(const PtrAccessor input, const PtrAccessor output)
     {
         DoublePtrAccessor accessor;
@@ -43,9 +42,9 @@ struct DoublePtrAccessor
         return accessor;
     }
 
-    void get(const uint64_t index, NBL_REF_ARG(uint32_t) value)
+    uint32_t get(const uint64_t index)
     {
-        input.get(index, value);
+        return input.get(index);
     }
 
     void set(const uint64_t index, const uint32_t value)
@@ -70,7 +69,7 @@ void main(uint32_t3 ID : SV_GroupThreadID, uint32_t3 GroupID : SV_GroupID)
     params.minimum = pushData.minimum;
     params.maximum = pushData.maximum;
 
-    using Counter = nbl::hlsl::sort::counting < WorkgroupSize, BucketCount, DoublePtrAccessor, DoublePtrAccessor, PtrAccessor, SharedAccessor, DoublePtrAccessor::type_t>;
+    using Counter = nbl::hlsl::sort::counting < WorkgroupSize, BucketCount, DoublePtrAccessor, DoublePtrAccessor, PtrAccessor, SharedAccessor>;
     Counter counter = Counter::create(nbl::hlsl::glsl::gl_WorkGroupID().x);
 
     const Ptr input_key_ptr = Ptr::create(pushData.inputKeyAddress);

23_ArithmeticUnitTest/app_resources/testWorkgroup.comp.hlsl

@@ -17,9 +17,9 @@ groupshared uint32_t scratch[ScratchSz];
 template<uint16_t offset>
 struct ScratchProxy
 {
-	void get(const uint32_t ix, NBL_REF_ARG(uint32_t) value)
+	uint32_t get(const uint32_t ix)
 	{
-		value = scratch[ix+offset];
+		return scratch[ix+offset];
 	}
 	void set(const uint32_t ix, const uint32_t value)
 	{