prep for new push constants

Author: devshgraphicsprogramming

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

@@ -66,8 +66,7 @@ layout(push_constant) uniform PushConstants
 #ifndef _NBL_GLSL_EXT_FFT_SET_DATA_DEFINED_
 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;
+	const uint index = nbl_glsl_dot(uvec4(coordinate,channel),nbl_glsl_ext_FFT_Parameters_t_getOutputStrides());
 	outData[index] = complex_value;
 }
 #define _NBL_GLSL_EXT_FFT_SET_DATA_DEFINED_
@@ -87,8 +86,7 @@ nbl_glsl_complex nbl_glsl_ext_FFT_getPaddedData(in uvec3 coordinate, in uint cha
 		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;
+	const uint index = nbl_glsl_dot(uvec4(coordinate,channel),nbl_glsl_ext_FFT_Parameters_t_getInputStrides());
 	return inData[index];
 }
 #define _NBL_GLSL_EXT_FFT_GET_PADDED_DATA_DEFINED_

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

@@ -25,10 +25,21 @@ uvec3 nbl_glsl_ext_FFT_Parameters_t_getPaddedDimensions() {
     nbl_glsl_ext_FFT_Parameters_t params = nbl_glsl_ext_FFT_getParameters();
     return (params.padded_dimension.xyz);
 }
+uvec4 nbl_glsl_ext_FFT_Parameters_t_getOutputStrides()
+{
+    uvec3 dimension = nbl_glsl_ext_FFT_Parameters_t_getPaddedDimensions(); 
+    return uvec4(1u,dimension.x*uvec3(1u,dimension.y*uvec2(1u,dimension.z)));
+}
+
 uvec3 nbl_glsl_ext_FFT_Parameters_t_getDimensions() {
     nbl_glsl_ext_FFT_Parameters_t params = nbl_glsl_ext_FFT_getParameters();
     return (params.dimension.xyz);
 }  
+uvec4 nbl_glsl_ext_FFT_Parameters_t_getInputStrides()
+{
+    uvec3 dimension = nbl_glsl_ext_FFT_Parameters_t_getDimensions();
+    return uvec4(1u,dimension.x*uvec3(1u,dimension.y*uvec2(1u,dimension.z)));
+}
 uint nbl_glsl_ext_FFT_Parameters_t_getDirection() {
     nbl_glsl_ext_FFT_Parameters_t params = nbl_glsl_ext_FFT_getParameters();
     return (params.dimension.w >> 16) & 0x000000ff;

include/nbl/ext/FFT/FFT.h

@@ -29,16 +29,19 @@ struct alignas(16) uvec4 {
 class FFT : public core::TotalInterface
 {
 	public:
-		struct Parameters_t alignas(16) : nbl_glsl_ext_FFT_Parameters_t {
+		struct Parameters_t alignas(16) : nbl_glsl_ext_FFT_Parameters_t
+		{
 		};
 
-		enum class Direction : uint8_t {
+		enum class Direction : uint8_t
+		{
 			X = 0,
 			Y = 1,
 			Z = 2,
 		};
 
-		enum class PaddingType : uint8_t {
+		enum class PaddingType : uint8_t
+		{
 			CLAMP_TO_EDGE = 0,
 			FILL_WITH_ZERO = 1,
 			// TODO: mirror?