Filament v1.56.1

Signed-off-by: Joel Winarske <[email protected]>

configs/_filament.json

@@ -58,11 +58,11 @@
                 "cwd": "${FILAMENT_SRC_DIR}",
                 "cmds": [
                     "git reset --hard",
-                    "git apply ${PATCH_FOLDER}/filament/0001-error-ignoring-return-value-of-function-declared-wit.patch",
-                    "git apply ${PATCH_FOLDER}/filament/0002-disable-backend-tests.patch",
-                    "git apply ${PATCH_FOLDER}/filament/0003-install-required-files.patch",
-                    "git apply ${PATCH_FOLDER}/filament/0004-move-include-contents-to-include-filament.patch",
-                    "git apply ${PATCH_FOLDER}/filament/0005-move-libraries-so-they-install.patch"
+                    "git apply ${PATCH_FOLDER}/filament/0001-disable-backend-tests.patch",
+                    "git apply ${PATCH_FOLDER}/filament/0002-install-required-files.patch",
+                    "git apply ${PATCH_FOLDER}/filament/0003-move-include-contents-to-include-filament.patch",
+                    "git apply ${PATCH_FOLDER}/filament/0004-move-libraries-so-they-install.patch",
+                    "git apply ${PATCH_FOLDER}/filament/0005-return-shader-type-mobile-for-linux-vulkan.patch"
                 ]
             },
             {

configs/_repos.json

@@ -26,14 +26,15 @@
     {
         "uri": "https://github.com/google/filament.git",
         "branch": "release",
-        "rev": "v1.54.3"
+        "rev": "v1.56.1"
     },
     {
         "uri": "https://git.libcamera.org/libcamera/libcamera.git",
         "branch": "master"
     },
     {
         "uri": "https://github.com/firebase/firebase-cpp-sdk.git",
+        "branch": "main",
         "rev": "v12.4.0"
     },
     {

patches/filament/0002-disable-backend-tests.patch → patches/filament/0001-disable-backend-tests.patch

@@ -1,18 +1,18 @@
-From 6a920a7612cfea25bbea78600b16e3075a30a8f7 Mon Sep 17 00:00:00 2001
+From 2349c54c7f6bcff4b18c6257196cf06b27fb7be8 Mon Sep 17 00:00:00 2001
 From: Joel Winarske <[email protected]>
-Date: Wed, 12 Jun 2024 06:41:19 -0700
-Subject: [PATCH 2/5] disable backend tests
+Date: Fri, 22 Nov 2024 17:01:44 -0800
+Subject: [PATCH 1/4] disable backend tests
 
 Signed-off-by: Joel Winarske <[email protected]>
 ---
- filament/backend/CMakeLists.txt | 113 --------------------------------
- 1 file changed, 113 deletions(-)
+ filament/backend/CMakeLists.txt | 133 --------------------------------
+ 1 file changed, 133 deletions(-)
 
 diff --git a/filament/backend/CMakeLists.txt b/filament/backend/CMakeLists.txt
-index 6a7f66cc2..378f45aed 100644
+index 0a07c8283..66f7b275e 100644
 --- a/filament/backend/CMakeLists.txt
 +++ b/filament/backend/CMakeLists.txt
-@@ -400,116 +400,3 @@ set(INSTALL_TYPE ARCHIVE)
+@@ -428,136 +428,3 @@ set(INSTALL_TYPE ARCHIVE)
  install(TARGETS ${TARGET} ${INSTALL_TYPE} DESTINATION lib/${DIST_DIR})
  install(TARGETS vkshaders ${INSTALL_TYPE} DESTINATION lib/${DIST_DIR})
  install(DIRECTORY ${PUBLIC_HDR_DIR}/backend DESTINATION include)
@@ -40,6 +40,7 @@ index 6a7f66cc2..378f45aed 100644
 -        test/test_StencilBuffer.cpp
 -        test/test_Scissor.cpp
 -        test/test_MipLevels.cpp
+-        test/test_Handles.cpp
 -    )
 -    set(BACKEND_TEST_LIBS
 -        backend
@@ -111,24 +112,43 @@ index 6a7f66cc2..378f45aed 100644
 -
 -# ==================================================================================================
 -# Compute tests
+-#
+-#if (NOT IOS AND NOT WEBGL)
+-#
+-#add_executable(compute_test
+-#        test/ComputeTest.cpp
+-#        test/Arguments.cpp
+-#        test/test_ComputeBasic.cpp
+-#        )
+-#
+-#target_link_libraries(compute_test PRIVATE
+-#        backend
+-#        getopt
+-#        gtest
+-#        )
+-#
+-#set_target_properties(compute_test PROPERTIES FOLDER Tests)
+-#
+-#endif()
 -
--if (NOT IOS AND NOT WEBGL)
+-# ==================================================================================================
+-# Metal utils tests
 -
--add_executable(compute_test
--        test/ComputeTest.cpp
--        test/Arguments.cpp
--        test/test_ComputeBasic.cpp
--        )
+-if (APPLE AND NOT IOS)
+-
+-add_executable(metal_utils_test test/MetalTest.mm)
+-
+-target_compile_options(metal_utils_test PRIVATE "-fobjc-arc")
 -
--target_link_libraries(compute_test PRIVATE
+-target_link_libraries(metal_utils_test PRIVATE
 -        backend
 -        getopt
 -        gtest
 -        )
 -
--set_target_properties(compute_test PROPERTIES FOLDER Tests)
+-set_target_properties(metal_utils_test PROPERTIES FOLDER Tests)
 -
 -endif()
 -- 
-2.45.1
+2.25.1
 

patches/filament/0003-install-required-files.patch → patches/filament/0002-install-required-files.patch

@@ -1,40 +1,31 @@
-From cc923cd0b88c587f0559fe2d6a830f3781154a69 Mon Sep 17 00:00:00 2001
+From d01a9fbeaee27ee800311c5dee7a54bba65dd69a Mon Sep 17 00:00:00 2001
 From: Joel Winarske <[email protected]>
-Date: Wed, 12 Jun 2024 06:43:06 -0700
-Subject: [PATCH 3/5] install required files
+Date: Fri, 22 Nov 2024 17:06:12 -0800
+Subject: [PATCH 2/4] install required files
 
 Signed-off-by: Joel Winarske <[email protected]>
 ---
- libs/imageio/CMakeLists.txt            | 10 ++++++++--
- third_party/libpng/tnt/CMakeLists.txt  |  2 ++
- third_party/stb/tnt/CMakeLists.txt     |  1 +
- third_party/tinyexr/tnt/CMakeLists.txt |  5 ++++-
- 4 files changed, 15 insertions(+), 3 deletions(-)
+ libs/imageio/CMakeLists.txt            | 6 ++++++
+ third_party/libpng/tnt/CMakeLists.txt  | 2 ++
+ third_party/stb/tnt/CMakeLists.txt     | 1 +
+ third_party/tinyexr/tnt/CMakeLists.txt | 8 +++++++-
+ 4 files changed, 16 insertions(+), 1 deletion(-)
 
 diff --git a/libs/imageio/CMakeLists.txt b/libs/imageio/CMakeLists.txt
-index 47544655b..69dc695c4 100644
+index 47544655b..9eb92fc7a 100644
 --- a/libs/imageio/CMakeLists.txt
 +++ b/libs/imageio/CMakeLists.txt
-@@ -36,11 +36,17 @@ set_target_properties(${TARGET} PROPERTIES FOLDER Libs)
- target_link_libraries(${TARGET} PUBLIC image math png tinyexr utils z basis_encoder)
- if (WIN32)
-     target_link_libraries(${TARGET} PRIVATE wsock32)
--endif()
-+endif ()
-
- # ==================================================================================================
- # Compiler flags
- # ==================================================================================================
+@@ -44,3 +44,9 @@ endif()
  if (NOT MSVC)
      target_compile_options(${TARGET} PRIVATE -Wno-deprecated-register)
--endif()
-+endif ()
+ endif()
 +
 +# ==================================================================================================
 +# Installation
 +# ==================================================================================================
 +install(TARGETS ${TARGET} ARCHIVE DESTINATION lib/${DIST_DIR})
 +install(DIRECTORY ${PUBLIC_HDR_DIR}/imageio DESTINATION include)
+\ No newline at end of file
 diff --git a/third_party/libpng/tnt/CMakeLists.txt b/third_party/libpng/tnt/CMakeLists.txt
 index cd5a033f5..4925a0474 100644
 --- a/third_party/libpng/tnt/CMakeLists.txt
@@ -46,28 +37,33 @@ index cd5a033f5..4925a0474 100644
 +
 +install(TARGETS ${TARGET} ARCHIVE DESTINATION lib/${DIST_DIR})
 diff --git a/third_party/stb/tnt/CMakeLists.txt b/third_party/stb/tnt/CMakeLists.txt
-index 0c25061c0..563a2604d 100644
+index 0c25061c0..293dd486f 100644
 --- a/third_party/stb/tnt/CMakeLists.txt
 +++ b/third_party/stb/tnt/CMakeLists.txt
 @@ -15,3 +15,4 @@ target_include_directories(${TARGET} PUBLIC ${PUBLIC_HDR_DIR})
  set_target_properties(${TARGET} PROPERTIES FOLDER ThirdParty)
 
  install(TARGETS stb ARCHIVE DESTINATION lib/${DIST_DIR})
 +install(FILES ${PUBLIC_HDRS} DESTINATION include)
+\ No newline at end of file
 diff --git a/third_party/tinyexr/tnt/CMakeLists.txt b/third_party/tinyexr/tnt/CMakeLists.txt
-index 20955b77b..ffe7cdfe1 100644
+index 20955b77b..1e2602d0d 100644
 --- a/third_party/tinyexr/tnt/CMakeLists.txt
 +++ b/third_party/tinyexr/tnt/CMakeLists.txt
-@@ -20,4 +20,7 @@ include_directories(${PUBLIC_HDR_DIR})
+@@ -20,4 +20,10 @@ include_directories(${PUBLIC_HDR_DIR})
  add_library(${TARGET} STATIC ${PUBLIC_HDRS} ${SRCS})
  target_include_directories (${TARGET} PUBLIC ${PUBLIC_HDR_DIR})
  target_link_libraries(${TARGET} LINK_PUBLIC z)
 -set_target_properties(${TARGET} PROPERTIES FOLDER ThirdParty)
 \ No newline at end of file
 +set_target_properties(${TARGET} PROPERTIES FOLDER ThirdParty)
 +
++# ==================================================================================================
++# Install
++# ==================================================================================================
 +install(FILES ${PUBLIC_HDRS} DESTINATION include)
 +install(TARGETS ${TARGET} ARCHIVE DESTINATION lib/${DIST_DIR})
+\ No newline at end of file
 -- 
-2.45.1
+2.25.1