my shader code is a sahara

Author: devshgraphicsprogramming

examples_tests/49.ComputeFFT/fft_convolve_ifft.comp

@@ -1,58 +1,22 @@
 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 and Output Descriptor
 layout(set=0, binding=0) buffer restrict InputOutputBuffer
 {
 	nbl_glsl_complex inoutData[];
 };
+#define _NBL_GLSL_EXT_FFT_INPUT_DESCRIPTOR_DEFINED_
+#define _NBL_GLSL_EXT_FFT_OUTPUT_DESCRIPTOR_DEFINED_
 
 layout(set=0, binding=1) uniform sampler2D NormalizedKernel[3];
 
-// 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;
-	inoutData[index] = complex_value;
-}
-
-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);
-	uvec3 clamped_coord = min(coordinate, max_coord);
-	
-	bool is_out_of_range = any(bvec3(coordinate!=clamped_coord));
-
-	uint paddingType = nbl_glsl_ext_FFT_Parameters_t_getPaddingType();
-
-	if (_NBL_GLSL_EXT_FFT_FILL_WITH_ZERO_ == paddingType && is_out_of_range) {
-		return nbl_glsl_complex(0, 0);
-	}
-	
-	uvec3 dimension = nbl_glsl_ext_FFT_Parameters_t_getDimensions();
-	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 inoutData[index];
-}
+#define inData inoutData
+#define outData inoutData
+#define _NBL_GLSL_EXT_FFT_MAIN_DEFINED_
+#include "nbl/builtin/glsl/ext/FFT/default_compute_fft.comp"
 
 void convolve(in uint item_per_thread_count, in uint ch) 
 {

examples_tests/49.ComputeFFT/last_fft.comp

@@ -1,34 +1,10 @@
 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) readonly restrict buffer InputBuffer
-{
-	nbl_glsl_complex inData[];
-};
-
 // Output Descriptor
-
 layout(set=0, binding=1, rgba16f) uniform image2D outImage;
+#define _NBL_GLSL_EXT_FFT_OUTPUT_DESCRIPTOR_DEFINED_
 
-// 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;
-}
-
+#include <nbl/builtin/glsl/math/complex.glsl>
 void nbl_glsl_ext_FFT_setData(in uvec3 coordinate, in uint channel, in nbl_glsl_complex complex_value)
 {
 	const ivec2 coords = ivec2(coordinate.xy);
@@ -37,30 +13,7 @@ void nbl_glsl_ext_FFT_setData(in uvec3 coordinate, in uint channel, in nbl_glsl_
     color_value[channel] = complex_value.x;
     imageStore(outImage, coords, color_value);
 }
+#define _NBL_GLSL_EXT_FFT_SET_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);
-	uvec3 clamped_coord = min(coordinate, max_coord);
-	
-	bool is_out_of_range = any(bvec3(coordinate!=clamped_coord));
-
-	uint paddingType = nbl_glsl_ext_FFT_Parameters_t_getPaddingType();
-
-	if (_NBL_GLSL_EXT_FFT_FILL_WITH_ZERO_ == paddingType && is_out_of_range) {
-		return nbl_glsl_complex(0, 0);
-	}
-	
-	uvec3 dimension = nbl_glsl_ext_FFT_Parameters_t_getDimensions();
-	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];
-}
 
-void main()
-{
-    const uint numChannels = nbl_glsl_ext_FFT_Parameters_t_getNumChannels();
-	for(uint ch = 0u; ch < numChannels; ++ch)
-	{
-		nbl_glsl_ext_FFT(true, ch);
-	}
-}
+#include "nbl/builtin/glsl/ext/FFT/default_compute_fft.comp"

examples_tests/49.ComputeFFT/main.cpp

@@ -68,6 +68,9 @@ R"===(#version 430 core
 
 	return gpuSpecializedShader;
 }
+
+
+
 inline void updateDescriptorSet_Convolution (
 	video::IVideoDriver * driver,
 	video::IGPUDescriptorSet * set,
@@ -175,6 +178,8 @@ inline void updateDescriptorSet_LastFFT (
 	driver->updateDescriptorSets(2u, pWrites, 0u, nullptr);
 }
 
+
+
 int main()
 {
 	nbl::SIrrlichtCreationParameters deviceParams;