moar cleanup

Author: devshgraphicsprogramming

examples_tests/49.ComputeFFT/fft_convolve_ifft.comp

@@ -29,7 +29,7 @@ void convolve(in uint item_per_thread_count, in uint ch)
 
 		nbl_glsl_complex sourceSpectrum = nbl_glsl_ext_FFT_impl_values[t];
 
-		// TODO: do push constants here
+		//
 		const uvec3 coords = nbl_glsl_ext_FFT_getCoordinates(tid);
         vec2 uv = vec2(bitfieldReverse(coords.xy))/vec2(4294967296.f)+pc.params.kernel_half_pixel_size;
 		//

examples_tests/49.ComputeFFT/normalization.comp

@@ -19,7 +19,7 @@ void main()
 {
 	nbl_glsl_complex value = nbl_glsl_ext_FFT_storage_t_get(in_data[nbl_glsl_dot(gl_GlobalInvocationID,pc.strides.xyz)]);
 
-	const float power = length(nbl_glsl_ext_FFT_storage_t_get(in_data[0]));
+	const float power = abs(nbl_glsl_ext_FFT_storage_t_get(in_data[0]).x); // imaginary component will be 0
 
 	const uvec2 coord = bitfieldReverse(gl_GlobalInvocationID.xy)>>pc.bitreverse_shift.xy;
 	const nbl_glsl_complex shift = nbl_glsl_expImaginary(-nbl_glsl_PI*float(coord.x+coord.y));

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

@@ -71,8 +71,7 @@ void nbl_glsl_ext_FFT_setData(in uvec3 coordinate, in uint channel, in nbl_glsl_
 #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(ivec3 coordinate, in uint channel) 
+bool nbl_glsl_ext_FFT_wrap_coord(inout ivec3 coordinate)
 {
 	const ivec3 dimensions = ivec3(nbl_glsl_ext_FFT_Parameters_t_getDimensions());
 	const ivec3 max_coord = dimensions-ivec3(1u);
@@ -84,7 +83,7 @@ nbl_glsl_complex nbl_glsl_ext_FFT_getPaddedData(ivec3 coordinate, in uint channe
 	{
 		case _NBL_GLSL_EXT_FFT_PAD_CLAMP_TO_BORDER_:
 			if (any(bvec3(coordinate!=clamped_coord)))
-				return nbl_glsl_complex(0,0);
+				return false;
 			coordinate = clamped_coord;
 			break;
 		case _NBL_GLSL_EXT_FFT_PAD_CLAMP_TO_EDGE_:
@@ -107,7 +106,14 @@ nbl_glsl_complex nbl_glsl_ext_FFT_getPaddedData(ivec3 coordinate, in uint channe
 			}
 			break;
 	}
+	return true;
+}
 
+#ifndef _NBL_GLSL_EXT_FFT_GET_PADDED_DATA_DEFINED_
+nbl_glsl_complex nbl_glsl_ext_FFT_getPaddedData(ivec3 coordinate, in uint channel) 
+{
+	if (!nbl_glsl_ext_FFT_wrap_coord(coordinate))
+		return nbl_glsl_complex(0.f,0.f);
 	const uint index = nbl_glsl_dot(uvec4(coordinate,channel),nbl_glsl_ext_FFT_Parameters_t_getInputStrides());
 	return nbl_glsl_ext_FFT_storage_t_get(inData[index]);
 }

include/nbl/ext/FFT/FFT.h

@@ -50,7 +50,7 @@ class FFT final : public core::IReferenceCounted
 		static inline uint32_t buildParameters(
 			bool isInverse, uint32_t numChannels, const asset::VkExtent3D& inputDimensions, 
 			Parameters_t* outParams, DispatchInfo_t* outInfos, const asset::ISampler::E_TEXTURE_CLAMP* paddingType,
-			const asset::VkExtent3D& extraPaddedInputDimensions
+			const asset::VkExtent3D& extraPaddedInputDimensions, bool realInput = false
 		)
 		{
 			uint32_t passesRequired = 0u;