dry code is beautiful

Author: devshgraphicsprogramming

examples_tests/49.ComputeFFT/image_first_fft.comp

@@ -1,52 +1,18 @@
 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
 layout(set=0, binding=0) uniform sampler2D inputImage;
+#define _NBL_GLSL_EXT_FFT_INPUT_DESCRIPTOR_DEFINED_
 
-// output
-layout(set=0, binding=1) restrict buffer OutputBuffer
-{
-	nbl_glsl_complex outData[];
-};
-
-// Get/Set Data Function
-layout(push_constant) uniform PushConstants
-{
-	nbl_glsl_ext_FFT_Parameters_t params;
-} pc;
-
- nbl_glsl_ext_FFT_Parameters_t nbl_glsl_ext_FFT_getParameters()
- {
-	 nbl_glsl_ext_FFT_Parameters_t ret;
-	 ret = pc.params;
-	 return ret;
- }
-
-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;
-}
-
+#include <nbl/builtin/glsl/math/complex.glsl>
 nbl_glsl_complex nbl_glsl_ext_FFT_getPaddedData(in uvec3 coordinate, in uint channel) 
 {
 	ivec2 inputImageSize = textureSize(inputImage, 0);
 	vec2 normalizedCoords = (vec2(coordinate.xy) + vec2(0.5f)) / vec2(inputImageSize);
 	vec4 texelValue= textureLod(inputImage, normalizedCoords, 0);
 	return nbl_glsl_complex(texelValue[channel], 0.0f);
 }
+#define _NBL_GLSL_EXT_FFT_GET_PADDED_DATA_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);
-	}
-}
+
+#include "nbl/builtin/glsl/ext/FFT/default_compute_fft.comp"

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

@@ -1,7 +1,7 @@
 #ifndef _NBL_GLSL_WORKGROUP_SIZE_
 #define _NBL_GLSL_WORKGROUP_SIZE_ 256
-#endif
 layout(local_size_x=_NBL_GLSL_WORKGROUP_SIZE_, local_size_y=1, local_size_z=1) in;
+#endif
 
 
 #include <nbl/builtin/glsl/math/complex.glsl>

src/nbl/ext/FFT/FFT.cpp

@@ -71,6 +71,7 @@ R"===(#version 430 core
 #define _NBL_GLSL_WORKGROUP_SIZE_ %u
 #define _NBL_GLSL_EXT_FFT_MAX_DIM_SIZE_ %u
  
+layout(local_size_x=_NBL_GLSL_WORKGROUP_SIZE_, local_size_y=1, local_size_z=1) in;
 #include "nbl/builtin/glsl/ext/FFT/default_compute_fft.comp"
 
 )===";