Rollback filament dependency updates and patches.

PiperOrigin-RevId: 952196997
Change-Id: I0c4284823bb642e847bc73d4732bcce6a72455c8

cmake/filament-allow-clang-windows.patch

@@ -1,20 +1,7 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
+index e5475ef5..4eb8a68b 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -11,12 +11,7 @@ cmake_minimum_required(VERSION 3.22.1)
- # Unsupported environment
- # ==================================================================================================
- 
--# Filament does not support MSYS2-based environment on Windows. See issue #9968.
--if(DEFINED ENV{MSYSTEM})
--    message(FATAL_ERROR
--        "MSYS2 Subsystem detected($ENV{MSYSTEM}). "
--        "Filament does not support MSYS2-based environment on Windows.")
--endif()
-+
- 
- # ==================================================================================================
- # Toolchain configuration
 @@ -247,57 +247,59 @@ if (WIN32)
      # __declspec(dllexport) in front of each functions).
      set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
@@ -505,32 +492,15 @@ diff --git a/filament/CMakeLists.txt b/filament/CMakeLists.txt
 +    endif()
  endif()
 
-
-diff --git a/libs/utils/include/utils/compiler.h b/libs/utils/include/utils/compiler.h
---- a/libs/utils/include/utils/compiler.h
-+++ b/libs/utils/include/utils/compiler.h
-@@ -227,7 +227,7 @@
- // AND multi-threading is enabled (UTILS_HAS_THREADING is not 0).
- // This prevents compile failures on single-threaded targets or builds where standard
- // annotations are disabled by default in the platform's standard library headers.
--#if defined(_LIBCPP_ENABLE_THREAD_SAFETY_ANNOTATIONS) && UTILS_HAS_THREADING
-+#if defined(_LIBCPP_ENABLE_THREAD_SAFETY_ANNOTATIONS) && UTILS_HAS_THREADING && !defined(_WIN32)
- #define UTILS_THREAD_ANNOTATION_ATTRIBUTE(x)   __attribute__((x))
- #else
- #define UTILS_THREAD_ANNOTATION_ATTRIBUTE(x)
-
 diff --git a/filament/backend/CMakeLists.txt b/filament/backend/CMakeLists.txt
-index 78c05dd22..b124685c4 100644
 --- a/filament/backend/CMakeLists.txt
 +++ b/filament/backend/CMakeLists.txt
-@@ -523,6 +523,9 @@ else()
-             -Wover-aligned -Wreorder-init-list
-             -Werror
-     )
-+    if (WIN32 AND CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
-+        list(APPEND FILAMENT_WARNINGS -Wno-error=cast-function-type-mismatch -Wno-error=unused-variable -Wno-error=microsoft-unqualified-friend)
-+    endif()
+@@ -525,3 +525,7 @@
  endif()
-
+ 
++if (WIN32 AND CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
++    list(APPEND FILAMENT_WARNINGS -Wno-error=cast-function-type-mismatch -Wno-error=unused-variable -Wno-error=microsoft-unqualified-friend)
++endif()
++
  if (APPLE)
 

cmake/third_party_deps/dear_imgui.cmake

@@ -13,7 +13,7 @@
 # limitations under the License.
 
 set(MUJOCO_DEP_VERSION_dear_imgui
-    913a3c60561bb07e8fd410ec7d4a8f6f485defd6
+    3109131a882daec56a530aff540416983c240443
     CACHE STRING "Tag/version of `dear_imgui` to be fetched."
 )
 mark_as_advanced(MUJOCO_DEP_VERSION_dear_imgui)

cmake/third_party_deps/filament.cmake

@@ -13,7 +13,7 @@
 # limitations under the License.
 
 set(MUJOCO_DEP_VERSION_filament
-    10d2fc35128c2bc41ec4a1913c288d5df24afdaf
+    da22932b543b59810caf490d7f9e8859ec3fe204
     CACHE STRING "Tag/version of `filament` to be fetched."
 )
 mark_as_advanced(MUJOCO_DEP_VERSION_filament)

cmake/third_party_deps/implot.cmake

@@ -13,7 +13,7 @@
 # limitations under the License.
 
 set(MUJOCO_DEP_VERSION_implot
-    ec7306ceb99d19ff193eb30dc74fa3598f5e7dc6
+    0d4d87c3e005349c1aeb7ceacfd20a67f23c42b8
     CACHE STRING "Tag/version of `implot` to be fetched."
 )
 mark_as_advanced(MUJOCO_DEP_VERSION_implot)