ask user for padded data right away

Author: devshgraphicsprogramming

examples_tests/49.ComputeFFT/fft_convolve_ifft.comp

@@ -2,7 +2,6 @@ layout(local_size_x=_NBL_GLSL_WORKGROUP_SIZE_, local_size_y=1, local_size_z=1) i
 
 
 #define _NBL_GLSL_EXT_FFT_GET_PARAMETERS_DEFINED_
-#define _NBL_GLSL_EXT_FFT_GET_DATA_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"
@@ -29,14 +28,6 @@ layout(push_constant) uniform PushConstants
 	 return ret;
  }
 
-nbl_glsl_complex nbl_glsl_ext_FFT_getData(in uvec3 coordinate, in uint channel)
-{
-	nbl_glsl_complex retValue = nbl_glsl_complex(0, 0);
-	uvec3 dimension = nbl_glsl_ext_FFT_Parameters_t_getDimensions();
-	uint index = channel * (dimension.x * dimension.y * dimension.z) + coordinate.z * (dimension.x * dimension.y) + coordinate.y * (dimension.x) + coordinate.x;
-	retValue = inoutData[index];
-	return retValue;
-}
 
 void nbl_glsl_ext_FFT_setData(in uvec3 coordinate, in uint channel, in nbl_glsl_complex complex_value)
 {
@@ -58,7 +49,9 @@ nbl_glsl_complex nbl_glsl_ext_FFT_getPaddedData(in uvec3 coordinate, in uint cha
 		return nbl_glsl_complex(0, 0);
 	}
 
-	return nbl_glsl_ext_FFT_getData(clamped_coord, channel);
+	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];
 }
 
 void convolve(in uint item_per_thread_count, in uint ch) 

examples_tests/49.ComputeFFT/last_fft.comp

@@ -1,7 +1,6 @@
 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_GET_DATA_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"
@@ -28,15 +27,6 @@ layout(push_constant) uniform PushConstants
 	 nbl_glsl_ext_FFT_Parameters_t ret;
 	 ret = pc.params;
 	 return ret;
- }
-
-nbl_glsl_complex nbl_glsl_ext_FFT_getData(in uvec3 coordinate, in uint channel)
-{
-	nbl_glsl_complex retValue = nbl_glsl_complex(0, 0);
-	uvec3 dimension = nbl_glsl_ext_FFT_Parameters_t_getDimensions();
-	uint index = channel * (dimension.x * dimension.y * dimension.z) + coordinate.z * (dimension.x * dimension.y) + coordinate.y * (dimension.x) + coordinate.x;
-	retValue = inData[index];
-	return retValue;
 }
 
 void nbl_glsl_ext_FFT_setData(in uvec3 coordinate, in uint channel, in nbl_glsl_complex complex_value)
@@ -61,7 +51,9 @@ nbl_glsl_complex nbl_glsl_ext_FFT_getPaddedData(in uvec3 coordinate, in uint cha
 		return nbl_glsl_complex(0, 0);
 	}
 
-	return nbl_glsl_ext_FFT_getData(clamped_coord, channel);
+	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()

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

@@ -4,7 +4,6 @@
 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_GET_DATA_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"
@@ -55,19 +54,11 @@ layout(push_constant) uniform PushConstants
 	layout (offset = 0) 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 nbl_glsl_ext_FFT_getParameters()
+ {
 	 nbl_glsl_ext_FFT_Parameters_t ret;
 	 ret = pc.params;
 	 return ret;
- }
-
-nbl_glsl_complex nbl_glsl_ext_FFT_getData(in uvec3 coordinate, in uint channel)
-{
-	nbl_glsl_complex retValue = nbl_glsl_complex(0, 0);
-	uvec3 dimension = nbl_glsl_ext_FFT_Parameters_t_getDimensions();
-	uint index = channel * (dimension.x * dimension.y * dimension.z) + coordinate.z * (dimension.x * dimension.y) + coordinate.y * (dimension.x) + coordinate.x;
-	retValue = inData[index];
-	return retValue;
 }
 
 void nbl_glsl_ext_FFT_setData(in uvec3 coordinate, in uint channel, in nbl_glsl_complex complex_value)
@@ -90,7 +81,9 @@ nbl_glsl_complex nbl_glsl_ext_FFT_getPaddedData(in uvec3 coordinate, in uint cha
 		return nbl_glsl_complex(0, 0);
 	}
 
-	return nbl_glsl_ext_FFT_getData(clamped_coord, channel);
+	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()

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

@@ -24,11 +24,6 @@
 #define _NBL_GLSL_EXT_FFT_FILL_WITH_ZERO_ 1
 
 
-#ifndef _NBL_GLSL_EXT_FFT_GET_DATA_DECLARED_
-#define _NBL_GLSL_EXT_FFT_GET_DATA_DECLARED_
-vec2 nbl_glsl_ext_FFT_getData(in uvec3 coordinate, in uint channel);
-#endif
-
 #ifndef _NBL_GLSL_EXT_FFT_SET_DATA_DECLARED_
 #define _NBL_GLSL_EXT_FFT_SET_DATA_DECLARED_
 void nbl_glsl_ext_FFT_setData(in uvec3 coordinate, in uint channel, in vec2 complex_value);
@@ -42,9 +37,6 @@ vec2 nbl_glsl_ext_FFT_getPaddedData(in uvec3 coordinate, in uint channel);
 #ifndef _NBL_GLSL_EXT_FFT_GET_PARAMETERS_DEFINED_
 #error "You need to define `nbl_glsl_ext_FFT_getParameters` and mark `_NBL_GLSL_EXT_FFT_GET_PARAMETERS_DEFINED_`!"
 #endif
-#ifndef _NBL_GLSL_EXT_FFT_GET_DATA_DEFINED_
-#error "You need to define `nbl_glsl_ext_FFT_getData` and mark `_NBL_GLSL_EXT_FFT_GET_DATA_DEFINED_`!"
-#endif
 #ifndef _NBL_GLSL_EXT_FFT_SET_DATA_DEFINED_
 #error "You need to define `nbl_glsl_ext_FFT_setData` and mark `_NBL_GLSL_EXT_FFT_SET_DATA_DEFINED_`!"
 #endif