VkFFT v1.3.3 release (bugfix)

-bugfix for tempBuffer memory management in Vulkan API -bugfix for tempBuffer stride management for multi upload even R2C algorithm
DTolm · Jan 9, 2024 · ebb3cd3 · ebb3cd3
1 parent d6f7ded
commit ebb3cd3
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 14 deletions.
diff --git a/vkFFT/vkFFT/vkFFT_AppManagement/vkFFT_InitializeApp.h b/vkFFT/vkFFT/vkFFT_AppManagement/vkFFT_InitializeApp.h
@@ -1683,42 +1683,30 @@ static inline VkFFTResult initializeVkFFT(VkFFTApplication* app, VkFFTConfigurat
 			for (pfUINT i = 0; i < app->configuration.FFTdim; i++) {
 				for (pfUINT j = 0; j < app->localFFTPlan->numAxisUploads[i]; j++) {
 					app->localFFTPlan->axes[i][j].specializationConstants.performBufferSetUpdate = 1;
-					resFFT = VkFFTUpdateBufferSet(app, app->localFFTPlan, &app->localFFTPlan->axes[i][j], i, j, 0);
-					if (resFFT != VKFFT_SUCCESS) return resFFT;
 				}
 				if (app->useBluesteinFFT[i] && (app->localFFTPlan->numAxisUploads[i] > 1)) {
 					for (pfUINT j = 1; j < app->localFFTPlan->numAxisUploads[i]; j++) {
 						app->localFFTPlan->inverseBluesteinAxes[i][j].specializationConstants.performBufferSetUpdate = 1;
-						resFFT = VkFFTUpdateBufferSet(app, app->localFFTPlan, &app->localFFTPlan->inverseBluesteinAxes[i][j], i, j, 0);
-						if (resFFT != VKFFT_SUCCESS) return resFFT;
 					}
 				}
 			}
 			if (app->localFFTPlan->bigSequenceEvenR2C) {
 				app->localFFTPlan->R2Cdecomposition.specializationConstants.performBufferSetUpdate = 1;
-				resFFT = VkFFTUpdateBufferSetR2CMultiUploadDecomposition(app, app->localFFTPlan, &app->localFFTPlan->R2Cdecomposition, 0, 0, 0);
-                if (resFFT != VKFFT_SUCCESS) return resFFT;
 			}
 		}
 		if (!app->configuration.makeForwardPlanOnly) {
 			for (pfUINT i = 0; i < app->configuration.FFTdim; i++) {
 				for (pfUINT j = 0; j < app->localFFTPlan_inverse->numAxisUploads[i]; j++) {
 					app->localFFTPlan_inverse->axes[i][j].specializationConstants.performBufferSetUpdate = 1;
-					resFFT = VkFFTUpdateBufferSet(app, app->localFFTPlan_inverse, &app->localFFTPlan_inverse->axes[i][j], i, j, 1);
-					if (resFFT != VKFFT_SUCCESS) return resFFT;
 				}
 				if (app->useBluesteinFFT[i] && (app->localFFTPlan_inverse->numAxisUploads[i] > 1)) {
 					for (pfUINT j = 1; j < app->localFFTPlan_inverse->numAxisUploads[i]; j++) {
 						app->localFFTPlan_inverse->inverseBluesteinAxes[i][j].specializationConstants.performBufferSetUpdate = 1;
-						resFFT = VkFFTUpdateBufferSet(app, app->localFFTPlan_inverse, &app->localFFTPlan_inverse->inverseBluesteinAxes[i][j], i, j, 1);
-                        if (resFFT != VKFFT_SUCCESS) return resFFT;
 					}
 				}
 			}
 			if (app->localFFTPlan_inverse->bigSequenceEvenR2C) {
 				app->localFFTPlan_inverse->R2Cdecomposition.specializationConstants.performBufferSetUpdate = 1;
-				resFFT = VkFFTUpdateBufferSetR2CMultiUploadDecomposition(app, app->localFFTPlan_inverse, &app->localFFTPlan_inverse->R2Cdecomposition, 0, 0, 1);
-                if (resFFT != VKFFT_SUCCESS) return resFFT;
 			}
 		}
 	}

diff --git a/vkFFT/vkFFT/vkFFT_PlanManagement/vkFFT_Plans/vkFFT_Plan_FFT.h b/vkFFT/vkFFT/vkFFT_PlanManagement/vkFFT_Plans/vkFFT_Plan_FFT.h
@@ -287,7 +287,10 @@ static inline VkFFTResult VkFFTPlanAxis(VkFFTApplication* app, VkFFTPlan* FFTPla
 
 		if (axis_id == 0) {
             for (int i = 1; i < app->configuration.FFTdim; i++){
-                axisStride[i].data.i = prevStride * FFTPlan->actualFFTSizePerAxis[axis_id][i-1];
+				if (FFTPlan->bigSequenceEvenR2C && (i == 1))
+					axisStride[i].data.i = prevStride * (FFTPlan->actualFFTSizePerAxis[axis_id][i-1]+1);
+				else
+					axisStride[i].data.i = prevStride * FFTPlan->actualFFTSizePerAxis[axis_id][i-1];
                 prevStride = axisStride[i].data.i;
             }
         }else{
@@ -359,7 +362,10 @@ static inline VkFFTResult VkFFTPlanAxis(VkFFTApplication* app, VkFFTPlan* FFTPla
 
         if (axis_id == 0) {
             for (int i = 1; i < app->configuration.FFTdim; i++){
-                axisStride[i].data.i = prevStride * FFTPlan->actualFFTSizePerAxis[axis_id][i-1];
+                if (FFTPlan->bigSequenceEvenR2C && (i == 1))
+					axisStride[i].data.i = prevStride * (FFTPlan->actualFFTSizePerAxis[axis_id][i-1]+1);
+				else
+					axisStride[i].data.i = prevStride * FFTPlan->actualFFTSizePerAxis[axis_id][i-1];
                 prevStride = axisStride[i].data.i;
             }
         }else{