Update dependencies

- ISPC v1.25.2 (new minimum required version)
- oneTBB v2022.0.0
- Dear ImGui v1.91.4

Author: johguenther

CHANGELOG.md

@@ -17,6 +17,9 @@ Version History
     improving compatibility with glTF `KHR_materials_specular`
 -   Improvements to and documentation of the pathtracer's Shadow Catcher
     feature (enabled via parameter `shadowCatcherPlane`)
+-   The new minimum versions of dependencies:
+    -    ISPCRT v1.25.2 (uses IEEE 754 compliant instructions on ARM for
+         min/max)
 
 ### Changes in v3.2.0:
 

README.md

@@ -81,7 +81,7 @@ before you can build OSPRay you need the following prerequisites:
   Linux development tools.
 
 - Additionally you require a copy of the [Intel® Implicit SPMD Program
-  Compiler (ISPC)](http://ispc.github.io), version 1.23.0 or later.
+  Compiler (ISPC)](http://ispc.github.io), version 1.25.2 or later.
   Please obtain a release of ISPC from the [ISPC downloads
   page](https://ispc.github.io/downloads.html). If ISPC is not found by
   CMake its location can be hinted with the variable `ISPC_EXECUTABLE`.

apps/common/external/imgui/imgui.patch

@@ -1,22 +1,21 @@
 --- a/imconfig.h
 +++ b/imconfig.h
-@@ -21,20 +21,29 @@
- 
- //---- Define attributes of all API symbols declarations, e.g. for DLL under Windows
+@@ -23,19 +23,25 @@
  // Using Dear ImGui via a shared library is not recommended, because of function call overhead and because we don't guarantee backward nor forward ABI compatibility.
+ // - Windows DLL users: heaps and globals are not shared across DLL boundaries! You will need to call SetCurrentContext() + SetAllocatorFunctions()
+ //   for each static/DLL boundary you are calling from. Read "Context and Memory Allocators" section of imgui.cpp for more details.
+-//#define IMGUI_API __declspec(dllexport)                   // MSVC Windows: DLL export
+-//#define IMGUI_API __declspec(dllimport)                   // MSVC Windows: DLL import
+-//#define IMGUI_API __attribute__((visibility("default")))  // GCC/Clang: override visibility when set is hidden
 +#ifdef _WIN32
 +#  ifdef ospray_imgui_EXPORTS
 +#    define IMGUI_API __declspec(dllexport)
 +#  else
 +#    define IMGUI_API __declspec(dllimport)
 +#  endif
 +#else
-+#  define IMGUI_API
++#  define IMGUI_API __attribute__((visibility("default")))
 +#endif
- // DLL users: heaps and globals are not shared across DLL boundaries! You will need to call SetCurrentContext() + SetAllocatorFunctions()
- // for each static/DLL boundary you are calling from. Read "Context and Memory Allocators" section of imgui.cpp for more details.
- //#define IMGUI_API __declspec( dllexport )
- //#define IMGUI_API __declspec( dllimport )
 
  //---- Don't define obsolete functions/enums/behaviors. Consider enabling from time to time after updating to clean your code of obsolete function/names.
 -//#define IMGUI_DISABLE_OBSOLETE_FUNCTIONS
@@ -33,8 +32,12 @@
 
  //---- Don't implement some functions to reduce linkage requirements.
  //#define IMGUI_DISABLE_WIN32_DEFAULT_CLIPBOARD_FUNCTIONS   // [Win32] Don't implement default clipboard handler. Won't use and link with OpenClipboard/GetClipboardData/CloseClipboard etc. (user32.lib/.a, kernel32.lib/.a)
-@@ -44,7 +53,7 @@
+@@ -43,10 +49,10 @@
+ //#define IMGUI_DISABLE_WIN32_DEFAULT_IME_FUNCTIONS         // [Win32] [Default with non-Visual Studio compilers] Don't implement default IME handler (won't require imm32.lib/.a)
+ //#define IMGUI_DISABLE_WIN32_FUNCTIONS                     // [Win32] Won't use and link with any Win32 function (clipboard, IME).
  //#define IMGUI_ENABLE_OSX_DEFAULT_CLIPBOARD_FUNCTIONS      // [OSX] Implement default OSX clipboard handler (need to link with '-framework ApplicationServices', this is why this is not the default).
+-//#define IMGUI_DISABLE_DEFAULT_SHELL_FUNCTIONS             // Don't implement default platform_io.Platform_OpenInShellFn() handler (Win32: ShellExecute(), require shell32.lib/.a, Mac/Linux: use system("")).
++#define IMGUI_DISABLE_DEFAULT_SHELL_FUNCTIONS             // Don't implement default platform_io.Platform_OpenInShellFn() handler (Win32: ShellExecute(), require shell32.lib/.a, Mac/Linux: use system("")).
  //#define IMGUI_DISABLE_DEFAULT_FORMAT_FUNCTIONS            // Don't implement ImFormatString/ImFormatStringV so you can implement them yourself (e.g. if you don't want to link with vsnprintf)
  //#define IMGUI_DISABLE_DEFAULT_MATH_FUNCTIONS              // Don't implement ImFabs/ImSqrt/ImPow/ImFmod/ImCos/ImSin/ImAcos/ImAtan2 so you can implement them yourself.
 -//#define IMGUI_DISABLE_FILE_FUNCTIONS                      // Don't implement ImFileOpen/ImFileClose/ImFileRead/ImFileWrite and ImFileHandle at all (replace them with dummies)

cmake/ospray_options.cmake

@@ -11,12 +11,12 @@ include(CMakeDependentOption)
 set(OSPRAY_CMAKECONFIG_DIR
     "${CMAKE_INSTALL_LIBDIR}/cmake/ospray-${OSPRAY_VERSION}")
 
-set(ISPC_VERSION_REQUIRED 1.23.0)
+set(ISPC_VERSION_REQUIRED 1.25.2)
 set(RKCOMMON_VERSION_REQUIRED 1.14.2)
 set(EMBREE_VERSION_REQUIRED 4.3.3)
 set(OPENVKL_VERSION_REQUIRED 2.0.1)
 set(OIDN_VERSION_REQUIRED 2.3.0)
-set(OSPRAY_IMGUI_GIT_TAG cb16be3a3fc1f9cd146ae24d52b615f8a05fa93d) # v1.90.9
+set(OSPRAY_IMGUI_GIT_TAG 99109c0b3b052cffa154a9295440f68868a39f74) # v1.91.4
 set(OSPRAY_STB_GIT_TAG 013ac3beddff3dbffafd5177e7972067cd2b5083) # v2.30 / v1.16
 
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR})

