Make barrier conditions more apparent (part 1/3)

Author: devshgraphicsprogramming

include/irr/builtin/glsl/workgroup/shuffle.glsl

@@ -19,11 +19,28 @@
 #endif
 
 
+uint irr_glsl_workgroupShuffle_noBarriers(in uint val, in uint id)
+{
+	_IRR_GLSL_SCRATCH_SHARED_DEFINED_[gl_LocalInvocationIndex] = val;
+	barrier();
+	memoryBarrierShared();
+	return _IRR_GLSL_SCRATCH_SHARED_DEFINED_[id];
+}
+uint irr_glsl_workgroupShuffle(in uint val, in uint id)
+{
+	barrier();
+	memoryBarrierShared();
+	const uint retval = irr_glsl_workgroupShuffle_noBarriers(val,id);
+	barrier();
+	memoryBarrierShared();
+	return retval;
+}
+
+
 /** TODO @Hazardu or @Przemog you can express all of them in terms of the uint variants to safe yourself the trouble of repeated code, this could also be a recruitment task.
 
 bool irr_glsl_workgroupShuffle(in bool val, in uint id);
 float irr_glsl_workgroupShuffle(in float val, in uint id);
-uint irr_glsl_workgroupShuffle(in uint val, in uint id);
 int irr_glsl_workgroupShuffle(in int val, in uint id);
 
 bool irr_glsl_workgroupShuffleXor(in bool val, in uint mask);

include/irr/builtin/glsl/workgroup/vote.glsl

@@ -20,7 +20,7 @@
 #endif
 
 
-bool irr_glsl_workgroupAll(in bool value)
+bool irr_glsl_workgroupAll_noBarriers(in bool value)
 {
 	// TODO: Optimization using subgroupAll in an ifdef IRR_GL_something (need to do feature mapping first), probably only first 2 lines need to change
 	_IRR_GLSL_SCRATCH_SHARED_DEFINED_[0u] = 1u;
@@ -31,8 +31,16 @@ bool irr_glsl_workgroupAll(in bool value)
 
 	return _IRR_GLSL_SCRATCH_SHARED_DEFINED_[0u]!=0u;
 }
+bool irr_glsl_workgroupAll(in bool value)
+{
+	barrier();
+	memoryBarrierShared();
+	const bool retval = irr_glsl_workgroupAll_noBarriers(value);
+	barrier();
+	return retval;
+}
 
-bool irr_glsl_workgroupAny(in bool value)
+bool irr_glsl_workgroupAny_noBarriers(in bool value)
 {
 	// TODO: Optimization using subgroupAny in an ifdef IRR_GL_something (need to do feature mapping first), probably only first 2 lines need to change
 	_IRR_GLSL_SCRATCH_SHARED_DEFINED_[0u] = 0u;
@@ -43,6 +51,14 @@ bool irr_glsl_workgroupAny(in bool value)
 
 	return _IRR_GLSL_SCRATCH_SHARED_DEFINED_[0u]!=0u;
 }
+bool irr_glsl_workgroupAny(in bool value)
+{
+	barrier();
+	memoryBarrierShared();
+	const bool retval = irr_glsl_workgroupAny_noBarriers(value);
+	barrier();
+	return retval;
+}
 
 /** TODO @Cyprian or @Anastazluk
 bool irr_glsl_workgroupAllEqual(in bool val);