FFT Parameters

Author: Erfan-Ahmadi

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

@@ -12,18 +12,14 @@
 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"
 
 // Input Descriptor
 
-struct nbl_glsl_ext_FFT_input_t
-{
-	vec2 complex_value;
-};
-
 #ifndef _NBL_GLSL_EXT_FFT_INPUT_SET_DEFINED_
 #define _NBL_GLSL_EXT_FFT_INPUT_SET_DEFINED_ 0
 #endif
@@ -33,12 +29,12 @@ struct nbl_glsl_ext_FFT_input_t
 #endif
 
 #ifndef _NBL_GLSL_EXT_FFT_INPUT_DESCRIPTOR_DEFINED_
+#define _NBL_GLSL_EXT_FFT_INPUT_DESCRIPTOR_DEFINED_
 
 #if USE_SSBO_FOR_INPUT > 0
-#define _NBL_GLSL_EXT_FFT_INPUT_DESCRIPTOR_DEFINED_
 layout(set=_NBL_GLSL_EXT_FFT_INPUT_SET_DEFINED_, binding=_NBL_GLSL_EXT_FFT_INPUT_BINDING_DEFINED_) readonly restrict buffer InputBuffer
 {
-	nbl_glsl_ext_FFT_input_t inData[];
+	nbl_glsl_complex inData[];
 };
 #else 
 layout(set=_NBL_GLSL_EXT_FFT_INPUT_SET_DEFINED_, binding=_NBL_GLSL_EXT_FFT_INPUT_BINDING_DEFINED_) uniform sampler2D inputImage;
@@ -48,12 +44,6 @@ layout(set=_NBL_GLSL_EXT_FFT_INPUT_SET_DEFINED_, binding=_NBL_GLSL_EXT_FFT_INPUT
 
 // Output Descriptor
 
-struct nbl_glsl_ext_FFT_output_t
-{
-	vec2 complex_value;
-};
-
-
 #ifndef _NBL_GLSL_EXT_FFT_OUTPUT_SET_DEFINED_
 #define _NBL_GLSL_EXT_FFT_OUTPUT_SET_DEFINED_ 0
 #endif
@@ -66,22 +56,27 @@ struct nbl_glsl_ext_FFT_output_t
 #define _NBL_GLSL_EXT_FFT_OUTPUT_DESCRIPTOR_DEFINED_
 layout(set=_NBL_GLSL_EXT_FFT_OUTPUT_SET_DEFINED_, binding=_NBL_GLSL_EXT_FFT_OUTPUT_BINDING_DEFINED_) restrict buffer OutputBuffer
 {
-	nbl_glsl_ext_FFT_output_t outData[];
+	nbl_glsl_complex outData[];
 };
 #endif
 
 // Get/Set Data Function
 
+ nbl_glsl_ext_FFT_Parameters_t nbl_glsl_ext_FFT_getParameters() {
+	 nbl_glsl_ext_FFT_Parameters_t ret;
+	 return ret;
+ }
+
 nbl_glsl_complex nbl_glsl_ext_FFT_getData(in uvec3 coordinate, in uint channel)
 {
-	vec2 retValue = vec2(0, 0);
+	nbl_glsl_complex retValue = nbl_glsl_complex(0, 0);
 #if USE_SSBO_FOR_INPUT > 0
 	uvec3 dimension = pc.dimension;
 	uint index = channel * (dimension.x * dimension.y * dimension.z) + coordinate.z * (dimension.x * dimension.y) + coordinate.y * (dimension.x) + coordinate.x;
-	retValue = inData[index].complex_value;
+	retValue = inData[index];
 #else
 	vec4 texelValue= texelFetch(inputImage, ivec2(coordinate.xy), 0);
-	retValue = vec2(texelValue[channel], 0.0f);
+	retValue = nbl_glsl_complex(texelValue[channel], 0.0f);
 #endif
 	return retValue;
 }
@@ -90,7 +85,7 @@ void nbl_glsl_ext_FFT_setData(in uvec3 coordinate, in uint channel, in nbl_glsl_
 {
 	uvec3 dimension = pc.padded_dimension;
 	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 = complex_value;
+	outData[index] = complex_value;
 }
 
 nbl_glsl_complex nbl_glsl_ext_FFT_getPaddedData(in uvec3 coordinate, in uint channel) {

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

@@ -10,6 +10,7 @@
 // Shared Memory
 #include <nbl/builtin/glsl/workgroup/shared_arithmetic.glsl>
 #include <nbl/builtin/glsl/math/functions.glsl>
+#include <nbl/builtin/glsl/ext/FFT/parameters.glsl>
 
 
 #ifndef _NBL_GLSL_EXT_FFT_MAX_DIM_SIZE_
@@ -56,6 +57,11 @@ layout(push_constant) uniform PushConstants
 } pc;
 #endif
 
+#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();
+#endif
+
 #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);
@@ -71,6 +77,9 @@ void nbl_glsl_ext_FFT_setData(in uvec3 coordinate, in uint channel, in vec2 comp
 vec2 nbl_glsl_ext_FFT_getPaddedData(in uvec3 coordinate, in uint channel);
 #endif
 
+#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

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

@@ -0,0 +1,15 @@
+// Copyright (C) 2018-2020 - DevSH Graphics Programming Sp. z O.O.
+// This file is part of the "Nabla Engine".
+// For conditions of distribution and use, see copyright notice in nabla.h
+
+#ifndef _NBL_GLSL_EXT_FFT_PARAMETERS_INCLUDED_
+#define _NBL_GLSL_EXT_FFT_PARAMETERS_INCLUDED_
+
+struct nbl_glsl_ext_FFT_Parameters_t
+{
+    uvec3   dimension;
+	uint    direction_isInverse_paddingType; // packed into a uint
+    uvec3   padded_dimension;
+};
+
+#endif

src/nbl/builtin/CMakeLists.txt

@@ -130,6 +130,7 @@ set(nbl_resources_to_embed
   #"nbl/builtin/glsl/ext/.glsl"
   "nbl/builtin/glsl/ext/FFT/default_compute_fft.comp"
   "nbl/builtin/glsl/ext/FFT/fft.glsl"
+  "nbl/builtin/glsl/ext/FFT/parameters.glsl"
   "nbl/builtin/glsl/ext/FFT/normalization.comp"
   "nbl/builtin/glsl/ext/LumaMeter/common.glsl"
   "nbl/builtin/glsl/ext/LumaMeter/impl.glsl"

src/nbl/ext/FFT/FFT.cpp

@@ -107,11 +107,11 @@ R"===(#version 430 core
 	const size_t extraSize = 32 + 32 + 32 + 32;
 
 	const uint32_t maxItemsPerThread = (maxPaddedDimensionSize - 1u) / (DEFAULT_WORK_GROUP_SIZE) + 1u;
-	const uint32_t useSSBO = (DataType::SSBO == inputType) ? 1 : 0;
+	const uint32_t useSSBOforInput = (DataType::SSBO == inputType) ? 1 : 0;
 	auto shader = core::make_smart_refctd_ptr<ICPUBuffer>(strlen(sourceFmt)+extraSize+1u);
 	snprintf(
 		reinterpret_cast<char*>(shader->getPointer()),shader->getSize(), sourceFmt,
-		useSSBO,
+		useSSBOforInput,
 		DEFAULT_WORK_GROUP_SIZE,
 		maxPaddedDimensionSize,
 		maxItemsPerThread