doc/prerequisites.md

@@ -21,7 +21,7 @@ before you can build OSPRay you need the following prerequisites:
     (icc)](https://software.intel.com/en-us/c-compilers)), and standard
     Linux development tools.
 -   Additionally you require a copy of the [Intel® Implicit SPMD Program
-    Compiler (ISPC)](http://ispc.github.io), version 1.23.0 or later.
+    Compiler (ISPC)](http://ispc.github.io), version 1.25.2 or later.
     Please obtain a release of ISPC from the [ISPC downloads
     page](https://ispc.github.io/downloads.html).
     If ISPC is not found by CMake its location can be hinted with the

scripts/superbuild/CMakeLists.txt

@@ -87,22 +87,22 @@ endif()
 
 option(DOWNLOAD_ISPC "Download ISPC or use the one found in the system environment?" ON)
 if (DOWNLOAD_ISPC)
-  set(ISPC_VERSION "1.24.0" CACHE STRING "Which version of ISPC to download?")
+  set(ISPC_VERSION "1.25.2" CACHE STRING "Which version of ISPC to download?")
   mark_as_advanced(CLEAR ISPC_VERSION)
-  if (ISPC_VERSION STREQUAL "1.24.0")
+  if (ISPC_VERSION STREQUAL "1.25.2")
     if (APPLE)
       if (${CMAKE_SYSTEM_PROCESSOR} MATCHES "arm64|aarch64")
-        set(ISPC_HASH "7f3891d0157aed3cab159fbc5235235b62797053db9387f5a61c8d0a22369ae0")
+        set(ISPC_HASH "1803f7f58c6c68f2dece679850b3e22ec0571dde3d428096dd292c302a6f3241")
       else()
-        set(ISPC_HASH "986eb172fe9db3e8da560e9d0d788832991638fab61ca80587d87eb175ffb520")
+        set(ISPC_HASH "aa4d65a76c86d5fe34b3f7fab1f54b0c69e6e37cb6918e12e6bafa437ac05896")
       endif()
     elseif (WIN32)
-      set(ISPC_HASH "a7c21cb2434f5364acbdf0933af6de49198458ed6f0b62012e03c3325c972649")
+      set(ISPC_HASH "0a989eb0cbaccff3162b118c20ac74eda0381731dc8a59a8a967533e81b24928")
     else()
       if (${CMAKE_SYSTEM_PROCESSOR} MATCHES "arm64|aarch64")
-        set(ISPC_HASH "890ad5f31581091bf4ae9f235a7bb6fd9cabcbd6cf1670104ad61f1ad2da4c76")
+        set(ISPC_HASH "0ffd2356cfe12ca66c3906fbb2b334fb1fbbc462b405c09c52fd821739543d06")
       else()
-        set(ISPC_HASH "79885d4482356dba7c01da312b6449fd575b097845ebcb90344dac5c178b43f5")
+        set(ISPC_HASH "760b5c200aaf313884c2be4491ef7834ae546cdbda37978ce768abaa4e26a420")
       endif()
     endif()
   endif()
@@ -117,20 +117,20 @@ endif()
 
 option(DOWNLOAD_TBB "Download TBB or use the one found in the system environment?" ON)
 if (DOWNLOAD_TBB)
-  set(TBB_VERSION "2021.13.0" CACHE STRING "Which version of TBB to download?")
+  set(TBB_VERSION "2022.0.0" CACHE STRING "Which version of TBB to download?")
   mark_as_advanced(CLEAR TBB_VERSION)
   option(BUILD_TBB_FROM_SOURCE "Build TBB from source or use pre-built version?" OFF)
   mark_as_advanced(CLEAR BUILD_TBB_FROM_SOURCE)
-  if (TBB_VERSION STREQUAL "2021.13.0")
+  if (TBB_VERSION STREQUAL "2022.0.0")
     if (BUILD_TBB_FROM_SOURCE)
-      set(TBB_HASH "3ad5dd08954b39d113dc5b3f8a8dc6dc1fd5250032b7c491eb07aed5c94133e1")
+      set(TBB_HASH "e8e89c9c345415b17b30a2db3095ba9d47647611662073f7fbf54ad48b7f3c2a")
     else()
       if (APPLE)
-        set(TBB_HASH "e9aa143de91f65ea15b62ceeba5845bbc914c882d32bf9c9a405e6b8b5a70ade")
+        set(TBB_HASH "9d0280d9c4ef71f0fe0985c298c20c105757e1bccedcf6676cba5d92877cfe0c")
       elseif (WIN32)
-        set(TBB_HASH "0a7b19b52ec9d8eaa10cbbe396e955130815489c544642acecda8ef8d2d7f64d")
+        set(TBB_HASH "660f3555de26bee8cd4daef1105d5d9e93e695b2fcfa9c57db3aa38c6afe5675")
       else()
-        set(TBB_HASH "f5c9304710051f0193a07fb91b6d6ada5a3e0a6d623951ee176b1897816ecf4c")
+        set(TBB_HASH "1b669eb357dd90f3135f27e3c9a78683c6ecc74edf2799f7cb7df92a5423cb76")
       endif()
     endif()
   endif()

scripts/tests/run_tests.sh

@@ -55,14 +55,6 @@ export CMAKE_BUILD_PARALLEL_LEVEL=32
 cmake --build . --target ospray_test_data
 let exitCode+=$?
 
-### Excluded tests
-##################
-# due to IEEE 754 uncompliant NaN handling on ARM NEON,
-# see https://github.com/ispc/ispc/issues/3048
-if [[ `uname -m` =~ arm|aarch ]] ; then
-  test_filters="TestShadowCatcher/ShadowCatcher.multipleLights/0"
-fi
-
 export OIDN_VERBOSE=2
 
 if [ $TEST_CPU ]; then