Merge branch 'rc/1.12.5' into release

the gc usually runs for a very short amount of time, so the jobsystem
overhead is very significant compared to the actual work.

additionally this works around a scheduling issue that happens sometimes
on some devices where a thread could be "runnable but not running" for
many milliseconds.

README.md

@@ -31,7 +31,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'com.google.android.filament:filament-android:1.12.4'
+    implementation 'com.google.android.filament:filament-android:1.12.5'
 }
 ```
 
@@ -52,7 +52,7 @@ Here are all the libraries available in the group `com.google.android.filament`:
 iOS projects can use CocoaPods to install the latest release:
 
 ```
-pod 'Filament', '~> 1.12.4'
+pod 'Filament', '~> 1.12.5'
 ```
 
 ### Snapshots
@@ -128,7 +128,7 @@ steps:
 - Screen-space ambient occlusion
 - Screen-space refraction
 - Global fog
-- Dynamic resolution
+- Dynamic resolution (with support for AMD FidelityFX FSR)
 
 ### Post processing
 

RELEASE_NOTES.md

@@ -3,7 +3,12 @@
 This file contains one line summaries of commits that are worthy of mentioning in release notes.
 A new header is inserted each time a *tag* is created.
 
-## v1.12.5 (currently main branch)
+## v1.12.6 (currently main branch)
+
+## v1.12.5
+
+- engine: work around a job scheduling issue in `endFrame` that caused stuttering on some Android
+devices.
 
 ## v1.12.4
 
@@ -20,7 +25,7 @@ A new header is inserted each time a *tag* is created.
 
 ## v1.12.2
 
-- engine: New API on `ColorGrading` to enable or disable gamut mapping at will [**New Api**].
+- engine: New API on `ColorGrading` to enable or disable gamut mapping at will [**New API**].
 - engine: Fix typo causing ShadowOptions::shadowFar to not work properly.
 - engine: Fix, CSM glitch when using shadowMultiplier materials.
 - engine: Improve precision when computing camera projection.

android/build.gradle

@@ -63,7 +63,7 @@ buildscript {
         'minSdk': 19,
         'targetSdk': 30,
         'compileSdk': 30,
-        'kotlin': '1.5.21',
+        'kotlin': '1.5.30',
         'buildTools': '30.0.3',
         'ndk': '22.1.7171670'
     ]
@@ -77,7 +77,7 @@ buildscript {
     ]
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.0.0'
+        classpath 'com.android.tools.build:gradle:7.0.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${versions.kotlin}"
     }
 

android/filament-utils-android/build.gradle

@@ -43,13 +43,14 @@ configurations.all { config ->
 dependencies {
     implementation deps.kotlin
     implementation deps.androidx.annotations
-    implementation project(':filament-android')
 
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.8'
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.3'
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.0'
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.0'
 
-    fullImplementation module("com.google.android.filament:gltfio-android:${VERSION_NAME}")
-    liteImplementation module("com.google.android.filament:gltfio-android-lite:${VERSION_NAME}")
+    api project(':filament-android')
+
+    fullApi module("com.google.android.filament:gltfio-android:${VERSION_NAME}")
+    liteApi module("com.google.android.filament:gltfio-android-lite:${VERSION_NAME}")
 }
 
 apply from: rootProject.file('gradle/gradle-mvn-push.gradle')

android/gltfio-android/build.gradle

@@ -27,7 +27,8 @@ android {
 
 dependencies {
     implementation deps.androidx.annotations
-    implementation project(':filament-android')
+
+    api project(':filament-android')
 }
 
 apply from: rootProject.file('gradle/gradle-mvn-push.gradle')

android/gradle.properties

@@ -1,5 +1,5 @@
 GROUP=com.google.android.filament
-VERSION_NAME=1.12.4
+VERSION_NAME=1.12.5
 
 POM_DESCRIPTION=Real-time physically based rendering engine for Android.
 

filament/src/Engine.cpp

@@ -396,17 +396,11 @@ void FEngine::prepare() {
 
 void FEngine::gc() {
     // Note: this runs in a Job
-
-    JobSystem& js = mJobSystem;
-    auto *parent = js.createJob();
-    auto em = std::ref(mEntityManager);
-
-    js.run(jobs::createJob(js, parent, &FRenderableManager::gc, &mRenderableManager, em));
-    js.run(jobs::createJob(js, parent, &FLightManager::gc, &mLightManager, em));
-    js.run(jobs::createJob(js, parent, &FTransformManager::gc, &mTransformManager, em));
-    js.run(jobs::createJob(js, parent, &FCameraManager::gc, &mCameraManager, em));
-
-    js.runAndWait(parent);
+    auto& em = mEntityManager;
+    mRenderableManager.gc(em);
+    mLightManager.gc(em);
+    mTransformManager.gc(em);
+    mCameraManager.gc(em);
 }
 
 void FEngine::flush() {

ios/CocoaPods/Filament.podspec

@@ -1,12 +1,12 @@
 Pod::Spec.new do |spec|
   spec.name = "Filament"
-  spec.version = "1.12.4"
+  spec.version = "1.12.5"
   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.12.4/filament-v1.12.4-ios.tgz" }
+  spec.source = { :http => "https://github.com/google/filament/releases/download/v1.12.5/filament-v1.12.5-ios.tgz" }
 
   # Fix linking error with Xcode 12; we do not yet support the simulator on Apple silicon.
   spec.pod_target_xcconfig = {

web/filament-js/package.json

@@ -1,6 +1,6 @@
 {
   "name": "filament",
-  "version": "1.12.4",
+  "version": "1.12.5",
   "description": "Real-time physically based rendering engine",
   "main": "filament.js",
   "module": "filament.js",