Upgrade To Latest Filament

3rdparty/filament/filament_build.cmake

@@ -15,18 +15,19 @@ endif()
 set(filament_LIBRARIES
     filameshio
     filament
-    filamat_lite
-    filamat
     filaflat
     filabridge
     geometry
     backend
     bluegl
+    bluevk
     ibl
     image
+    ktxreader
     meshoptimizer
     smol-v
     utils
+    vkshaders
 )
 
 # Locate byproducts
@@ -52,8 +53,8 @@ endif()
 ExternalProject_Add(
     ext_filament
     PREFIX filament
-    URL https://github.com/isl-org/filament/archive/d1d873d27f43ba0cee1674a555cc0f18daac3008.tar.gz
-    URL_HASH SHA256=00c3f41af0fcfb2df904e1f77934f2678d943ddac5eb889788a5e22590e497bd
+    URL https://github.com/google/filament/archive/refs/tags/v1.49.1.tar.gz
+     URL_HASH SHA256=f092aeb1d24d9d84a3cc2327fc3359a5e2893d16e7ac55aab9a56aaae64e121f
     DOWNLOAD_DIR "${OPEN3D_THIRD_PARTY_DOWNLOAD_DIR}/filament"
     UPDATE_COMMAND ""
     CMAKE_ARGS
@@ -69,7 +70,7 @@ ExternalProject_Add(
         -DCMAKE_INSTALL_PREFIX=${FILAMENT_ROOT}
         -DUSE_STATIC_CRT=${STATIC_WINDOWS_RUNTIME}
         -DUSE_STATIC_LIBCXX=ON
-        -DFILAMENT_SUPPORTS_VULKAN=OFF
+        -DFILAMENT_SKIP_SDL2=ON
         -DFILAMENT_SKIP_SAMPLES=ON
         -DFILAMENT_OPENGL_HANDLE_ARENA_SIZE_IN_MB=20 # to support many small entities
         -DSPIRV_WERROR=OFF

3rdparty/filament/filament_download.cmake

@@ -1,6 +1,6 @@
 include(FetchContent)
 
-set(filament_LIBRARIES filameshio filament filamat_lite filaflat filabridge geometry backend bluegl bluevk ibl image meshoptimizer smol-v utils vkshaders)
+set(filament_LIBRARIES filameshio filament filaflat filabridge geometry backend bluegl bluevk ibl image ktxreader meshoptimizer smol-v utils vkshaders)
 
 if (FILAMENT_PRECOMPILED_ROOT)
     if (EXISTS "${FILAMENT_PRECOMPILED_ROOT}")
@@ -13,51 +13,38 @@ else()
     set(lib_dir lib)
     # Setup download links
     if(WIN32)
-        set(FILAMENT_URL https://github.com/google/filament/releases/download/v1.9.9/filament-v1.9.9-windows.tgz)
-        set(FILAMENT_SHA256 3a937a54a0c6b693c833737878761f8ba8ee02744be3c2f9ec33b1c6399ba31b)
-        # Required for filament v1.9.9
-        # Older versions of filament do not contain vkshaders.
-        # They also have a different directory structure.
-        # Remove vkshaders here so we can use newer versions with FILAMENT_PRECOMPILED_ROOT.
-        list(REMOVE_ITEM filament_LIBRARIES vkshaders)
+        set(FILAMENT_URL https://github.com/google/filament/releases/download/v1.49.1/filament-v1.49.1-windows.tgz)
+        set(FILAMENT_SHA256 afbd43c106f14065c6672923e51a6bfd7ea0d87d404df62b4b6c29c81d078d2d)
         if (STATIC_WINDOWS_RUNTIME)
             string(APPEND lib_dir /x86_64/mt)
         else()
             string(APPEND lib_dir /x86_64/md)
         endif()
     elseif(APPLE)
-        if (APPLE_AARCH64)
-            set(FILAMENT_URL https://github.com/isl-org/open3d_downloads/releases/download/filament/filament-v1.9.19-macos_arm64.tgz)
-            set(FILAMENT_SHA256 3422bdff451d90144fbb69e625d8dcaeaf3222dc2c28879536067937955bc362)
-            string(APPEND lib_dir /arm64)
-            # Our arm64 builds use FILAMENT_SUPPORTS_VULKAN=OFF
-            list(REMOVE_ITEM filament_LIBRARIES bluevk)
-        else()
-            set(FILAMENT_URL https://github.com/google/filament/releases/download/v1.9.19/filament-v1.9.19-mac.tgz)
-            set(FILAMENT_SHA256 2765d0ce60647fc17d1880c4618cf7d6b5343d8be4dad87978c3917d9c723b4e)
-            string(APPEND lib_dir /x86_64)
-        endif()
+        set(FILAMENT_URL https://github.com/google/filament/releases/download/v1.49.1/filament-v1.49.1-mac.tgz)
+        set(FILAMENT_SHA256 e7d02060d264f40b365251bebf6a4f4ed5602182cdae429b28ab419277ebc5e7)
     else()      # Linux: Check glibc version and use open3d filament binary if new (Ubuntu 20.04 and similar)
         execute_process(COMMAND ldd --version OUTPUT_VARIABLE ldd_version)
         string(REGEX MATCH "([0-9]+\.)+[0-9]+" glibc_version ${ldd_version})
-        if(${glibc_version} VERSION_LESS "2.31")
+        if(${glibc_version} VERSION_LESS "2.33")
             set(FILAMENT_URL
-                https://github.com/isl-org/open3d_downloads/releases/download/filament/filament-v1.9.19-linux.tgz)
-            set(FILAMENT_SHA256 f0c0b05a543dd0c82b1cd571957a90f28e72cfeee36d19a527c17ac9de4733d5)
+                https://github.com/isl-org/open3d_downloads/releases/download/filament/filament-v1.49.1-ubuntu20.04.tgz)
+            set(FILAMENT_SHA256 f4ba020f0ca63540e2f86b36d1728a1ea063ddd5eb55b0ba6fc621ee815a60a7)
             message(STATUS "GLIBC version ${glibc_version} found: Using "
-                "Google Filament binary.")
+                "Open3D built Filament binary for Ubuntu 20.04.")
         else()
             set(FILAMENT_URL
-                https://github.com/isl-org/open3d_downloads/releases/download/filament/filament-v1.9.19-linux-20.04.tgz)
-            set(FILAMENT_SHA256 c756fd76f5c6a40ca554f8c3cca424354a2a22ea6fce3c8ea893d4c4aa39514c)
+                https://github.com/google/filament/releases/download/v1.49.1/filament-v1.49.1-linux.tgz)
+            set(FILAMENT_SHA256 ddd086310d1ee650831e21f6a11f489cb385826fbeea446e7803bec8d6e7442b)
             message(STATUS "GLIBC version ${glibc_version} found: Using "
-                "Open3D Filament binary.")
+                "Google Filament binary.")
         endif()
     endif()
 
     set(lib_byproducts ${filament_LIBRARIES})
     list(TRANSFORM lib_byproducts PREPEND <SOURCE_DIR>/${lib_dir}/${CMAKE_STATIC_LIBRARY_PREFIX})
     list(TRANSFORM lib_byproducts APPEND ${CMAKE_STATIC_LIBRARY_SUFFIX})
+    message(STATUS "Filament byproducts: ${lib_byproducts}")
 
     if(WIN32)
         set(lib_byproducts_debug ${filament_LIBRARIES})
@@ -81,6 +68,7 @@ else()
         BUILD_BYPRODUCTS ${lib_byproducts}
     )
     ExternalProject_Get_Property(ext_filament SOURCE_DIR)
+    message(STATUS "Filament source dir is ${SOURCE_DIR}")
     set(FILAMENT_ROOT ${SOURCE_DIR})
 endif()
 

3rdparty/find_dependencies.cmake

@@ -682,14 +682,15 @@ if(USE_SYSTEM_GLFW)
     endif()
 endif()
 if(NOT USE_SYSTEM_GLFW)
-    message(STATUS "Building library 3rdparty_glfw from source")
-    add_subdirectory(${Open3D_3RDPARTY_DIR}/glfw)
+    include(${Open3D_3RDPARTY_DIR}/glfw/glfw.cmake)
     open3d_import_3rdparty_library(3rdparty_glfw
         HEADER
-        INCLUDE_DIRS ${Open3D_3RDPARTY_DIR}/glfw/include/
-        LIBRARIES    glfw3
-        DEPENDS      glfw
+        INCLUDE_DIRS ${GLFW_INCLUDE_DIRS}
+        LIB_DIR      ${GLFW_LIB_DIR}
+        LIBRARIES    ${GLFW_LIBRARIES}
+        DEPENDS      ext_glfw
     )
+
     target_link_libraries(3rdparty_glfw INTERFACE Open3D::3rdparty_threads)
     if(UNIX AND NOT APPLE)
         find_library(RT_LIBRARY rt)
@@ -720,8 +721,9 @@ if(NOT USE_SYSTEM_GLFW)
         target_link_libraries(3rdparty_glfw INTERFACE gdi32)
     endif()
     list(APPEND Open3D_3RDPARTY_HEADER_TARGETS_FROM_CUSTOM Open3D::3rdparty_glfw)
+    list(APPEND Open3D_3RDPARTY_PRIVATE_TARGETS_FROM_CUSTOM Open3D::3rdparty_glfw)
 else()
-    list(APPEND Open3D_3RDPARTY_HEADER_TARGETS_FROM_SYSTEM Open3D::3rdparty_glfw)
+    list(APPEND Open3D_3RDPARTY_PRIVATE_TARGETS_FROM_SYSTEM Open3D::3rdparty_glfw)
 endif()
 if(TARGET Open3D::3rdparty_x11)
     target_link_libraries(3rdparty_glfw INTERFACE Open3D::3rdparty_x11)
@@ -1310,6 +1312,7 @@ if(BUILD_GUI)
                 endif()
             endif()
         endif()
+        set(FILAMENT_RUNTIME_VER x86_64)
         if (APPLE)
             if (APPLE_AARCH64)
                 set(FILAMENT_RUNTIME_VER arm64)