rework for more dryness

Author: devshgraphicsprogramming

include/nbl/builtin/glsl/ext/FFT/default_compute_fft.comp

@@ -2,14 +2,12 @@
 #define _NBL_GLSL_WORKGROUP_SIZE_ 256
 #endif
 layout(local_size_x=_NBL_GLSL_WORKGROUP_SIZE_, local_size_y=1, local_size_z=1) in;
- 
-#define _NBL_GLSL_EXT_FFT_GET_PARAMETERS_DEFINED_
-#define _NBL_GLSL_EXT_FFT_SET_DATA_DEFINED_
-#define _NBL_GLSL_EXT_FFT_GET_PADDED_DATA_DEFINED_
-#include "nbl/builtin/glsl/ext/FFT/fft.glsl"
 
-// Input Descriptor
 
+#include <nbl/builtin/glsl/math/complex.glsl>
+
+
+// Input Descriptor
 #ifndef _NBL_GLSL_EXT_FFT_INPUT_SET_DEFINED_
 #define _NBL_GLSL_EXT_FFT_INPUT_SET_DEFINED_ 0
 #endif
@@ -26,11 +24,9 @@ layout(set=_NBL_GLSL_EXT_FFT_INPUT_SET_DEFINED_, binding=_NBL_GLSL_EXT_FFT_INPUT
 {
 	nbl_glsl_complex inData[];
 };
-
 #endif
 
 // Output Descriptor
-
 #ifndef _NBL_GLSL_EXT_FFT_OUTPUT_SET_DEFINED_
 #define _NBL_GLSL_EXT_FFT_OUTPUT_SET_DEFINED_ 0
 #endif
@@ -47,27 +43,37 @@ layout(set=_NBL_GLSL_EXT_FFT_OUTPUT_SET_DEFINED_, binding=_NBL_GLSL_EXT_FFT_OUTP
 };
 #endif
 
-// Get/Set Data Function
 
+#include <nbl/builtin/glsl/ext/FFT/parameters.glsl>
+
+
+#ifndef _NBL_GLSL_EXT_FFT_PUSH_CONSTANTS_DEFINED_
 layout(push_constant) uniform PushConstants
 {
 	layout (offset = 0) nbl_glsl_ext_FFT_Parameters_t params;
 } pc;
+#define _NBL_GLSL_EXT_FFT_PUSH_CONSTANTS_DEFINED_
+#endif 
 
+#ifndef _NBL_GLSL_EXT_FFT_GET_PARAMETERS_DEFINED_
  nbl_glsl_ext_FFT_Parameters_t nbl_glsl_ext_FFT_getParameters()
  {
-	 nbl_glsl_ext_FFT_Parameters_t ret;
-	 ret = pc.params;
-	 return ret;
+	 return pc.params;
 }
+#define _NBL_GLSL_EXT_FFT_GET_PARAMETERS_DEFINED_
+#endif
 
+#ifndef _NBL_GLSL_EXT_FFT_SET_DATA_DEFINED_
 void nbl_glsl_ext_FFT_setData(in uvec3 coordinate, in uint channel, in nbl_glsl_complex complex_value)
 {
 	uvec3 dimension = nbl_glsl_ext_FFT_Parameters_t_getPaddedDimensions();
 	uint index = channel * (dimension.x * dimension.y * dimension.z) + coordinate.z * (dimension.x * dimension.y) + coordinate.y * (dimension.x) + coordinate.x;
 	outData[index] = complex_value;
 }
+#define _NBL_GLSL_EXT_FFT_SET_DATA_DEFINED_
+#endif
 
+#ifndef _NBL_GLSL_EXT_FFT_GET_PADDED_DATA_DEFINED_
 nbl_glsl_complex nbl_glsl_ext_FFT_getPaddedData(in uvec3 coordinate, in uint channel) 
 {
 	uvec3 max_coord = nbl_glsl_ext_FFT_Parameters_t_getDimensions() - uvec3(1u);
@@ -85,10 +91,19 @@ nbl_glsl_complex nbl_glsl_ext_FFT_getPaddedData(in uvec3 coordinate, in uint cha
 	uint index = channel * (dimension.x * dimension.y * dimension.z) + clamped_coord.z * (dimension.x * dimension.y) + clamped_coord.y * (dimension.x) + clamped_coord.x;
 	return inData[index];
 }
+#define _NBL_GLSL_EXT_FFT_GET_PADDED_DATA_DEFINED_
+#endif
+ 
+
+#include "nbl/builtin/glsl/ext/FFT/fft.glsl"
+
 
+#ifndef _NBL_GLSL_EXT_FFT_MAIN_DEFINED_
+#define _NBL_GLSL_EXT_FFT_MAIN_DEFINED_
 void main()
 {
     const uint numChannels = nbl_glsl_ext_FFT_Parameters_t_getNumChannels();
 	for(uint ch = 0u; ch < numChannels; ++ch)
 		nbl_glsl_ext_FFT(nbl_glsl_ext_FFT_Parameters_t_getIsInverse(), ch);
-}
+}
+#endif

include/nbl/builtin/glsl/ext/FFT/fft.glsl

@@ -14,15 +14,6 @@
 
 #include "nbl/builtin/glsl/workgroup/shared_fft.glsl"
 
-// Push Constants
-
-#define _NBL_GLSL_EXT_FFT_DIRECTION_X_ 0
-#define _NBL_GLSL_EXT_FFT_DIRECTION_Y_ 1
-#define _NBL_GLSL_EXT_FFT_DIRECTION_Z_ 2
-
-#define _NBL_GLSL_EXT_FFT_CLAMP_TO_EDGE_ 0
-#define _NBL_GLSL_EXT_FFT_FILL_WITH_ZERO_ 1
-
 
 #ifndef _NBL_GLSL_EXT_FFT_SET_DATA_DECLARED_
 #define _NBL_GLSL_EXT_FFT_SET_DATA_DECLARED_

include/nbl/builtin/glsl/ext/FFT/parameters.glsl

@@ -7,6 +7,15 @@
 
 #include "nbl/builtin/glsl/ext/FFT/parameters_struct.glsl"
 
+
+#define _NBL_GLSL_EXT_FFT_DIRECTION_X_ 0
+#define _NBL_GLSL_EXT_FFT_DIRECTION_Y_ 1
+#define _NBL_GLSL_EXT_FFT_DIRECTION_Z_ 2
+
+#define _NBL_GLSL_EXT_FFT_CLAMP_TO_EDGE_ 0
+#define _NBL_GLSL_EXT_FFT_FILL_WITH_ZERO_ 1
+
+
 #ifndef _NBL_GLSL_EXT_FFT_GET_PARAMETERS_DECLARED_
 #define _NBL_GLSL_EXT_FFT_GET_PARAMETERS_DECLARED_
 nbl_glsl_ext_FFT_Parameters_t nbl_glsl_ext_FFT_getParameters();