From fa5dc41503e55118b247decaad7ac633d8a2c60e Mon Sep 17 00:00:00 2001
From: Alessandro Gatti <a.gatti@frob.it>
Date: Fri, 26 Apr 2024 00:35:16 +0200
Subject: [PATCH] vkFFT: Fix building with recent Vulkan SDKs.

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
---
 sdrbase/CMakeLists.txt            | 8 --------
 sdrbase/dsp/vkfftengine.cpp       | 1 +
 sdrbase/dsp/vulkanvkfftengine.cpp | 1 +
 3 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/sdrbase/CMakeLists.txt b/sdrbase/CMakeLists.txt
index 7f04a162e..049b827be 100644
--- a/sdrbase/CMakeLists.txt
+++ b/sdrbase/CMakeLists.txt
@@ -606,8 +606,6 @@ if(Vulkan_FOUND AND (${VKFFT_BACKEND} EQUAL 0))
     find_library(VULKAN_SPIRV_TOOLS_LIB SPIRV-Tools HINTS "$ENV{VULKAN_SDK}/lib" REQUIRED)
     find_library(VULKAN_SPIRV_TOOLS_OPT_LIB SPIRV-Tools-opt HINTS "$ENV{VULKAN_SDK}/lib" REQUIRED)
     find_library(VULKAN_SPIRV_TOOLS_SHARED_LIB SPIRV-Tools-shared HINTS "$ENV{VULKAN_SDK}/lib" REQUIRED)
-    find_library(VULKAN_HLSL_LIB HLSL HINTS "$ENV{VULKAN_SDK}/lib" REQUIRED)
-    find_library(VULKAN_OGLCOMPILER_LIB OGLCompiler HINTS "$ENV{VULKAN_SDK}/lib" REQUIRED)
     find_library(VULKAN_OSDEPENDENT_LIB OSDependent HINTS "$ENV{VULKAN_SDK}/lib" REQUIRED)
     find_library(VULKAN_GLSLANG_LIB glslang HINTS "$ENV{VULKAN_SDK}/lib" REQUIRED)
     find_library(VULKAN_GLSLANG_RES_LIB glslang-default-resource-limits HINTS "$ENV{VULKAN_SDK}/lib" REQUIRED)
@@ -624,8 +622,6 @@ if(Vulkan_FOUND AND (${VKFFT_BACKEND} EQUAL 0))
     find_library(VULKAN_SPIRV_TOOLSD_LIB SPIRV-Tools${VULKAN_DEBUG_POSTFIX} HINTS "$ENV{VULKAN_SDK}/lib" REQUIRED)
     find_library(VULKAN_SPIRV_TOOLS_OPTD_LIB SPIRV-Tools-opt${VULKAN_DEBUG_POSTFIX} HINTS "$ENV{VULKAN_SDK}/lib" REQUIRED)
     find_library(VULKAN_SPIRV_TOOLS_SHAREDD_LIB SPIRV-Tools-shared${VULKAN_DEBUG_POSTFIX} HINTS "$ENV{VULKAN_SDK}/lib" REQUIRED)
-    find_library(VULKAN_HLSLD_LIB HLSL${VULKAN_DEBUG_POSTFIX} HINTS "$ENV{VULKAN_SDK}/lib" REQUIRED)
-    find_library(VULKAN_OGLCOMPILERD_LIB OGLCompiler${VULKAN_DEBUG_POSTFIX} HINTS "$ENV{VULKAN_SDK}/lib" REQUIRED)
     find_library(VULKAN_OSDEPENDENTD_LIB OSDependent${VULKAN_DEBUG_POSTFIX} HINTS "$ENV{VULKAN_SDK}/lib" REQUIRED)
     find_library(VULKAN_GLSLANGD_LIB glslang${VULKAN_DEBUG_POSTFIX} HINTS "$ENV{VULKAN_SDK}/lib" REQUIRED)
     find_library(VULKAN_GLSLANG_RESD_LIB glslang-default-resource-limits${VULKAN_DEBUG_POSTFIX} HINTS "$ENV{VULKAN_SDK}/lib" REQUIRED)
@@ -638,8 +634,6 @@ if(Vulkan_FOUND AND (${VKFFT_BACKEND} EQUAL 0))
         optimized ${VULKAN_SPIRV_TOOLS_LIB}
         optimized ${VULKAN_SPIRV_TOOLS_OPT_LIB}
         optimized ${VULKAN_SPIRV_TOOLS_SHARED_LIB}
-        optimized ${VULKAN_HLSL_LIB}
-        optimized ${VULKAN_OGLCOMPILER_LIB}
         optimized ${VULKAN_OSDEPENDENT_LIB}
         optimized ${VULKAN_GLSLANG_LIB}
         optimized ${VULKAN_GLSLANG_RES_LIB}
@@ -651,8 +645,6 @@ if(Vulkan_FOUND AND (${VKFFT_BACKEND} EQUAL 0))
         debug ${VULKAN_SPIRV_TOOLSD_LIB}
         debug ${VULKAN_SPIRV_TOOLS_OPTD_LIB}
         debug ${VULKAN_SPIRV_TOOLS_SHAREDD_LIB}
-        debug ${VULKAN_HLSLD_LIB}
-        debug ${VULKAN_OGLCOMPILERD_LIB}
         debug ${VULKAN_OSDEPENDENTD_LIB}
         debug ${VULKAN_GLSLANGD_LIB}
         debug ${VULKAN_GLSLANG_RESD_LIB}
diff --git a/sdrbase/dsp/vkfftengine.cpp b/sdrbase/dsp/vkfftengine.cpp
index 46e50ba9f..e9c4dc15b 100644
--- a/sdrbase/dsp/vkfftengine.cpp
+++ b/sdrbase/dsp/vkfftengine.cpp
@@ -16,6 +16,7 @@
 ///////////////////////////////////////////////////////////////////////////////////
 
 #include <QDebug>
+#include <QElapsedTimer>
 
 #include "dsp/vkfftengine.h"
 
diff --git a/sdrbase/dsp/vulkanvkfftengine.cpp b/sdrbase/dsp/vulkanvkfftengine.cpp
index 86c48d6f5..97020c35a 100644
--- a/sdrbase/dsp/vulkanvkfftengine.cpp
+++ b/sdrbase/dsp/vulkanvkfftengine.cpp
@@ -20,6 +20,7 @@
 #include "glslang_c_interface.h"
 
 #include "dsp/vulkanvkfftengine.h"
+#include "util/profiler.h"
 
 class GLSInitialiser {
 public: