Merge pull request #2088 from rudis/sdrplay

sdrplayv3: use SDRPLAY_MAX_DEVICES in enumOriginDevices()

plugins/samplesource/sdrplayv3/sdrplayv3plugin.cpp

@@ -96,7 +96,7 @@ void SDRPlayV3Plugin::enumOriginDevices(QStringList& listedHwIds, OriginDevices&
     sdrplay_api_LockDeviceApi();
 
     sdrplay_api_ErrT err;
-    sdrplay_api_DeviceT devs[6];
+    sdrplay_api_DeviceT devs[SDRPLAY_MAX_DEVICES];
     unsigned int count;
     if ((err = sdrplay_api_GetDevices(devs, &count, sizeof(devs) / sizeof(sdrplay_api_DeviceT))) == sdrplay_api_Success)
     {

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}

sdrbase/dsp/vkfftengine.cpp

@@ -16,6 +16,7 @@
 ///////////////////////////////////////////////////////////////////////////////////
 
 #include <QDebug>
+#include <QElapsedTimer>
 
 #include "dsp/vkfftengine.h"
 

sdrbase/dsp/vulkanvkfftengine.cpp

@@ -20,6 +20,7 @@
 #include "glslang_c_interface.h"
 
 #include "dsp/vulkanvkfftengine.h"
+#include "util/profiler.h"
 
 class GLSInitialiser {
 public: