Beta cross platform

.gitignore

@@ -1,13 +1,18 @@
 *CLKernel_*.h
+*Kernels/*.cl.h
+True Audio Next SDK Build Instructions.docx
 /.vscode/c_cpp_properties.json
 /.vscode/settings.json
 /.vscode/tasks.json
+/tan/tanlibrary/src/Graal/OclKernels/*.h
+/tan/samples/src/TrueAudioVR/Kernels/*.h
 /tan/build/cmake/linux
 /tan/build/cmake/mac
 /tan/build/cmake/mac-xcode
 /tan/build/cmake/mac-gnumake
 /tan/build/cmake/vs2015
 /tan/build/cmake/vs2017
 /thirdparty/portaudio/*
-/thirdparty/OpenCL-Headers/*
+/tan/tanlibrary/src/fftw-3.3.5/*
+/tan/tanlibrary/src/fftw-3.3.5-dll64/*
 .DS_Store

.gitmodules

@@ -1,4 +1,6 @@
 [submodule "thirdparty/OpenCL-Headers"]
 	path = thirdparty/OpenCL-Headers
-	url = https://github.com/KhronosGroup/OpenCL-Headers.git
-
+	url = https://github.com/KhronosGroup/OpenCL-Headers
+[submodule "amfOpen"]
+	path = amfOpen
+	url = https://github.com/amfdev/AMF

.vscode/launch.json

@@ -0,0 +1,56 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "(gdb) Linux Launch",
+            "type": "cppdbg",
+            "request": "launch",
+            "program": "${workspaceFolder}/tan/build/cmake/linux/cmake-RoomAcousticQT-bin/RoomAcousticsQT",
+            "args": [],
+            "stopAtEntry": false,
+            "cwd": "${workspaceFolder}",
+            "environment": [
+                {
+                    "name": "AMF_DLL_NAME",
+                    "value": "/opt/amdgpu-pro/lib/x86_64-linux-gnu/libamfrt64.so"
+                }
+            ],
+            "externalConsole": false,
+            "MIMode": "gdb",
+            "setupCommands": [
+                {
+                    "description": "Enable pretty-printing for gdb",
+                    "text": "-enable-pretty-printing",
+                    "ignoreFailures": true
+                }
+            ]
+        },
+        {
+            "name": "(lldb) Mac OSX Launch",
+            "type": "cppdbg",
+            "request": "launch",
+            "program": "${workspaceFolder}/tan/build/cmake/mac-gnumake/cmake-RoomAcousticQT-bin/RoomAcousticsQT",
+            "args": [],
+            "stopAtEntry": false,
+            "cwd": "${workspaceFolder}",
+            "environment": [
+                {
+                    "name": "AMF_DLL_NAME",
+                    "value": "still_absent.dylib"
+                }
+            ],
+            "externalConsole": false,
+            "MIMode": "lldb",
+            "setupCommands": [
+                {
+                    "description": "Enable pretty-printing for gdb",
+                    "text": "-enable-pretty-printing",
+                    "ignoreFailures": true
+                }
+            ]
+        }
+    ]
+}

build_test.jenkinsfile

@@ -0,0 +1 @@
+gpuopen_tan_luxoft_pipeline()

tan/build/cmake/CMakeLists.txt

@@ -16,60 +16,66 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_SKIP_RULE_DEPENDENCY TRUE)
 
 enable_language(CXX)
-set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -D_DEBUG")
-if(NOT WIN32)
-if(APPLE)
-#SET (CMAKE_CXX_COMPILER "/usr/bin/c++")
-set(CMAKE_CXX_FLAGS_DEBUG "-Xpreprocessor -fopenmp -lomp")
-set(CMAKE_CXX_FLAGS "-Xpreprocessor -fopenmp -lomp")
-#set(CMAKE_SHARED_LINKER_FLAGS " -lomp" )
-else()
-set(CMAKE_CXX_FLAGS_DEBUG "-fopenmp")
-set(CMAKE_CXX_FLAGS "-fopenmp")
-endif()
-endif()
-
 
 if(NOT CMAKE_BUILD_TYPE)
   set(CMAKE_BUILD_TYPE Debug)
   message("Build type was not set, Debug will be forced")
 endif()
 
+if(CMAKE_BUILD_TYPE MATCHES "Debug" OR CMAKE_BUILD_TYPE MATCHES "RelWithDebInfo")
+  message("Debug build type is set")
+else()
+  message("Release build type is set")
+endif()
+
+# prepare compilation params
+if(AMF_CORE_STATIC)
+  message("AMF will be built as a static library")
+
+  ADD_DEFINITIONS(-DAMF_CORE_STATIC)
+endif()
+
+if(AMF_HOME)
+  message("AMF_HOME is set to ${AMF_HOME}")
+else()
+  set(AMF_HOME "../../../../../amf")
+  message("AMF_HOME is set to the default value: ${AMF_HOME}")
+endif()
+
 # name
 project(TAN DESCRIPTION "TAN")
 
 get_filename_component(ABSOLUTE_PATH "${PROJECT_SOURCE_DIR}/../../../" ABSOLUTE)
 set(TAN_ROOT ${ABSOLUTE_PATH})
 message("TAN_ROOT: ${TAN_ROOT}")
 
+#libraries
+add_subdirectory(../../tanlibrary/proj/cmake/amf cmake-amf-bin)
+add_subdirectory(../../tanlibrary/proj/cmake/Graal cmake-Graal-bin)
+add_subdirectory(../../tanlibrary/proj/cmake/Graal2 cmake-Graal2-bin)
+add_subdirectory(../../tanlibrary/proj/cmake/clFFT cmake-clFFT-bin)
+add_subdirectory(../../tanlibrary/proj/cmake/TAN cmake-TAN-bin)
+
 #examples
 add_subdirectory(../../samples/proj/cmake/GPUUtilities cmake-GPUUtilities-bin)
-#add_subdirectory(../../samples/proj/cmake/Ambisonic1stOrderDecoder cmake-Ambisonic1stOrderDecoder-bin)
-#add_subdirectory(../../samples/proj/cmake/Ambisonic1stOrderEncoder cmake-Ambisonic1stOrderEncoder-bin)
-#add_subdirectory(../../samples/proj/cmake/Ambisonic2ndOrderEncoder cmake-Ambisonic2ndOrderEncoder-bin)
-#add_subdirectory(../../samples/proj/cmake/AmbisonicVRDecoder cmake-AmbisonicVRDecoder-bin)
+add_subdirectory(../../samples/proj/cmake/Ambisonic1stOrderDecoder cmake-Ambisonic1stOrderDecoder-bin)
+add_subdirectory(../../samples/proj/cmake/Ambisonic1stOrderEncoder cmake-Ambisonic1stOrderEncoder-bin)
+add_subdirectory(../../samples/proj/cmake/Ambisonic2ndOrderEncoder cmake-Ambisonic2ndOrderEncoder-bin)
+add_subdirectory(../../samples/proj/cmake/AmbisonicVRDecoder cmake-AmbisonicVRDecoder-bin)
 add_subdirectory(../../samples/proj/cmake/CLKernelPreprocessor cmake-CLKernelPreprocessor-bin)
 add_subdirectory(../../samples/proj/cmake/FileToHeader cmake-FileToHeader-bin)
 add_subdirectory(../../samples/proj/cmake/TrueAudioVR cmake-TrueAudioVR-bin)
 add_subdirectory(../../samples/proj/cmake/RoomAcousticQT cmake-RoomAcousticQT-bin)
-
 add_subdirectory(../../samples/proj/cmake/ReverbMixer cmake-ReverbMixer-bin)
 
 if(WIN32)
   #not implemented yet: add_subdirectory(../../samples/proj/cmake/OculusRoomTAN cmake-OculusRoomTAN-bin)
   #migration to new player not yet done: add_subdirectory(../../samples/proj/cmake/RoomAcoustics cmake-RoomAcoustics-bin)
 endif()
 
-#libraries
-add_subdirectory(../../tanlibrary/proj/cmake/amf cmake-amf-bin)
-add_subdirectory(../../tanlibrary/proj/cmake/Graal cmake-Graal-bin)
-add_subdirectory(../../tanlibrary/proj/cmake/Graal2 cmake-Graal2-bin)
-add_subdirectory(../../tanlibrary/proj/cmake/clFFT cmake-clFFT-bin)
-add_subdirectory(../../tanlibrary/proj/cmake/TAN cmake-TAN-bin)
-
 #tests
 add_subdirectory(../../tests/proj/cmake/TALibDopplerTest cmake-TALibDopplerTest-bin)
 add_subdirectory(../../tests/proj/cmake/TALibTestConvolution cmake-TALibTestConvolution-bin)
 add_subdirectory(../../tests/proj/cmake/TALibTestDynamicChannelConvolution cmake-TALibTestDynamicChannelConvolution-bin)
 add_subdirectory(../../tests/proj/cmake/TALibVRTest cmake-TALibVRTest-bin)
-#add_subdirectory(../../tests/proj/cmake/TanDeviceResourcesTest cmake-TanDeviceResourcesTest-bin)
+add_subdirectory(../../tests/proj/cmake/TanDeviceResourcesTest cmake-TanDeviceResourcesTest-bin)

tan/build/cmake/build-vs2017-cmake-debug.bat

@@ -0,0 +1,3 @@
+SETLOCAL
+
+cmake --build vs2017 --config Debug

tan/build/cmake/build-vs2017-cmake-release.bat

@@ -0,0 +1,3 @@
+SETLOCAL
+
+cmake --build vs2017 --config Release

tan/build/cmake/build-vs2017-msbuild-debug.bat

@@ -0,0 +1,5 @@
+SETLOCAL
+
+CD vs2017
+
+msbuild TAN.sln /p:Configuration=Debug /p:StopOnFirstFailure=true

tan/build/cmake/build-vs2017-msbuild-release.bat

@@ -0,0 +1,5 @@
+SETLOCAL
+
+CD vs2017
+
+msbuild TAN.sln /p:Configuration=Release /p:StopOnFirstFailure=true

tan/build/cmake/gatherDebugBinaries.bat

@@ -0,0 +1,11 @@
+mkdir bin
+copy vs2017\cmake-RoomAcousticQT-bin\Debug bin
+copy vs2017\cmake-TALibTestConvolution-bin\Debug bin
+copy ..\..\tests\src\TALibTestConvolution\*.wav bin
+copy ..\..\tests\src\TALibTestConvolution\*.bat bin
+copy vs2017\cmake-RoomAcousticQT-bin\cmake-portaudio-bin\Debug bin
+copy vs2017\cmake-TAN-bin\Debug bin
+copy vs2017\cmake-TrueAudioVR-bin\Debug bin
+copy vs2017\cmake-GPUUtilities-bin\Debug bin
+copy ..\..\..\thirdparty\Qt\Qt5.9.9\5.9.9\msvc2017_64\bin\*.dll bin
+copy ..\..\tanlibrary\src\fftw-3.3.5-dll64\libfftw3f-3.dll bin

tan/build/cmake/gatherReleaseBinaries.bat

@@ -0,0 +1,11 @@
+mkdir bin
+copy vs2017\cmake-RoomAcousticQT-bin\Release bin
+copy vs2017\cmake-TALibTestConvolution-bin\Release bin
+copy ..\..\tests\src\TALibTestConvolution\*.wav bin
+copy ..\..\tests\src\TALibTestConvolution\*.bat bin
+copy vs2017\cmake-RoomAcousticQT-bin\cmake-portaudio-bin\Release bin
+copy vs2017\cmake-TAN-bin\Release bin
+copy vs2017\cmake-TrueAudioVR-bin\Release bin
+copy vs2017\cmake-GPUUtilities-bin\Release bin
+copy ..\..\..\thirdparty\Qt\Qt5.9.9\5.9.9\msvc2017_64\bin\*.dll bin
+copy ..\..\tanlibrary\src\fftw-3.3.5-dll64\libfftw3f-3.dll bin

tan/build/cmake/gatherbinaries.bat

@@ -1,7 +1,12 @@
 mkdir bin
 copy vs2015\cmake-RoomAcousticQT-bin\Debug bin
+copy vs2015\cmake-TALibTestConvolution-bin\Debug bin
+copy ..\..\tests\src\TALibTestConvolution\*.wav bin
+copy ..\..\tests\src\TALibTestConvolution\*.bat bin
 copy vs2015\cmake-RoomAcousticQT-bin\cmake-portaudio-bin\Debug bin
 copy vs2015\cmake-TAN-bin\Debug bin
 copy vs2015\cmake-TrueAudioVR-bin\Debug bin
-copy ..\..\..\thirdparty\QT5.6\msvc2015_64\bin\*.dll bin
+copy vs2015\cmake-GPUUtilities-bin\Debug bin
+copy ..\..\..\thirdparty\QT5.6\5.6.3\msvc2015_64\bin\*.dll bin
+copy ..\..\..\thirdparty\QT5.6\QT5.6.3\msvc2015_64\bin\*.dll bin
 copy ..\..\tanlibrary\src\fftw-3.3.5-dll64\libfftw3f-3.dll bin

tan/build/cmake/generate-linux-release.sh

@@ -0,0 +1,10 @@
+#/bin/sh
+
+rm -rf ./linux
+mkdir linux
+cd linux
+#cmake .. -DCMAKE_PREFIX_PATH="/opt/Qt/5.6.3/gcc_64" -DOpenCL_INCLUDE_DIR="/opt/rocm/opencl/include" -DOpenCL_LIBRARY="/opt/rocm/opencl/lib/x86_64/libOpenCL.so" -DPortAudio_INCLUDE_DIRS="../../../../../thirdparty/portaudio/include" -DPortAudio_LIBRARY="~/TAN/thirdparty/portaudio/lib/.libs/libportaudio.so"
+#cmake .. -DCMAKE_PREFIX_PATH="/opt/Qt5.6.3/5.6.3/gcc_64" -DOpenCL_INCLUDE_DIR="../../../../thirdparty/OpenCL-Headers" -DOpenCL_LIBRARY="~/amd/amdgpu-pro/lib/x86_64-linux-gnu/libOpenCL.so.1" -DPortAudio_DIR="../../../../../thirdparty/portaudio" -DDEFINE_AMD_OPENCL_EXTENSION=1
+#cmake .. -DCMAKE_PREFIX_PATH="../../../tan.thirdparty/QT5.6/5.6.3/gcc_64" -DOpenCL_INCLUDE_DIR="../../../../thirdparty/OpenCL-Headers" -DOpenCL_LIBRARY="/opt/rocm/opencl/lib/x86_64/libOpenCL.so" -DPortAudio_DIR="../../../../../thirdparty/portaudio" -DDEFINE_AMD_OPENCL_EXTENSION=1
+cmake -DCMAKE_BUILD_TYPE=Release .. -DCMAKE_PREFIX_PATH="/opt/Qt5.6.3/5.6.3/gcc_64" -DOpenCL_INCLUDE_DIR="../../../../thirdparty/OpenCL-Headers" -DOpenCL_LIBRARY="/opt/rocm/opencl/lib/x86_64/libOpenCL.so" -DPortAudio_DIR="../../../../../thirdparty/portaudio" -DDEFINE_AMD_OPENCL_EXTENSION=1
+cd ..

tan/build/cmake/generate-linux.sh

@@ -6,5 +6,5 @@ cd linux
 #cmake .. -DCMAKE_PREFIX_PATH="/opt/Qt/5.6.3/gcc_64" -DOpenCL_INCLUDE_DIR="/opt/rocm/opencl/include" -DOpenCL_LIBRARY="/opt/rocm/opencl/lib/x86_64/libOpenCL.so" -DPortAudio_INCLUDE_DIRS="../../../../../thirdparty/portaudio/include" -DPortAudio_LIBRARY="~/TAN/thirdparty/portaudio/lib/.libs/libportaudio.so"
 #cmake .. -DCMAKE_PREFIX_PATH="/opt/Qt5.6.3/5.6.3/gcc_64" -DOpenCL_INCLUDE_DIR="../../../../thirdparty/OpenCL-Headers" -DOpenCL_LIBRARY="~/amd/amdgpu-pro/lib/x86_64-linux-gnu/libOpenCL.so.1" -DPortAudio_DIR="../../../../../thirdparty/portaudio" -DDEFINE_AMD_OPENCL_EXTENSION=1
 #cmake .. -DCMAKE_PREFIX_PATH="../../../tan.thirdparty/QT5.6/5.6.3/gcc_64" -DOpenCL_INCLUDE_DIR="../../../../thirdparty/OpenCL-Headers" -DOpenCL_LIBRARY="/opt/rocm/opencl/lib/x86_64/libOpenCL.so" -DPortAudio_DIR="../../../../../thirdparty/portaudio" -DDEFINE_AMD_OPENCL_EXTENSION=1
-cmake .. -DCMAKE_PREFIX_PATH="~/TAN-CPB/tan/thirdparty/QT5.6/5.6.3/gcc_64" -DOpenCL_INCLUDE_DIR="../../../../thirdparty/OpenCL-Headers" -DOpenCL_LIBRARY="/opt/rocm/opencl/lib/x86_64/libOpenCL.so" -DPortAudio_DIR="../../../../../thirdparty/portaudio" -DDEFINE_AMD_OPENCL_EXTENSION=1
+cmake .. -DCMAKE_PREFIX_PATH="/opt/Qt5.6.3/5.6.3/gcc_64" -DOpenCL_INCLUDE_DIR="../../../../thirdparty/OpenCL-Headers" -DOpenCL_LIBRARY="/opt/rocm/opencl/lib/x86_64/libOpenCL.so" -DPortAudio_DIR="../../../../../thirdparty/portaudio" -DDEFINE_AMD_OPENCL_EXTENSION=1
 cd ..

tan/build/cmake/generate-mac-release.sh

@@ -0,0 +1,8 @@
+#/bin/sh
+
+rm -rf ./mac-gnumake
+mkdir mac-gnumake
+cd mac-gnumake
+#cmake .. -DCMAKE_PREFIX_PATH="/Applications/Qt5.6.3/5.6.3/clang_64" -DOpenCL_INCLUDE_DIR="../../../../thirdparty/OpenCL-Headers" -DOpenCL_LIBRARY="/System/Library/Frameworks/OpenCL.framework" -DPortAudio_DIR="../../../../../thirdparty/portaudio" -DDEFINE_AMD_OPENCL_EXTENSION=1
+cmake -DCMAKE_BUILD_TYPE=Release .. -DCMAKE_PREFIX_PATH="/Applications/Qt5.6.3/5.6.3/clang_64" -DOpenCL_INCLUDE_DIR="../../../../thirdparty/OpenCL-Headers" -DPortAudio_DIR="../../../../../thirdparty/portaudio" -DDEFINE_AMD_OPENCL_EXTENSION=1
+cd ..

tan/build/cmake/generate-mac.sh

@@ -4,5 +4,5 @@ rm -rf ./mac-gnumake
 mkdir mac-gnumake
 cd mac-gnumake
 #cmake .. -DCMAKE_PREFIX_PATH="/Applications/Qt5.6.3/5.6.3/clang_64" -DOpenCL_INCLUDE_DIR="../../../../thirdparty/OpenCL-Headers" -DOpenCL_LIBRARY="/System/Library/Frameworks/OpenCL.framework" -DPortAudio_DIR="../../../../../thirdparty/portaudio" -DDEFINE_AMD_OPENCL_EXTENSION=1
-cmake .. -DCMAKE_PREFIX_PATH="/Applications/Qt5.6.3/5.6.3/clang_64" -DOpenCL_INCLUDE_DIR="../../../../thirdparty/OpenCL-Headers" -DPortAudio_DIR="../../../../../thirdparty/portaudio" -DDEFINE_AMD_OPENCL_EXTENSION=1
+cmake .. -DCMAKE_PREFIX_PATH="/Applications/Qt5.6.3/5.6.3/clang_64" -DOpenCL_INCLUDE_DIR="../../../../thirdparty/OpenCL-Headers" -DPortAudio_DIR="../../../../../thirdparty/portaudio" -DDEFINE_AMD_OPENCL_EXTENSION=1 -DAMF_HOME="../../../../../amfOpen/amf" -DAMF_CORE_STATIC=1
 cd ..

tan/build/cmake/generate-vs2015.bat

@@ -4,5 +4,5 @@ RMDIR /S /Q vs2015
 MKDIR vs2015
 CD vs2015
 
-SET CMAKE_PREFIX_PATH=..\..\..\tan\thirdparty\QT5.6\5.6.3\msvc2015_64  
-cmake .. -G "Visual Studio 14 2015" -A x64 -DOpenCL_INCLUDE_DIR=..\..\..\tan\thirdparty\OpenCL-Headers -DPortAudio_DIR=..\..\..\tan\thirdparty\portaudio -DDEFINE_AMD_OPENCL_EXTENSION=1
+SET CMAKE_PREFIX_PATH=..\..\..\..\thirdparty\Qt\Qt5.9.9\5.9.9\msvc2017_64\lib\cmake\Qt5Widgets
+cmake .. -G "Visual Studio 14 2015" -A x64 -DOpenCL_INCLUDE_DIR=..\..\..\..\thirdparty\OpenCL-Headers -DPortAudio_DIR=..\..\..\..\..\thirdparty\portaudio -DIPP_DIR="C:\Program Files (x86)\IntelSWTools\compilers_and_libraries_2020.0.166\windows\ipp" -DDEFINE_AMD_OPENCL_EXTENSION=1

tan/build/cmake/generate-vs2017-release.bat

@@ -0,0 +1,8 @@
+SETLOCAL
+
+RMDIR /S /Q vs2017
+MKDIR vs2017
+CD vs2017
+
+SET CMAKE_PREFIX_PATH=..\..\..\..\thirdparty\Qt\Qt5.9.9\5.9.9\msvc2017_64\lib\cmake\Qt5Widgets
+cmake -DCMAKE_BUILD_TYPE=Release .. -G "Visual Studio 15 2017" -A x64 -DOpenCL_INCLUDE_DIR=..\..\..\..\thirdparty\OpenCL-Headers -DPortAudio_DIR=..\..\..\..\..\thirdparty\portaudio -DIPP_DIR="C:\Program Files (x86)\IntelSWTools\compilers_and_libraries_2020.0.166\windows\ipp" -DDEFINE_AMD_OPENCL_EXTENSION=1

tan/build/cmake/generate-vs2017.bat

@@ -4,5 +4,5 @@ RMDIR /S /Q vs2017
 MKDIR vs2017
 CD vs2017
 
-SET CMAKE_PREFIX_PATH=c:\Qt\Qt5.6.3\5.6.3\msvc2015_64
-cmake .. -G "Visual Studio 15 2017" -A x64 -DOpenCL_INCLUDE_DIR="C:\Program Files (x86)\OCL_SDK_Light\include" -DOpenCL_LIBRARY="C:\Program Files (x86)\OCL_SDK_Light\lib\x86_64\OpenCL.lib" -DPortAudio_DIR="../../../../../thirdparty/portaudio"
+SET CMAKE_PREFIX_PATH=..\..\..\..\thirdparty\Qt\Qt5.9.9\5.9.9\msvc2017_64\lib\cmake\Qt5Widgets
+cmake .. -G "Visual Studio 15 2017" -A x64 -DOpenCL_INCLUDE_DIR=..\..\..\..\thirdparty\OpenCL-Headers -DPortAudio_DIR=..\..\..\..\..\thirdparty\portaudio -DIPP_DIR="C:\Program Files (x86)\IntelSWTools\compilers_and_libraries_2020.0.166\windows\ipp" -DDEFINE_AMD_OPENCL_EXTENSION=1