Merge branch 'master' into FFT_Bloom

Author: Fletterio

28_FFTBloom/main.cpp

@@ -698,7 +698,7 @@ class FFTBloomApp final : public examples::SimpleWindowedApplication, public app
 // Compute required WorkgroupSize and ElementsPerThread for FFT
 // Remember we assume kernel is square!
 
-auto [elementsPerInvocationLog2, workgroupSizeLog2] = workgroup::fft::optimalFFTParameters(m_device->getPhysicalDevice()->getLimits().maxWorkgroupSize[0], kerDim.width);
+auto [elementsPerInvocationLog2, workgroupSizeLog2] = workgroup::fft::optimalFFTParameters(m_device->getPhysicalDevice()->getLimits().maxOptimallyResidentWorkgroupInvocations, kerDim.width);
 // Normalization shader needs this info
 uint16_t secondAxisFFTHalfLengthLog2 = elementsPerInvocationLog2 + workgroupSizeLog2 - 1;
 // Create shaders
@@ -878,7 +878,7 @@ class FFTBloomApp final : public examples::SimpleWindowedApplication, public app
 uint16_t firstAxisFFTWorkgroupSizeLog2;
 smart_refctd_ptr<IGPUShader> shaders[3];
 {
-auto [elementsPerInvocationLog2, workgroupSizeLog2] = workgroup::fft::optimalFFTParameters(m_device->getPhysicalDevice()->getLimits().maxWorkgroupSize[0], m_marginSrcDim.height);
+auto [elementsPerInvocationLog2, workgroupSizeLog2] = workgroup::fft::optimalFFTParameters(m_device->getPhysicalDevice()->getLimits().maxOptimallyResidentWorkgroupInvocations, m_marginSrcDim.height);
 SShaderConstevalParameters::SShaderConstevalParametersCreateInfo shaderConstevalInfo = { .useHalfFloats = m_useHalfFloats, .elementsPerInvocationLog2 = elementsPerInvocationLog2, .workgroupSizeLog2 = workgroupSizeLog2 };
 SShaderConstevalParameters shaderConstevalParameters(shaderConstevalInfo);
 shaders[0] = createShader("app_resources/image_fft_first_axis.hlsl", shaderConstevalParameters);
@@ -892,7 +892,7 @@ class FFTBloomApp final : public examples::SimpleWindowedApplication, public app
 
 // Second axis FFT might have different dimensions
 {
-auto [elementsPerInvocationLog2, workgroupSizeLog2] = workgroup::fft::optimalFFTParameters(m_device->getPhysicalDevice()->getLimits().maxWorkgroupSize[0], m_marginSrcDim.width);
+auto [elementsPerInvocationLog2, workgroupSizeLog2] = workgroup::fft::optimalFFTParameters(m_device->getPhysicalDevice()->getLimits().maxOptimallyResidentWorkgroupInvocations, m_marginSrcDim.width);
 // Compute kernel half pixel size
 const auto& kernelSpectraExtent = m_kernelNormalizedSpectrums->getCreationParameters().image->getCreationParameters().extent;
 float32_t2 kernelHalfPixelSize{ 0.5f,0.5f };