From dd7106bfcfac65ab14e655bee15bebdd5f3f0c60 Mon Sep 17 00:00:00 2001
From: Powei Feng <powei@google.com>
Date: Tue, 17 Sep 2024 15:24:57 -0700
Subject: [PATCH 1/2] Release Filament 1.54.4

---
 README.md                      | 4 ++--
 RELEASE_NOTES.md               | 3 +++
 android/gradle.properties      | 2 +-
 ios/CocoaPods/Filament.podspec | 4 ++--
 web/filament-js/package.json   | 2 +-
 5 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 43a3ef8de2b..4322afea615 100644
--- a/README.md
+++ b/README.md
@@ -31,7 +31,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'com.google.android.filament:filament-android:1.54.3'
+    implementation 'com.google.android.filament:filament-android:1.54.4'
 }
 ```
 
@@ -51,7 +51,7 @@ Here are all the libraries available in the group `com.google.android.filament`:
 iOS projects can use CocoaPods to install the latest release:
 
 ```shell
-pod 'Filament', '~> 1.54.3'
+pod 'Filament', '~> 1.54.4'
 ```
 
 ## Documentation
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index c3bede1e3f5..79458e069c9 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -7,6 +7,9 @@ A new header is inserted each time a *tag* is created.
 Instead, if you are authoring a PR for the main branch, add your release note to
 [NEW_RELEASE_NOTES.md](./NEW_RELEASE_NOTES.md).
 
+## v1.54.5
+
+
 ## v1.54.4
 
 - Add support for multi-layered render target with array textures.
diff --git a/android/gradle.properties b/android/gradle.properties
index 6b5d7c8454c..e0c7ac6c119 100644
--- a/android/gradle.properties
+++ b/android/gradle.properties
@@ -1,5 +1,5 @@
 GROUP=com.google.android.filament
-VERSION_NAME=1.54.3
+VERSION_NAME=1.54.4
 
 POM_DESCRIPTION=Real-time physically based rendering engine for Android.
 
diff --git a/ios/CocoaPods/Filament.podspec b/ios/CocoaPods/Filament.podspec
index c324c7cc115..07e8121b8e1 100644
--- a/ios/CocoaPods/Filament.podspec
+++ b/ios/CocoaPods/Filament.podspec
@@ -1,12 +1,12 @@
 Pod::Spec.new do |spec|
   spec.name = "Filament"
-  spec.version = "1.54.3"
+  spec.version = "1.54.4"
   spec.license = { :type => "Apache 2.0", :file => "LICENSE" }
   spec.homepage = "https://google.github.io/filament"
   spec.authors = "Google LLC."
   spec.summary = "Filament is a real-time physically based rendering engine for Android, iOS, Windows, Linux, macOS, and WASM/WebGL."
   spec.platform = :ios, "11.0"
-  spec.source = { :http => "https://github.com/google/filament/releases/download/v1.54.3/filament-v1.54.3-ios.tgz" }
+  spec.source = { :http => "https://github.com/google/filament/releases/download/v1.54.4/filament-v1.54.4-ios.tgz" }
 
   # Fix linking error with Xcode 12; we do not yet support the simulator on Apple silicon.
   spec.pod_target_xcconfig = {
diff --git a/web/filament-js/package.json b/web/filament-js/package.json
index 410de0fec0a..eccad539620 100644
--- a/web/filament-js/package.json
+++ b/web/filament-js/package.json
@@ -1,6 +1,6 @@
 {
   "name": "filament",
-  "version": "1.54.3",
+  "version": "1.54.4",
   "description": "Real-time physically based rendering engine",
   "main": "filament.js",
   "module": "filament.js",

From 2147a7a6407f22fe6e2d6c7c53eb2c0ee6d38bce Mon Sep 17 00:00:00 2001
From: Powei Feng <powei@google.com>
Date: Fri, 13 Sep 2024 10:38:34 -0700
Subject: [PATCH 2/2] vk: workaround a renderStandaloneView issue

Found through testing that renderStandaloneView+vk+swiftshader
seems to cause synchronization issues, which results in incorrect
rendering. Here we workaround the issue by forcibly flush and
wait per renderStandaloneView call.

BUG=361822355
---
 filament/src/details/Renderer.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/filament/src/details/Renderer.cpp b/filament/src/details/Renderer.cpp
index a8e71b48ddc..b210884c2b1 100644
--- a/filament/src/details/Renderer.cpp
+++ b/filament/src/details/Renderer.cpp
@@ -536,6 +536,12 @@ void FRenderer::renderStandaloneView(FView const* view) {
         renderInternal(view);
 
         driver.endFrame(mFrameId);
+
+        // This is a workaround for internal bug b/361822355.
+        // TODO: properly address the bug and remove this workaround.
+        if (engine.getBackend() == backend::Backend::VULKAN) {
+            engine.flushAndWait();
+        }
     }
 }