Capture command callstacks for debugging

2023-10-30 14:42:24 -07:00
1282 changed files with 62846 additions and 96691 deletions
--- a/.dir-locals.el
+++ b/.dir-locals.el
@@ -1,7 +0,0 @@
-;;; Directory Local Variables            -*- no-byte-compile: t -*-
-;;; For more information see (info "(emacs) Directory Variables")
-
-((c++-mode . ((c-file-style . "filament")
-              (apheleia-inhibit . t)))
- (c-mode . ((c-file-style . "filament")
-            (apheleia-inhibit . t))))
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,11 +0,0 @@
-root = true
-
-[*]
-end_of_line = lf
-insert_final_newline = true
-charset = utf-8
-
-[*.{c,cpp,h,inc,kt,java,js,md}]
-indent_style = space
-indent_size = 4
-max_line_length = 100
--- a/.github/actions/android-continuous/action.yml
+++ b/.github/actions/android-continuous/action.yml
@@ -1,17 +0,0 @@
-name: 'Android Continuous'
-inputs:
-  build-abi:
-    description: 'The target platform ABI'
-    required: true
-    default: 'armeabi-v7a'
-runs:
-  using: "composite"
-  steps:
-    - uses: actions/setup-java@v3
-      with:
-        distribution: 'temurin'
-        java-version: '17'
-    - name: Run build script
-      run: |
-        cd build/android && printf "y" | ./build.sh continuous ${{ inputs.build-abi }}
-      shell: bash
--- a/.github/actions/ubuntu-apt-add-src/action.yml
+++ b/.github/actions/ubuntu-apt-add-src/action.yml
@@ -1,9 +0,0 @@
-name: 'ubuntu apt add deb-src'
-runs:
-  using: "composite"
-  steps:
-    - name: "ubuntu apt add deb-src"
-      run: |
-          echo "deb-src http://archive.ubuntu.com/ubuntu jammy main restricted universe" | sudo tee /etc/apt/sources.list.d/my.list
-          sudo apt-get update
-      shell: bash
--- a/.github/workflows/android-continuous.yml
+++ b/.github/workflows/android-continuous.yml
@@ -10,13 +10,34 @@ on:
 jobs:
  build-android:
    name: build-android
-    # We intentially use a larger runner here to enable larger disk space
-    # (standard linux runner will fail on disk space and faster build time).
-    runs-on: ubuntu-22.04-32core
+    runs-on: macos-latest

    steps:
-      - uses: actions/checkout@v4.1.6
-      - name: Run Android Continuous
-        uses: ./.github/actions/android-continuous
+      - uses: actions/checkout@v3.3.0
+      - uses: actions/setup-java@v3
        with:
-          build-abi: armeabi-v7a,arm64-v8a,x86_64
+          distribution: 'temurin'
+          java-version: '17'
+      - name: Run build script
+        run: |
+          cd build/android && printf "y" | ./build.sh continuous
+      - uses: actions/upload-artifact@v1.0.0
+        with:
+          name: filament-android
+          path: out/filament-android-release.aar
+      - uses: actions/upload-artifact@v1.0.0
+        with:
+          name: filamat-android-full
+          path: out/filamat-android-release.aar
+      - uses: actions/upload-artifact@v1.0.0
+        with:
+          name: filamat-android-lite
+          path: out/filamat-android-lite-release.aar
+      - uses: actions/upload-artifact@v1.0.0
+        with:
+          name: gltfio-android-release
+          path: out/gltfio-android-release.aar
+      - uses: actions/upload-artifact@v1.0.0
+        with:
+          name: filament-utils-android-release
+          path: out/filament-utils-android-release.aar
--- a/.github/workflows/cocopods-deploy.yml
+++ b/.github/workflows/cocopods-deploy.yml
@@ -1,30 +0,0 @@
-name: CocoaPods Deploy
-
-# This must be run after the iOS release job has finished, and the iOS release
-# asset has been uploaded to Github.
-on:
-  workflow_dispatch:
-    inputs:
-      release_tag:
-        description: 'Release tag to deploy (e.g., v1.42.2)'
-        required: true
-        default: 'v1.42.2'
-
-jobs:
-  cocoapods-deploy:
-    name: cocoapods-deploy
-    runs-on: macos-14
-    steps:
-      - name: Check out iOS/CocoaPods directory
-        uses: Bhacaz/checkout-files@49fc3050859046bf4f4873678d46099985640e89
-        with:
-          files: ios/CocoaPods
-          token: ${{ secrets.GITHUB_TOKEN }}
-          branch: ${{ github.event.inputs.release_tag }}
-      - name: Move podspec to root
-        run: mv ios/CocoaPods/*.podspec .
-      - name: Install CocoaPods
-        run: gem install cocoapods
-      - uses: michaelhenry/deploy-to-cocoapods-github-action@745686ab065f90596e0d5cfcf97bb2416d94262e
-        env:
-          COCOAPODS_TRUNK_TOKEN: ${{ secrets.COCOAPODS_TRUNK_TOKEN }}
--- a/.github/workflows/ios-continuous.yml
+++ b/.github/workflows/ios-continuous.yml
@@ -10,14 +10,14 @@ on:
 jobs:
  build-ios:
    name: build-ios
-    runs-on: macos-14-xlarge
+    runs-on: macos-latest

    steps:
-      - uses: actions/checkout@v4.1.6
+      - uses: actions/checkout@v3.3.0
      - name: Run build script
        run: |
          cd build/ios && printf "y" | ./build.sh continuous
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v1.0.0
        with:
          name: filament-ios
          path: out/filament-release-ios.tgz
--- a/.github/workflows/linux-continuous.yml
+++ b/.github/workflows/linux-continuous.yml
@@ -10,14 +10,14 @@ on:
 jobs:
  build-linux:
    name: build-linux
-    runs-on: ubuntu-22.04-16core
+    runs-on: ubuntu-22.04

    steps:
-      - uses: actions/checkout@v4.1.6
+      - uses: actions/checkout@v3.3.0
      - name: Run build script
        run: |
          cd build/linux && printf "y" | ./build.sh continuous
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v1.0.0
        with:
          name: filament-linux
          path: out/filament-release-linux.tgz
--- a/.github/workflows/mac-continuous.yml
+++ b/.github/workflows/mac-continuous.yml
@@ -10,14 +10,14 @@ on:
 jobs:
  build-mac:
    name: build-mac
-    runs-on: macos-14-xlarge
+    runs-on: macos-latest

    steps:
-      - uses: actions/checkout@v4.1.6
+      - uses: actions/checkout@v3.3.0
      - name: Run build script
        run: |
          cd build/mac && printf "y" | ./build.sh continuous
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v1.0.0
        with:
          name: filament-mac
          path: out/filament-release-darwin.tgz
--- a/.github/workflows/npm-deploy.yml
+++ b/.github/workflows/npm-deploy.yml
@@ -1,33 +0,0 @@
-name: Npm Deploy
-
-on:
-  workflow_dispatch:
-    inputs:
-      release_tag:
-        description: 'Release tag to deploy (e.g., v1.42.2)'
-        required: true
-        default: 'v1.42.2'
-
-jobs:
-  npm-deploy:
-    name: npm-deploy
-    runs-on: macos-14
-    steps:
-      - uses: actions/checkout@v4.1.6
-        with:
-          ref: ${{ github.event.inputs.release_tag }}
-      # Setup .npmrc file to publish to npm
-      - uses: actions/setup-node@v3
-        with:
-          node-version: '18.x'
-          registry-url: 'https://registry.npmjs.org'
-      - name: Run build script
-        run: |
-          cd build/web && printf "y" | ./build.sh release
-      - name: Deploy to npm
-        run: |
-          cd out/cmake-webgl-release/web/filament-js
-          npm publish
-        env:
-          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
-
--- a/.github/workflows/presubmit.yml
+++ b/.github/workflows/presubmit.yml
@@ -15,10 +15,10 @@ jobs:

    strategy:
      matrix:
-        os: [macos-14-xlarge, ubuntu-22.04-16core]
+        os: [macos-latest, ubuntu-22.04]

    steps:
-      - uses: actions/checkout@v4.1.6
+      - uses: actions/checkout@v3.3.0
      - name: Run build script
        run: |
          WORKFLOW_OS=`echo \`uname\` | sed "s/Darwin/mac/" | tr [:upper:] [:lower:]`
@@ -29,10 +29,10 @@ jobs:

  build-windows:
    name: build-windows
-    runs-on: win-2019-16core
+    runs-on: windows-2019

    steps:
-      - uses: actions/checkout@v4.1.6
+      - uses: actions/checkout@v3.3.0
      - name: Run build script
        run: |
          build\windows\build-github.bat presubmit
@@ -40,26 +40,24 @@ jobs:

  build-android:
    name: build-android
-    runs-on: ubuntu-22.04-16core
+    runs-on: macos-latest

    steps:
-      - uses: actions/checkout@v4.1.6
+      - uses: actions/checkout@v3.3.0
      - uses: actions/setup-java@v3
        with:
          distribution: 'temurin'
          java-version: '17'
      - name: Run build script
-        # Only build 1 64 bit target during presubmit to cut down build times during presubmit
-        # Continuous builds will build everything
        run: |
-          cd build/android && printf "y" | ./build.sh presubmit arm64-v8a
+          cd build/android && printf "y" | ./build.sh presubmit

  build-ios:
    name: build-iOS
-    runs-on: macos-14-xlarge
+    runs-on: macos-latest

    steps:
-      - uses: actions/checkout@v4.1.6
+      - uses: actions/checkout@v3.3.0
      - name: Run build script
        run: |
          cd build/ios && printf "y" | ./build.sh presubmit
@@ -69,25 +67,10 @@ jobs:

  build-web:
    name: build-web
-    runs-on: ubuntu-22.04-16core
+    runs-on: macos-latest

    steps:
-      - uses: actions/checkout@v4.1.6
+      - uses: actions/checkout@v3.3.0
      - name: Run build script
        run: |
          cd build/web && printf "y" | ./build.sh presubmit
-
-  test-renderdiff:
-    name: test-renderdiff
-    runs-on: ubuntu-22.04-32core
-
-    steps:
-      - uses: actions/checkout@v4.1.6
-      - uses: ./.github/actions/ubuntu-apt-add-src
-      - name: Run script
-        run: |
-          source ./build/linux/ci-common.sh && bash test/renderdiff_tests.sh
-      - uses: actions/upload-artifact@v4
-        with:
-          name: presubmit-renderdiff-result
-          path: ./out/renderdiff_tests
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -31,7 +31,7 @@ jobs:

    strategy:
      matrix:
-        os: [macos-14-xlarge, ubuntu-22.04-32core]
+        os: [macos-latest, ubuntu-22.04]

    steps:
      - name: Decide Git ref
@@ -41,7 +41,7 @@ jobs:
          TAG=${REF##*/}
          echo "ref=${REF}" >> $GITHUB_OUTPUT
          echo "tag=${TAG}" >> $GITHUB_OUTPUT
-      - uses: actions/checkout@v4.1.6
+      - uses: actions/checkout@v3.3.0
        with:
          ref: ${{ steps.git_ref.outputs.ref }}
      - name: Run build script
@@ -65,7 +65,7 @@ jobs:

  build-web:
    name: build-web
-    runs-on: ubuntu-22.04-16core
+    runs-on: macos-latest
    if: github.event_name == 'release' || github.event.inputs.platform == 'web'

    steps:
@@ -76,7 +76,7 @@ jobs:
          TAG=${REF##*/}
          echo "ref=${REF}" >> $GITHUB_OUTPUT
          echo "tag=${TAG}" >> $GITHUB_OUTPUT
-      - uses: actions/checkout@v4.1.6
+      - uses: actions/checkout@v3.3.0
        with:
          ref: ${{ steps.git_ref.outputs.ref }}
      - name: Run build script
@@ -98,7 +98,7 @@ jobs:

  build-android:
    name: build-android
-    runs-on: ubuntu-22.04-16core
+    runs-on: macos-latest
    if: github.event_name == 'release' || github.event.inputs.platform == 'android'

    steps:
@@ -109,7 +109,7 @@ jobs:
          TAG=${REF##*/}
          echo "ref=${REF}" >> $GITHUB_OUTPUT
          echo "tag=${TAG}" >> $GITHUB_OUTPUT
-      - uses: actions/checkout@v4.1.6
+      - uses: actions/checkout@v3.3.0
        with:
          ref: ${{ steps.git_ref.outputs.ref }}
      - uses: actions/setup-java@v3
@@ -120,16 +120,17 @@ jobs:
        env:
          TAG: ${{ steps.git_ref.outputs.tag }}
        run: |
-          cd build/android && printf "y" | ./build.sh release armeabi-v7a,arm64-v8a,x86,x86_64
+          cd build/android && printf "y" | ./build.sh release
          cd ../..
          mv out/filament-android-release.aar out/filament-${TAG}-android.aar
          mv out/filamat-android-release.aar out/filamat-${TAG}-android.aar
+          mv out/filamat-android-lite-release.aar out/filamat-${TAG}-lite-android.aar
          mv out/gltfio-android-release.aar out/gltfio-${TAG}-android.aar
          mv out/filament-utils-android-release.aar out/filament-utils-${TAG}-android.aar
      - name: Sign sample-gltf-viewer
        run: |
          echo "${APK_KEYSTORE_BASE64}" > filament.jks.base64
-          base64 --decode -i filament.jks.base64 > filament.jks
+          base64 --decode filament.jks.base64 > filament.jks
          BUILD_TOOLS_VERSION=$(ls ${ANDROID_HOME}/build-tools | sort -V | tail -n 1)
          APKSIGNER=${ANDROID_HOME}/build-tools/${BUILD_TOOLS_VERSION}/apksigner
          IN_FILE="out/sample-gltf-viewer-release.apk"
@@ -152,7 +153,7 @@ jobs:

  build-ios:
    name: build-ios
-    runs-on: macos-14-xlarge
+    runs-on: macos-latest
    if: github.event_name == 'release' || github.event.inputs.platform == 'ios'

    steps:
@@ -163,7 +164,7 @@ jobs:
          TAG=${REF##*/}
          echo "ref=${REF}" >> $GITHUB_OUTPUT
          echo "tag=${TAG}" >> $GITHUB_OUTPUT
-      - uses: actions/checkout@v4.1.6
+      - uses: actions/checkout@v3.3.0
        with:
          ref: ${{ steps.git_ref.outputs.ref }}
      - name: Run build script
@@ -185,7 +186,7 @@ jobs:

  build-windows:
    name: build-windows
-    runs-on: windows-2019-32core
+    runs-on: windows-2019
    if: github.event_name == 'release' || github.event.inputs.platform == 'windows'

    steps:
@@ -197,7 +198,7 @@ jobs:
          echo "ref=${REF}" >> $GITHUB_OUTPUT
          echo "tag=${TAG}" >> $GITHUB_OUTPUT
        shell: bash
-      - uses: actions/checkout@v4.1.6
+      - uses: actions/checkout@v3.3.0
        with:
          ref: ${{ steps.git_ref.outputs.ref }}
      - name: Run build script
@@ -205,7 +206,7 @@ jobs:
          TAG: ${{ steps.git_ref.outputs.tag }}
        run: |
          build\windows\build-github.bat release
-          echo on
+          cd ..\..
          move out\filament-windows.tgz out\filament-%TAG%-windows.tgz
        shell: cmd
      - uses: actions/github-script@v6
--- a/.github/workflows/web-continuous.yml
+++ b/.github/workflows/web-continuous.yml
@@ -10,14 +10,14 @@ on:
 jobs:
  build-web:
    name: build-web
-    runs-on: ubuntu-22.04-16core
+    runs-on: macos-latest

    steps:
-      - uses: actions/checkout@v4.1.6
+      - uses: actions/checkout@v3.3.0
      - name: Run build script
        run: |
          cd build/web && printf "y" | ./build.sh continuous
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v1.0.0
        with:
          name: filament-web
          path: out/filament-release-web.tgz
--- a/.github/workflows/windows-continuous.yml
+++ b/.github/workflows/windows-continuous.yml
@@ -10,15 +10,15 @@ on:
 jobs:
  build-windows:
    name: build-windows
-    runs-on: windows-2019-32core
+    runs-on: windows-2019

    steps:
-      - uses: actions/checkout@v4.1.6
+      - uses: actions/checkout@v3.3.0
      - name: Run build script
        run: |
          build\windows\build-github.bat continuous
        shell: cmd
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v1.0.0
        with:
          name: filament-windows
          path: out/filament-windows.tgz
--- a/.gitignore
+++ b/.gitignore
@@ -16,5 +16,3 @@ settings.json
 test*.png
 test*.json
 results
-/compile_commands.json
-/.cache
--- a/BUILDING.md
+++ b/BUILDING.md
@@ -40,27 +40,25 @@ inside the Filament source tree.

 To trigger an incremental debug build:

-```shell
-./build.sh debug
+```
+$ ./build.sh debug
 ```

 To trigger an incremental release build:

-```shell
-./build.sh release
+```
+$ ./build.sh release
 ```

 To trigger both incremental debug and release builds:

-```shell
-./build.sh debug release
+```
+$ ./build.sh debug release
 ```

-If build fails for some reasons, it may leave the `out/` directory in a broken state. You can
-force a clean build by adding the `-c` flag in that case.
-
 To install the libraries and executables in `out/debug/` and `out/release/`, add the `-i` flag.
-The script offers more features described by executing `build.sh -h`.
+You can force a clean build by adding the `-c` flag. The script offers more features described
+by executing `build.sh -h`.

 ### Filament-specific CMake Options

@@ -73,13 +71,14 @@ The following CMake options are boolean options specific to Filament:
 - `FILAMENT_SUPPORTS_VULKAN`:      Include the Vulkan backend
 - `FILAMENT_INSTALL_BACKEND_TEST`: Install the backend test library so it can be consumed on iOS
 - `FILAMENT_USE_EXTERNAL_GLES3`:   Experimental: Compile Filament against OpenGL ES 3
+- `FILAMENT_USE_SWIFTSHADER`:      Compile Filament against SwiftShader
 - `FILAMENT_SKIP_SAMPLES`:         Don't build sample apps

 To turn an option on or off:

-```shell
-cd <cmake-build-directory>
-cmake . -DOPTION=ON       # Replace OPTION with the option name, set to ON / OFF
+```
+$ cd <cmake-build-directory>
+$ cmake . -DOPTION=ON       # Replace OPTION with the option name, set to ON / OFF
 ```

 Options can also be set with the CMake GUI.
@@ -103,38 +102,38 @@ script.
 If you'd like to run `cmake` directly rather than using the build script, it can be invoked as
 follows, with some caveats that are explained further down.

-```shell
-mkdir out/cmake-release
-cd out/cmake-release
-cmake -G Ninja -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=../release/filament ../..
+```
+$ mkdir out/cmake-release
+$ cd out/cmake-release
+$ cmake -G Ninja -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=../release/filament ../..
 ```

 Your Linux distribution might default to `gcc` instead of `clang`, if that's the case invoke
 `cmake` with the following command:

-```shell
-mkdir out/cmake-release
-cd out/cmake-release
+```
+$ mkdir out/cmake-release
+$ cd out/cmake-release
 # Or use a specific version of clang, for instance /usr/bin/clang-14
-CC=/usr/bin/clang CXX=/usr/bin/clang++ CXXFLAGS=-stdlib=libc++ \
-  cmake -G Ninja -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=../release/filament ../..
+$ CC=/usr/bin/clang CXX=/usr/bin/clang++ CXXFLAGS=-stdlib=libc++ \
+    cmake -G Ninja -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=../release/filament ../..
 ```

 You can also export the `CC` and `CXX` environment variables to always point to `clang`. Another
 solution is to use `update-alternatives` to both change the default compiler, and point to a
 specific version of clang:

-```shell
-update-alternatives --install /usr/bin/clang clang /usr/bin/clang-14 100
-update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-14 100
-update-alternatives --install /usr/bin/cc cc /usr/bin/clang 100
-update-alternatives --install /usr/bin/c++ c++ /usr/bin/clang++ 100
+```
+$ update-alternatives --install /usr/bin/clang clang /usr/bin/clang-14 100
+$ update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-14 100
+$ update-alternatives --install /usr/bin/cc cc /usr/bin/clang 100
+$ update-alternatives --install /usr/bin/c++ c++ /usr/bin/clang++ 100
 ```

 Finally, invoke `ninja`:

-```shell
-ninja
+```
+$ ninja
 ```

 This will build Filament, its tests and samples, and various host tools.
@@ -144,8 +143,8 @@ This will build Filament, its tests and samples, and various host tools.
 To compile Filament you must have the most recent version of Xcode installed and you need to
 make sure the command line tools are setup by running:

-```shell
-xcode-select --install
+```
+$ xcode-select --install
 ```

 If you wish to run the Vulkan backend instead of the default Metal backend, you must install
@@ -153,11 +152,11 @@ the LunarG SDK, enable "System Global Components", and reboot your machine.

 Then run `cmake` and `ninja` to trigger a build:

-```shell
-mkdir out/cmake-release
-cd out/cmake-release
-cmake -G Ninja -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=../release/filament ../..
-ninja
+```
+$ mkdir out/cmake-release
+$ cd out/cmake-release
+$ cmake -G Ninja -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=../release/filament ../..
+$ ninja
 ```

 ### iOS
@@ -165,20 +164,20 @@ ninja
 The easiest way to build Filament for iOS is to use `build.sh` and the
 `-p ios` flag. For instance to build the debug target:

-```shell
-./build.sh -p ios debug
+```
+$ ./build.sh -p ios debug
 ```

 See [ios/samples/README.md](./ios/samples/README.md) for more information.

 ### Windows

-#### Building on Windows with Visual Studio 2019 or later
+#### Building on Windows with Visual Studio 2019

 Install the following components:

- [Visual Studio 2019 or later](https://www.visualstudio.com/downloads)
- [Windows SDK](https://developer.microsoft.com/en-us/windows/downloads/windows-sdk/)
+- [Visual Studio 2019](https://www.visualstudio.com/downloads)
+- [Windows 10 SDK](https://developer.microsoft.com/en-us/windows/downloads/windows-10-sdk)
 - [Python 3.7](https://www.python.org/ftp/python/3.7.0/python-3.7.0.exe)
 - [CMake 3.14 or later](https://github.com/Kitware/CMake/releases/download/v3.14.7/cmake-3.14.7-win64-x64.msi)

@@ -192,10 +191,10 @@ using `fsutil.exe file queryCaseSensitiveInfo`.
 Next, open `x64 Native Tools Command Prompt for VS 2019`, create a working directory, and run
 CMake in it:

-```bat
-mkdir out
-cd out
-cmake ..
+```
+> mkdir out
+> cd out
+> cmake ..
 ```

 Open the generated solution file `TNT.sln` in Visual Studio.
@@ -205,15 +204,15 @@ target in the _Solution Explorer_ and choose _Build_ to build a specific target.

 For example, build the `material_sandbox` sample and run it from the `out` directory with:

-```bat
-samples\Debug\material_sandbox.exe ..\assets\models\monkey\monkey.obj
+```
+> samples\Debug\material_sandbox.exe ..\assets\models\monkey\monkey.obj
 ```

 You can also use CMake to invoke the build without opening Visual Studio. For example, from the
 `out` folder run the following command.

-```bat
-cmake --build . --target gltf_viewer --config Release
+```
+> cmake --build . --target gltf_viewer --config Release
 ```

 ### Android
@@ -238,8 +237,8 @@ To build Android on Windows machines, see [android/Windows.md](android/Windows.m
 The easiest way to build Filament for Android is to use `build.sh` and the
 `-p android` flag. For instance to build the release target:

-```shell
-./build.sh -p android release
+```
+$ ./build.sh -p android release
 ```

 Run `build.sh -h` for more information.
@@ -249,23 +248,23 @@ Run `build.sh -h` for more information.
 Invoke CMake in a build directory of your choice, inside of filament's directory. The commands
 below show how to build Filament for ARM 64-bit (`aarch64`).

-```shell
-mkdir out/android-build-release-aarch64
-cd out/android-build-release-aarch64
-cmake -G Ninja -DCMAKE_TOOLCHAIN_FILE=../../build/toolchain-aarch64-linux-android.cmake \
-      -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=../android-release/filament ../..
+```
+$ mkdir out/android-build-release-aarch64
+$ cd out/android-build-release-aarch64
+$ cmake -G Ninja -DCMAKE_TOOLCHAIN_FILE=../../build/toolchain-aarch64-linux-android.cmake \
+        -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=../android-release/filament ../..
 ```

 And then invoke `ninja`:

-```shell
-ninja install
+```
+$ ninja install
 ```

 or

-```shell
-ninja install/strip
+```
+$ ninja install/strip
 ```

 This will generate Filament's Android binaries in `out/android-release`. This location is important
@@ -297,8 +296,8 @@ AAR.
 Alternatively you can build the AAR from the command line by executing the following in the
 `android/` directory:

-```shell
-./gradlew -Pcom.google.android.filament.dist-dir=../../out/android-release/filament assembleRelease
+```
+$ ./gradlew -Pcom.google.android.filament.dist-dir=../../out/android-release/filament assembleRelease
 ```

 The `-Pcom.google.android.filament.dist-dir` can be used to specify a different installation
@@ -312,7 +311,7 @@ sure to add the newly created module as a dependency to your application.
 If you do not wish to include all supported ABIs, make sure to create the appropriate flavors in
 your Gradle build file. For example:

-```gradle
+```
 flavorDimensions 'cpuArch'
 productFlavors {
    arm8 {
@@ -354,7 +353,7 @@ started, follow the instructions for building Filament on your platform ([macOS]
 Next, you need to install the Emscripten SDK. The following instructions show how to install the
 same version that our continuous builds use.

-```shell
+```
 cd <your chosen parent folder for the emscripten SDK>
 curl -L https://github.com/emscripten-core/emsdk/archive/refs/tags/3.1.15.zip > emsdk.zip
 unzip emsdk.zip ; mv emsdk-* emsdk ; cd emsdk
@@ -365,7 +364,7 @@ source ./emsdk_env.sh

 After this you can invoke the [easy build](#easy-build) script as follows:

-```shell
+```
 export EMSDK=<your chosen home for the emscripten SDK>
 ./build.sh -p webgl release
 ```
@@ -375,7 +374,7 @@ creates a `samples` folder that can be used as the root of a simple static web s
 cannot open the HTML directly from the filesystem due to CORS. We recommend using the emrun tool
 to create a quick localhost server:

-```shell
+```
 emrun out/cmake-webgl-release/web/samples --no_browser --port 8000
 ```

@@ -396,7 +395,7 @@ Some of the samples accept FBX/OBJ meshes while others rely on the `filamesh` fi
 generate a `filamesh ` file from an FBX/OBJ asset, run the `filamesh` tool
 (`./tools/filamesh/filamesh` in your build directory):

-```shell
+```
 filamesh ./assets/models/monkey/monkey.obj monkey.filamesh
 ```

@@ -406,7 +405,7 @@ files for the IBL (which are PNGs containing `R11F_G11F_B10F` data) or a path to
 containing two `.ktx` files (one for the IBL itself, one for the skybox). To generate an IBL
 simply use this command:

-```shell
+```
 cmgen -f ktx -x ./ibls/ my_ibl.exr
 ```

@@ -425,72 +424,42 @@ value is the desired roughness between 0 and 1.

 ## Generating C++ documentation

-To generate the documentation you must first install `doxygen` and `graphviz`, then run the
+To generate the documentation you must first install `doxygen` and `graphviz`, then run the 
 following commands:

-```shell
-cd filament/filament
-doxygen docs/doxygen/filament.doxygen
+```
+$ cd filament/filament
+$ doxygen docs/doxygen/filament.doxygen
 ```

 Finally simply open `docs/html/index.html` in your web browser.

-## Software Rasterization
+## SwiftShader

-We have tested swiftshader and Mesa for software rasterization on the Vulkan/GL backends.
+To try out Filament's Vulkan support with SwiftShader, first build SwiftShader and set the
+`SWIFTSHADER_LD_LIBRARY_PATH` variable to the folder that contains `libvk_swiftshader.dylib`:

-To use this for Vulkan, please first make sure that the [Vulkan SDK](https://www.lunarg.com/vulkan-sdk/) is
-installed on your machine. If you are doing a manual installation of the SDK on Linux, you will have
-to source `setup-env.sh` in the SDK's root folder to make sure the Vulkan loader is the first lib loaded.
-
-### Swiftshader (Vulkan) [tested on macOS and Linux]
-
-First, build SwiftShader
-
-```shell
+```
 git clone https://github.com/google/swiftshader.git
 cd swiftshader/build
 cmake .. &&  make -j
+export SWIFTSHADER_LD_LIBRARY_PATH=`pwd`
 ```

-and then set `VK_ICD_FILENAMES` to the ICD json produced in the build. For example,
-```shell
-export VK_ICD_FILENAMES=/Users/user/swiftshader/build/Darwin/vk_swiftshader_icd.json
-```
+Next, go to your Filament repo and use the [easy build](#easy-build) script with `-t`.

-Build and run Filament as usual and specify the Vulkan backend when creating the Engine.
+## SwiftShader for CI

-### Mesa's LLVMPipe (GL) and Lavapipe (Vulkan) [tested on Linux]
-
-We will only cover steps that build Mesa from source. The official documentation of Mesa mentioned
-that in general precompiled libraries [are **not** made available](https://docs.mesa3d.org/precompiled.html).
-
-Download the repo and make sure you have the build depedencies. For example (assuming an Ubuntu/Debian distro),
-```shell
-git clone https://gitlab.freedesktop.org/mesa/mesa.git
-sudo apt-get build-dep mesa
-```
-
-To build both the GL and Vulkan rasterizers,
-
-```shell
-cd mesa
-mkdir -p out
-meson setup builddir/ -Dprefix=$(pwd)/out -Dglx=xlib -Dgallium-drivers=swrast -Dvulkan-drivers=swrast
-meson install -C builddir/
-```
-
-For GL, we need to ensure that we load the GL lib from the mesa output directory.  For example, to run
-the debug `gltf_viewer`, we would execute
-```shell
-LD_LIBRARY_PATH=/Users/user/mesa/out/lib/x86_64-linux-gnu \
-    ./out/cmake-debug/samples/gltf_viewer -a opengl
-```
-
-For Vulkan, we need to set the path to the ICD json, which tells the loader where to find the driver
-library. To run `gltf_viewer`, we would execute
-```shell
-VK_ICD_FILENAMES=/Users/user/mesa/out/share/vulkan/icd.d/lvp_icd.x86_64.json \
-    ./out/cmake-debug/samples/gltf_viewer -a vulkan
+Continuous testing turnaround can be quite slow if you need to build SwiftShader from scratch, so we
+provide an Ubuntu-based Docker image that has it already built. The Docker image also includes
+everything necessary for building Filament. You can fetch and run the image as follows:

 ```
+docker pull ghcr.io/filament-assets/swiftshader
+docker run -it ghcr.io/filament-assets/swiftshader
+```
+
+To do more with the container, see the helper script at `build/swiftshader/test.sh`.
+
+If you are a team member, you can update the public image to the latest SwiftShader by
+following the instructions at the top of `build/swiftshader/Dockerfile`.
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,14 +3,6 @@
 # ==================================================================================================
 cmake_minimum_required(VERSION 3.19)

-# ==================================================================================================
-# Toolchain configuration
-# ==================================================================================================
-if (APPLE AND NOT IOS)
-    # This must be set before project() is called
-    set(CMAKE_OSX_DEPLOYMENT_TARGET 10.15 CACHE STRING "")
-endif()
-
 # ==================================================================================================
 # Project declaration
 # ==================================================================================================
@@ -21,6 +13,8 @@ project(TNT)
 # ==================================================================================================
 option(FILAMENT_USE_EXTERNAL_GLES3 "Experimental: Compile Filament against OpenGL ES 3" OFF)

+option(FILAMENT_USE_SWIFTSHADER "Compile Filament against SwiftShader" OFF)
+
 option(FILAMENT_ENABLE_LTO "Enable link-time optimizations if supported by the compiler" OFF)

 option(FILAMENT_SKIP_SAMPLES "Don't build samples" OFF)
@@ -39,14 +33,6 @@ option(FILAMENT_LINUX_IS_MOBILE "Treat Linux as Mobile" OFF)

 option(FILAMENT_ENABLE_ASAN_UBSAN "Enable Address and Undefined Behavior Sanitizers" OFF)

-option(FILAMENT_ENABLE_TSAN "Enable Thread Sanitizer" OFF)
-
-option(FILAMENT_ENABLE_FEATURE_LEVEL_0 "Enable Feature Level 0" ON)
-
-option(FILAMENT_ENABLE_MULTIVIEW "Enable multiview for Filament" OFF)
-
-option(FILAMENT_SUPPORTS_OSMESA "Enable OSMesa (headless GL context) for Filament" OFF)
-
 set(FILAMENT_NDK_VERSION "" CACHE STRING
    "Android NDK version or version prefix to be used when building for Android."
 )
@@ -71,17 +57,6 @@ set(FILAMENT_METAL_HANDLE_ARENA_SIZE_IN_MB "8" CACHE STRING
    "Size of the Metal handle arena, default 8."
 )

-set(FILAMENT_BACKEND_DEBUG_FLAG "" CACHE STRING
-    "A debug flag meant for enabling/disabling backend debugging paths"
-)
-
-set(FILAMENT_OSMESA_PATH "" CACHE STRING
-    "Path to the OSMesa header and lib"
-)
-
-# Enable exceptions by default in spirv-cross.
-set(SPIRV_CROSS_EXCEPTIONS_TO_ASSERTIONS OFF)
-
 # ==================================================================================================
 # CMake policies
 # ==================================================================================================
@@ -138,27 +113,22 @@ else()
 endif()

 if (LINUX)
-    if (NOT FILAMENT_OSMESA_PATH STREQUAL "")
-        if (NOT EXISTS ${FILAMENT_OSMESA_PATH}/)
-            message(FATAL_ERROR "Cannot find specified OSMesa build directory: ${FILAMENT_OSMESA_PATH}")
-        endif()
-        set(FILAMENT_SUPPORTS_OSMESA TRUE)
-    endif()
-
    if (FILAMENT_SUPPORTS_WAYLAND)
        add_definitions(-DFILAMENT_SUPPORTS_WAYLAND)
        set(FILAMENT_SUPPORTS_X11 FALSE)
    elseif (FILAMENT_SUPPORTS_EGL_ON_LINUX)
        add_definitions(-DFILAMENT_SUPPORTS_EGL_ON_LINUX)
        set(FILAMENT_SUPPORTS_X11 FALSE)
-    elseif (FILAMENT_SUPPORTS_OSMESA)
-        set(FILAMENT_SUPPORTS_X11 FALSE)
-        add_definitions(-DFILAMENT_SUPPORTS_OSMESA)
    else ()
        if (FILAMENT_SUPPORTS_XCB)
            add_definitions(-DFILAMENT_SUPPORTS_XCB)
        endif()

+        # Default Swiftshader build does not enable the xlib extension
+        if (FILAMENT_SUPPORTS_XLIB AND FILAMENT_USE_SWIFTSHADER)
+            set(FILAMENT_SUPPORTS_XLIB OFF)
+        endif()
+
        if (FILAMENT_SUPPORTS_XLIB)
            add_definitions(-DFILAMENT_SUPPORTS_XLIB)
        endif()
@@ -182,6 +152,15 @@ if (NOT ANDROID AND NOT WEBGL AND NOT IOS AND NOT FILAMENT_LINUX_IS_MOBILE)
    set(IS_HOST_PLATFORM TRUE)
 endif()

+if (IOS)
+    # Remove the headerpad_max_install_names linker flag on iOS. It causes warnings when linking
+    # executables with bitcode.
+    string(REPLACE "-Wl,-headerpad_max_install_names" "" CMAKE_C_LINK_FLAGS ${CMAKE_C_LINK_FLAGS})
+    string(REPLACE "-Wl,-headerpad_max_install_names" "" CMAKE_CXX_LINK_FLAGS ${CMAKE_CXX_LINK_FLAGS})
+    string(REPLACE "-Wl,-headerpad_max_install_names" "" CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS ${CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS})
+    string(REPLACE "-Wl,-headerpad_max_install_names" "" CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS ${CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS})
+endif()
+
 if (WIN32)
    # Link statically against c/c++ lib to avoid missing redistriburable such as
    # "VCRUNTIME140.dll not found. Try reinstalling the app.", but give users
@@ -238,21 +217,6 @@ if (WIN32)
            # we don't need them on CI.
            string(REPLACE "/INCREMENTAL" "/INCREMENTAL:NO" ${LinkerFlag} ${${LinkerFlag}})
        endforeach()
-
-        # We turn off compile-time optimizations for CI, as options that speed up the compile-time
-        # (e.g. /MP) might increase memory usage, leading to instabilities on limited CI machines.
-        option(FILAMENT_SHORTEN_MSVC_COMPILATION "Shorten compile-time in Visual Studio" OFF)
-    else()
-        option(FILAMENT_SHORTEN_MSVC_COMPILATION "Shorten compile-time in Visual Studio" ON)
-    endif()
-
-    if (MSVC)
-        if (FILAMENT_SHORTEN_MSVC_COMPILATION)
-            # enable multi-processor compilation
-            set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP")
-            # disable run-time STL checks to improve tools (e.g. matc) performance
-            set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /D_ITERATOR_DEBUG_LEVEL=0")
-        endif()
    endif()
 endif()

@@ -336,6 +300,10 @@ if (FILAMENT_SUPPORTS_EGL_ON_LINUX)
  set(EGL TRUE)
 endif()

+if (FILAMENT_USE_SWIFTSHADER)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DFILAMENT_USE_SWIFTSHADER")
+endif()
+
 if (WIN32)
    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_USE_MATH_DEFINES=1")
 endif()
@@ -361,7 +329,6 @@ endif()

 if (CYGWIN)
    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-exceptions -fno-rtti")
-    set(SPIRV_CROSS_EXCEPTIONS_TO_ASSERTIONS ON)
 endif()

 if (MSVC)
@@ -389,9 +356,8 @@ endif()
 if (NOT MSVC AND NOT IOS)
    # Omitting stack frame pointers prevents the generation of readable stack traces in crash reports on iOS
    set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -fomit-frame-pointer")
-endif()

-if (NOT MSVC)
+    # These aren't compatible with -fembed-bitcode (and seem to have no effect on Apple platforms anyway)
    set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -ffunction-sections -fdata-sections")
 endif()

@@ -399,7 +365,6 @@ endif()
 # saved by -fno-exception and 10 KiB saved by -fno-rtti).
 if (ANDROID OR IOS OR WEBGL)
    set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -fno-exceptions -fno-rtti")
-    set(SPIRV_CROSS_EXCEPTIONS_TO_ASSERTIONS ON)

    if (ANDROID OR WEBGL)
        # Omitting unwind info prevents the generation of readable stack traces in crash reports on iOS
@@ -411,7 +376,6 @@ endif()
 # std::visit, which is not supported on iOS 11.0 when exceptions are enabled.
 if (IOS)
    set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -fno-exceptions")
-    set(SPIRV_CROSS_EXCEPTIONS_TO_ASSERTIONS ON)
 endif()

 # With WebGL, we disable RTTI even for debug builds because we pass emscripten::val back and forth
@@ -431,13 +395,7 @@ endif()
 if (FILAMENT_ENABLE_ASAN_UBSAN)
   set(EXTRA_SANITIZE_OPTIONS "-fsanitize=address -fsanitize=undefined")
 endif()
-if (FILAMENT_ENABLE_TSAN)
-   set(EXTRA_SANITIZE_OPTIONS "-fsanitize=thread")
-endif()
-if (ANDROID)
-    # keep STL debug infos (mimics what the NDK does)
-    set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -fno-limit-debug-info")
-endif()
+
 if (NOT MSVC AND NOT WEBGL)
    set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -fstack-protector")
 endif()
@@ -456,13 +414,8 @@ endif()
 if (NOT WEBGL)
    set(GC_SECTIONS "-Wl,--gc-sections")
 endif()
-
 set(B_SYMBOLIC_FUNCTIONS "-Wl,-Bsymbolic-functions")

-if (ANDROID)
-set(BINARY_ALIGNMENT "-Wl,-z,max-page-size=16384")
-endif()
-
 if (APPLE)
    set(GC_SECTIONS "-Wl,-dead_strip")
    set(B_SYMBOLIC_FUNCTIONS "")
@@ -476,7 +429,7 @@ if (APPLE)
 endif()

 set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${GC_SECTIONS}")
-set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${GC_SECTIONS} ${B_SYMBOLIC_FUNCTIONS} ${BINARY_ALIGNMENT}")
+set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${GC_SECTIONS} ${B_SYMBOLIC_FUNCTIONS}")

 if (WEBGL_PTHREADS)
    set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -pthread")
@@ -539,29 +492,6 @@ else()
    option(FILAMENT_DISABLE_MATOPT "Disable material optimizations" ON)
 endif()

-# This only affects the prebuilt shader files in gltfio and samples, not filament library.
-# The value can be either "instanced", "multiview", or "none"
-set(FILAMENT_SAMPLES_STEREO_TYPE "none" CACHE STRING
-    "Stereoscopic type that shader files in gltfio and samples are built for."
-)
-string(TOLOWER "${FILAMENT_SAMPLES_STEREO_TYPE}" FILAMENT_SAMPLES_STEREO_TYPE)
-if (NOT FILAMENT_SAMPLES_STEREO_TYPE STREQUAL "instanced"
-    AND NOT FILAMENT_SAMPLES_STEREO_TYPE STREQUAL "multiview"
-    AND NOT FILAMENT_SAMPLES_STEREO_TYPE STREQUAL "none")
-    message(FATAL_ERROR "Invalid stereo type: \"${FILAMENT_SAMPLES_STEREO_TYPE}\" choose either \"instanced\",  \"multiview\", or \"none\" ")
-endif ()
-
-# Compiling samples for multiview implies enabling multiview feature as well.
-if (FILAMENT_SAMPLES_STEREO_TYPE STREQUAL "multiview")
-    set(FILAMENT_ENABLE_MULTIVIEW ON)
-endif ()
-
-# Define backend flag for debug only
-if (CMAKE_BUILD_TYPE STREQUAL "Debug" AND NOT FILAMENT_BACKEND_DEBUG_FLAG STREQUAL "")
-    add_definitions(-DFILAMENT_BACKEND_DEBUG_FLAG=${FILAMENT_BACKEND_DEBUG_FLAG})
-    unset(FILAMENT_BACKEND_DEBUG_FLAG)
-endif()
-
 # ==================================================================================================
 # Material compilation flags
 # ==================================================================================================
@@ -585,11 +515,6 @@ if (FILAMENT_SUPPORTS_METAL)
    set(MATC_API_FLAGS ${MATC_API_FLAGS} -a metal)
 endif()

-# Disable ESSL 1.0 code generation.
-if (NOT FILAMENT_ENABLE_FEATURE_LEVEL_0)
-    set(MATC_API_FLAGS ${MATC_API_FLAGS} -1)
-endif()
-
 # Enable debug info (preserves names in SPIR-V)
 if (FILAMENT_ENABLE_MATDBG)
    set(MATC_OPT_FLAGS ${MATC_OPT_FLAGS} -d)
@@ -665,9 +590,9 @@ function(combine_static_libs TARGET OUTPUT DEPS)
    # Loop through the dependent libraries and query their location on disk.
    set(DEPS_FILES )
    foreach(DEPENDENCY ${DEPS})
-        if (TARGET ${DEPENDENCY})
+        if(TARGET ${DEPENDENCY})
            get_property(dep_type TARGET ${DEPENDENCY} PROPERTY TYPE)
-            if (dep_type STREQUAL "STATIC_LIBRARY")
+            if(dep_type STREQUAL "STATIC_LIBRARY")
                list(APPEND DEPS_FILES "$<TARGET_FILE:${DEPENDENCY}>")
            endif()
        endif()
@@ -690,6 +615,21 @@ else()
    set(IMPORT_EXECUTABLES ${FILAMENT}/${IMPORT_EXECUTABLES_DIR}/ImportExecutables-${CMAKE_BUILD_TYPE}.cmake)
 endif()

+# ==================================================================================================
+# Try to find Vulkan if the SDK is installed, otherwise fall back to the bundled version.
+# This needs to stay in our top-level CMakeLists because it sets up variables that are used by the
+# "bluevk" and "samples" targets.
+# ==================================================================================================
+
+if (FILAMENT_USE_SWIFTSHADER)
+    if (NOT FILAMENT_SUPPORTS_VULKAN)
+        message(ERROR "SwiftShader is only useful when Vulkan is enabled.")
+    endif()
+    find_library(SWIFTSHADER_VK NAMES vk_swiftshader HINTS "$ENV{SWIFTSHADER_LD_LIBRARY_PATH}")
+    message(STATUS "Found SwiftShader VK library in: ${SWIFTSHADER_VK}.")
+    add_definitions(-DFILAMENT_VKLIBRARY_PATH=\"${SWIFTSHADER_VK}\")
+endif()
+
 # ==================================================================================================
 # Common Functions
 # ==================================================================================================
@@ -722,7 +662,7 @@ function(get_resgen_vars ARCHIVE_DIR ARCHIVE_NAME)
        set(RESGEN_OUTPUTS "${OUTPUTS}" PARENT_SCOPE)
        set(RESGEN_FLAGS -qx ${ARCHIVE_DIR} -p ${ARCHIVE_NAME} PARENT_SCOPE)
        set(RESGEN_SOURCE "${ARCHIVE_DIR}/${ARCHIVE_NAME}${ASM_SUFFIX}.S" PARENT_SCOPE)
-        set(RESGEN_SOURCE_FLAGS "-I'${ARCHIVE_DIR}' ${ASM_ARCH_FLAG}" PARENT_SCOPE)
+        set(RESGEN_SOURCE_FLAGS "-I${ARCHIVE_DIR} ${ASM_ARCH_FLAG}" PARENT_SCOPE)
    endif()
 endfunction()

@@ -737,6 +677,7 @@ add_subdirectory(${LIBRARIES}/filabridge)
 add_subdirectory(${LIBRARIES}/filaflat)
 add_subdirectory(${LIBRARIES}/filagui)
 add_subdirectory(${LIBRARIES}/filameshio)
+add_subdirectory(${LIBRARIES}/geometry)
 add_subdirectory(${LIBRARIES}/gltfio)
 add_subdirectory(${LIBRARIES}/ibl)
 add_subdirectory(${LIBRARIES}/iblprefilter)
@@ -751,6 +692,7 @@ add_subdirectory(${FILAMENT}/filament)
 add_subdirectory(${FILAMENT}/shaders)
 add_subdirectory(${EXTERNAL}/basisu/tnt)
 add_subdirectory(${EXTERNAL}/civetweb/tnt)
+add_subdirectory(${EXTERNAL}/hat-trie/tnt)
 add_subdirectory(${EXTERNAL}/imgui/tnt)
 add_subdirectory(${EXTERNAL}/robin-map/tnt)
 add_subdirectory(${EXTERNAL}/smol-v/tnt)
@@ -763,9 +705,6 @@ add_subdirectory(${EXTERNAL}/jsmn/tnt)
 add_subdirectory(${EXTERNAL}/stb/tnt)
 add_subdirectory(${EXTERNAL}/getopt)

-# Note that this has to be placed after mikktspace in order for combine_static_libs to work.
-add_subdirectory(${LIBRARIES}/geometry)
-
 if (FILAMENT_BUILD_FILAMAT OR IS_HOST_PLATFORM)
    # spirv-tools must come before filamat, as filamat relies on the presence of the
    # spirv-tools_SOURCE_DIR variable.
@@ -783,8 +722,6 @@ endif()
 if (FILAMENT_SUPPORTS_VULKAN)
    add_subdirectory(${LIBRARIES}/bluevk)
    add_subdirectory(${EXTERNAL}/vkmemalloc/tnt)
-    set(SPIRV_HEADERS_SKIP_EXAMPLES ON)
-    add_subdirectory(${EXTERNAL}/spirv-headers)
 endif()

 set(FILAMENT_SAMPLES_BINARY_DIR ${PROJECT_BINARY_DIR}/samples)
@@ -817,9 +754,6 @@ if (IS_HOST_PLATFORM)
    add_subdirectory(${TOOLS}/glslminifier)
    add_subdirectory(${TOOLS}/matc)
    add_subdirectory(${TOOLS}/matinfo)
-    if (NOT WIN32)  # matedit not yet supported on Windows
-        add_subdirectory(${TOOLS}/matedit)
-    endif()
    add_subdirectory(${TOOLS}/mipgen)
    add_subdirectory(${TOOLS}/normal-blending)
    add_subdirectory(${TOOLS}/resgen)
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -27,7 +27,7 @@ again.

 ## Code Style

-See [CODE_STYLE.md](/CODE_STYLE.md)
+See [CodeStyle.md](/CODE_STYLE.md)

 ## Code reviews

--- a/NEW_RELEASE_NOTES.md
+++ b/NEW_RELEASE_NOTES.md
@@ -7,3 +7,9 @@ for next branch cut* header.
 appropriate header in [RELEASE_NOTES.md](./RELEASE_NOTES.md).

 ## Release notes for next branch cut
+
+- Fix possible NPE when updating fog options from Java/Kotlin
+- The `emissive` property was not applied properly to `MASKED` materials, and could cause
+  dark fringes to appear (recompile materials)
+- Allow glTF materials with transmission/volume extensions to choose their alpha mode
+  instead of forcing `MASKED`
--- a/README.md
+++ b/README.md
@@ -31,7 +31,7 @@ repositories {
 }

 dependencies {
-    implementation 'com.google.android.filament:filament-android:1.56.0'
+    implementation 'com.google.android.filament:filament-android:1.42.0'
 }
 ```

@@ -50,9 +50,19 @@ 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.56.0'
 ```
+pod 'Filament', '~> 1.42.0'
+```
+
+### Snapshots
+
+If you prefer to live on the edge, you can download a continuous build by following the following
+steps:
+
+1. Find the [commit](https://github.com/google/filament/commits/main) you're interested in.
+2. Click the green check mark under the commit message.
+3. Click on the _Details_ link for the platform you're interested in.
+4. On the top left click _Summary_, then in the _Artifacts_ section choose the desired artifact.

 ## Documentation

@@ -166,7 +176,6 @@ pod 'Filament', '~> 1.56.0'
  - [x] KHR_materials_unlit
  - [x] KHR_materials_variants
  - [x] KHR_materials_volume
-  - [x] KHR_materials_specular
  - [x] KHR_mesh_quantization
  - [x] KHR_texture_basisu
  - [x] KHR_texture_transform
--- a/RELEASE_GUIDE.md
+++ b/RELEASE_GUIDE.md
@@ -128,15 +128,3 @@ Navigate to [Filament's release
 workflow](https://github.com/google/filament/actions/workflows/release.yml). Hit the _Run workflow_
 dropdown. Modify _Platform to build_ and _Release tag to build_, then hit _Run workflow_. This will
 initiate a new release run.
-
-## 11. Kick off the npm and CocoaPods release jobs
-
-Navigate to [Filament's npm deploy
-workflow](https://github.com/google/filament/actions/workflows/npm-deploy.yml).
-Hit the _Run workflow_ dropdown. Modify _Release tag to deploy_ to the tag corresponding to this
-release (for example, v1.42.2).
-
-Navigate to [Filament's CocoaPods deploy
-workflow](https://github.com/google/filament/actions/workflows/cocopods-deploy.yml).
-Hit the _Run workflow_ dropdown. Modify _Release tag to deploy_ to the tag corresponding to this
-release (for example, v1.42.2).
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -7,230 +7,8 @@ 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.56.0
-
- backend: descriptor layouts distinguish samplers and external samplers (b/376089915) [⚠️ **New Material Version**]
-
-## v1.55.1
-
-
-## v1.55.0
- Add descriptor sets to describe shader resources. [⚠️ **New Material Version**]
-
-## v1.54.5
-
-
-## v1.54.4
-
- Add support for multi-layered render target with array textures.
-
-## v1.54.3
-
-
-## v1.54.2
-
- Add a `name` API to Filament objects for debugging handle use-after-free assertions
-
-## v1.54.1
-
-
-## v1.54.0
-
- materials: add a new `stereoscopicType` material parameter. [⚠️ **New Material Version**]
- Fix a crash when compiling shaders on IMG devices
-
-## v1.53.5
-
- engine: Fix bug causing certain sampler parameters to not be applied correctly in GLES 2.0 and on
-  certain GLES 3.0 drivers.
-
-## v1.53.4
-
-
-## v1.53.3
-
- Add drag and drop support for IBL files for desktop gltf_viewer.
-
-## v1.53.2
-
-
-## v1.53.1
-
-
-## v1.53.0
-
- engine: fix skinning normals with large transforms (b/342459864) [⚠️ **New Material Version**]
-
-## v1.52.3
-
-
-## v1.52.2
-
-
-## v1.52.1
-
- Add instructions for using Mesa for software rasterization
-
-## v1.51.9
-
-
-## v1.51.8
-
- filagui: Fix regression which broke WebGL
- Add a new Engine::Config setting to control preferred shader language
- Add `getEyeIndex` vertex API
- ios: Remove bitcode from iOS builds
-
-## v1.51.7
-
- Add new matedit tool
- filagui: Support rendering `GL_TEXTURE_EXTERNAL_OES` textures.
- `setFrameScheduledCallback` now takes a `utils::Invocable`.
- engine: Add `isPaused()`
-
-## v1.51.6
-
- Add new matedit tool
- filagui: Support rendering `GL_TEXTURE_EXTERNAL_OES` textures.
-
-## v1.51.5
-
-
-## v1.51.4
-
-
-## v1.51.3
-
-
-## v1.51.2
-
- engine: Add experimental APIs `Engine::builder::paused()` and `Engine::setPaused()`
-
-## v1.51.1
-
-
-## v1.51.0
-
- materials: add support for post-lighting mix factor (b/328498606) [⚠️ **New Material Version**]
-
-## v1.50.6
-
- Add new API `SwapChain::getFrameScheduledCallback`
- vulkan: fixed validation error VUID-vkAcquireNextImageKHR-semaphore-01779
- opengl: Add support for protected content swapchains and contexts
-
-## v1.50.5
-
- android: NDK 26.1.10909125 is used by default
- android: Minimum API level on Android is now API 21 instead of API 19. This allows the use of OpenGL ES 3.1
- rendering: New PBR Neutral tone mapper, designed to preserve materials color appearance
- android: Change default frameRateOptions.interval to 1.0
-
-## v1.50.4
-
-
-## v1.50.3
-
-
-## v1.50.2
-
-
-## v1.50.1
-
- Metal: fix some shader artifacts by disabling fast math optimizations.
- backend: remove `atan2` overload which had a typo and wasn't useful. Fixes b/320856413.
- utils: remove usages of `SpinLock`. Fixes b/321101014.
-
-## v1.50.0
- engine: TAA now supports 4x upscaling [BETA] [⚠️ **New Material Version**]
-
-## v1.49.3
-
- matc: Generate stereo variants for FL0 materials [⚠️ **Recompile materials**]
-
-## v1.49.2
-
-
-## v1.49.1
-
-
-## v1.49.0
-
- matc: Fix ESSL 1.0 codegen when using external samplers [⚠️ **Recompile materials**]
-
-## v1.48.0
-
- matc: New option `-1` to disable generation of ESSL 1.0 code in Feature Level 0 materials
- matc: Support optimizations for ESSL 1.0 code [⚠️ **Recompile materials**]
-
-## v1.47.0
-
- engine: Support up to 4 side-by-side stereoscopic eyes, configurable at Engine creation time. See
-  `Engine::Config::stereoscopicEyeCount`. [⚠️ **Recompile Materials**]
-
-## v1.46.0
-
- engine: Allow instantiating Engine at a given feature level via `Engine::Builder::featureLevel`
- matc: Enable `GL_OES_standard_derivatives` extension in ESSL 1.0 shaders
- matc: Fix code generation of double sided and masked materials in ESSL 1.0 shaders
- filagui: Add support for feature level 0
- matc: Add support for post-process materials in feature level 0
- engine: Add `Material::getFeatureLevel()`
- engine: Add missing `Material::getReflectionMode()` method in Java
- engine: Support basic usage of post-processing materials on feature level 0
- engine: Fix critical GLES 2.0 bugs
- engine: Add `FILAMENT_ENABLE_FEATURE_LEVEL_0` build-time option optionally allow building Filament
-  without FL0 support.
-
-## v1.45.1
-
- engine: Added parameter for configuring JobSystem thread count
- engine: In Java, introduce Engine.Builder
- gltfio: fix ubershader index for transmission&volume material
- engine: New tone mapper: `AgXTonemapper`.
- matinfo: Add support for viewing ESSL 1.0 shaders
- engine: Add `Renderer::getClearOptions()` [b/243846268]
- engine: Fix stable shadows (again) when an IBL rotation is used
-
-## v1.45.0
-
- materials: fix alpha masked materials when MSAA is turned on [⚠️ **Recompile materials**]
- materials: better support materials with custom depth [**Recompile Materials**]
- engine: fade shadows at shadowFar distance instead of hard cutoff [⚠️ **New Material Version**]
-
-## v1.44.0
-
- engine: add support for skinning with more than four bones per vertex.
- engine: remove `BloomOptions::anamorphism` which wasn't working well in most cases [**API CHANGE**]
- engine: new API to return a Material's supported variants, C++ only (b/297456590)
- build: fix emscripten-1.3.46 build
- engine: materials built for feature level 0 can now also be loaded in higher feature levels [⚠️
-  **New Material Version**]
-
-## v1.43.1
-
-## v1.43.0
-
- gltfio: Fix possible change of scale sign when decomposing transform matrix for animation
- engine: Fixes "stable" shadows (see b/299310624)
-
-## v1.42.2
-
- Fix possible NPE when updating fog options from Java/Kotlin
- The `emissive` property was not applied properly to `MASKED` materials, and could cause
-  dark fringes to appear (recompile materials)
- Allow glTF materials with transmission/volume extensions to choose their alpha mode
-  instead of forcing `MASKED`
- Fix a crash in gltfio when not using ubershaders
- Use flatmat for mat parameter in jsbinding
- Fix TextureFlags for sheenRoughnessMap when textures of sheenRoughnessMap and sheenColorMap is same
- Directional shadows can now be transformed (b/297095805)
-
 ## v1.42.1

- Fix potential `EXC_BAD_ACCESS` with Metal backend: b/297059776
- `setFrameCompletedCallback` now takes a `backend::CallbackHandler`.
-
 ## v1.42.0

 - engine: add preliminary support for instanced stereoscopic rendering [⚠️ **Recompile materials**]
@@ -658,7 +436,7 @@ Instead, if you are authoring a PR for the main branch, add your release note to

 - engine: Binary size improvements.
 - engine: Add basic support for instanced renderables [**NEW API**].
- engine: Fix, first imaged passed to `Stream::SetAcquiredImage` is ignored and leaked.
+- engine: Fix, first imaged passsed to `Stream::SetAcquiredImage` is ignored and leaked.
 - Vulkan: Robustness improvements.
 - Java: Fix, lookAt z axis negated.
 - gltfio: Be graceful when model has > 4 weights per vert.
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -80,15 +80,15 @@ buildscript {

    ext.versions = [
        'jdk': 17,
-        'minSdk': 21,
-        'targetSdk': 34,
-        'compileSdk': 34,
-        'kotlin': '2.0.21',
-        'kotlin_coroutines': '1.9.0',
-        'buildTools': '35.0.0',
-        'ndk': '27.0.11718014',
-        'androidx_core': '1.13.1',
-        'androidx_annotations': '1.9.0'
+        'minSdk': 19,
+        'targetSdk': 33,
+        'compileSdk': 33,
+        'kotlin': '1.9.0',
+        'kotlin_coroutines': '1.7.2',
+        'buildTools': '34.0.0',
+        'ndk': '25.1.8937393',
+        'androidx_core': '1.10.1',
+        'androidx_annotations': '1.6.0'
    ]

    ext.deps = [
@@ -104,7 +104,7 @@ buildscript {
    ]

    dependencies {
-        classpath 'com.android.tools.build:gradle:8.6.1'
+        classpath 'com.android.tools.build:gradle:8.1.0'
        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${versions.kotlin}"
    }

--- a/android/filamat-android/CMakeLists.txt
+++ b/android/filamat-android/CMakeLists.txt
@@ -6,6 +6,9 @@ option(FILAMENT_ENABLE_MATDBG "Enables Material debugger" OFF)
 set(FILAMENT_DIR ${FILAMENT_DIST_DIR})

 set(FILAMAT_FLAVOR "filamat")
+if(FILAMAT_LITE)
+    set(FILAMAT_FLAVOR "filamat_lite")
+endif()

 if (FILAMENT_SUPPORTS_VULKAN)
    message("Library filamat ignores Vulkan settings")
@@ -38,7 +41,6 @@ set(FILAMAT_INCLUDE_DIRS
 include_directories(${FILAMENT_DIR}/include)

 set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} -Wl,--version-script=${CMAKE_SOURCE_DIR}/libfilamat-jni.map")
-set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-z,max-page-size=16384")

 add_library(filamat-jni SHARED src/main/cpp/MaterialBuilder.cpp)
 target_include_directories(filamat-jni PRIVATE ${FILAMAT_INCLUDE_DIRS})
--- a/android/filamat-android/build.gradle
+++ b/android/filamat-android/build.gradle
@@ -1,8 +1,29 @@
 android {
    namespace 'com.google.android.filament.filamat'

+    flavorDimensions "functionality"
+    productFlavors {
+        full {
+            dimension "functionality"
+        }
+
+        lite {
+            dimension "functionality"
+
+            externalNativeBuild {
+                cmake {
+                    arguments.add("-DFILAMAT_LITE=ON")
+                }
+            }
+        }
+    }
+
    publishing {
-        singleVariant("release") {
+        singleVariant("fullRelease") {
+            withSourcesJar()
+            withJavadocJar()
+        }
+        singleVariant("liteRelease") {
            withSourcesJar()
            withJavadocJar()
        }
@@ -18,9 +39,14 @@ apply from: rootProject.file('gradle/gradle-mvn-push.gradle')
 afterEvaluate { project ->
    publishing {
        publications {
-            release(MavenPublication) {
+            fullRelease(MavenPublication) {
                artifactId = POM_ARTIFACT_ID_FULL
-                from components.release
+                from components.fullRelease
+            }
+
+            liteRelease(MavenPublication) {
+                artifactId = POM_ARTIFACT_ID_LITE
+                from components.liteRelease
            }
        }
    }
--- a/android/filament-android/CMakeLists.txt
+++ b/android/filament-android/CMakeLists.txt
@@ -59,7 +59,6 @@ endif()

 set(VERSION_SCRIPT "${CMAKE_CURRENT_SOURCE_DIR}/libfilament-jni.map")
 set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} -Wl,--version-script=${VERSION_SCRIPT}")
-set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-z,max-page-size=16384")

 add_library(filament-jni SHARED
    src/main/cpp/BufferObject.cpp
--- a/android/filament-android/src/main/cpp/Engine.cpp
+++ b/android/filament-android/src/main/cpp/Engine.cpp
@@ -25,8 +25,15 @@
 using namespace filament;
 using namespace utils;

+extern "C" JNIEXPORT jlong JNICALL
+Java_com_google_android_filament_Engine_nCreateEngine(JNIEnv*, jclass, jlong backend,
+        jlong sharedContext) {
+    return (jlong) Engine::create((Engine::Backend) backend, nullptr, (void*) sharedContext);
+}
+
 extern "C" JNIEXPORT void JNICALL
-Java_com_google_android_filament_Engine_nDestroyEngine(JNIEnv*, jclass, jlong nativeEngine) {
+Java_com_google_android_filament_Engine_nDestroyEngine(JNIEnv*, jclass,
+        jlong nativeEngine) {
    Engine* engine = (Engine*) nativeEngine;
    Engine::destroy(&engine);
 }
@@ -342,21 +349,6 @@ Java_com_google_android_filament_Engine_nIsValidMaterial(JNIEnv*, jclass,
    return (jboolean)engine->isValid((Material*)nativeMaterial);
 }

-extern "C" JNIEXPORT jboolean JNICALL
-Java_com_google_android_filament_Engine_nIsValidMaterialInstance(JNIEnv*, jclass,
-        jlong nativeEngine, jlong nativeMaterial, jlong nativeMaterialInstance) {
-    Engine* engine = (Engine *)nativeEngine;
-    return (jboolean)engine->isValid((Material*)nativeMaterial,
-            (MaterialInstance*)nativeMaterialInstance);
-}
-
-extern "C" JNIEXPORT jboolean JNICALL
-        Java_com_google_android_filament_Engine_nIsValidExpensiveMaterialInstance(JNIEnv*, jclass,
-        jlong nativeEngine, jlong nativeMaterialInstance) {
-    Engine* engine = (Engine *)nativeEngine;
-    return (jboolean)engine->isValidExpensive((MaterialInstance*)nativeMaterialInstance);
-}
-
 extern "C" JNIEXPORT jboolean JNICALL
 Java_com_google_android_filament_Engine_nIsValidSkybox(JNIEnv*, jclass,
        jlong nativeEngine, jlong nativeSkybox) {
@@ -399,34 +391,6 @@ Java_com_google_android_filament_Engine_nFlushAndWait(JNIEnv*, jclass,
    engine->flushAndWait();
 }

-extern "C" JNIEXPORT void JNICALL
-Java_com_google_android_filament_Engine_nFlush(JNIEnv*, jclass,
-        jlong nativeEngine) {
-    Engine* engine = (Engine*) nativeEngine;
-    engine->flush();
-}
-
-extern "C" JNIEXPORT jboolean JNICALL
-Java_com_google_android_filament_Engine_nIsPaused(JNIEnv*, jclass,
-        jlong nativeEngine) {
-    Engine* engine = (Engine*) nativeEngine;
-    return (jboolean)engine->isPaused();
-}
-
-extern "C" JNIEXPORT void JNICALL
-Java_com_google_android_filament_Engine_nSetPaused(JNIEnv*, jclass,
-        jlong nativeEngine, jboolean paused) {
-    Engine* engine = (Engine*) nativeEngine;
-    engine->setPaused(paused);
-}
-
-extern "C" JNIEXPORT void JNICALL
-Java_com_google_android_filament_Engine_nUnprotected(JNIEnv*, jclass,
-        jlong nativeEngine, jboolean paused) {
-    Engine* engine = (Engine*) nativeEngine;
-    engine->unprotected();
-}
-
 // Managers...

 extern "C" JNIEXPORT jlong JNICALL
@@ -471,13 +435,6 @@ Java_com_google_android_filament_Engine_nIsAutomaticInstancingEnabled(JNIEnv*, j
    return (jboolean)engine->isAutomaticInstancingEnabled();
 }

-extern "C" JNIEXPORT jlong JNICALL
-Java_com_google_android_filament_Engine_nGetMaxStereoscopicEyes(JNIEnv*, jclass, jlong nativeEngine) {
-    Engine* engine = (Engine*) nativeEngine;
-    return (jlong) engine->getMaxStereoscopicEyes();
-}
-
-
 extern "C" JNIEXPORT jint JNICALL
 Java_com_google_android_filament_Engine_nGetSupportedFeatureLevel(JNIEnv *, jclass,
        jlong nativeEngine) {
@@ -497,82 +454,4 @@ Java_com_google_android_filament_Engine_nGetActiveFeatureLevel(JNIEnv *, jclass,
        jlong nativeEngine) {
    Engine* engine = (Engine*) nativeEngine;
    return (jint)engine->getActiveFeatureLevel();
-}
-
-extern "C" JNIEXPORT jlong JNICALL Java_com_google_android_filament_Engine_nCreateBuilder(JNIEnv*,
-        jclass) {
-    Engine::Builder* builder = new Engine::Builder{};
-    return (jlong) builder;
-}
-
-extern "C" JNIEXPORT void JNICALL Java_com_google_android_filament_Engine_nDestroyBuilder(JNIEnv*,
-        jclass, jlong nativeBuilder) {
-    Engine::Builder* builder = (Engine::Builder*) nativeBuilder;
-    delete builder;
-}
-
-extern "C" JNIEXPORT void JNICALL Java_com_google_android_filament_Engine_nSetBuilderBackend(
-        JNIEnv*, jclass, jlong nativeBuilder, jlong backend) {
-    Engine::Builder* builder = (Engine::Builder*) nativeBuilder;
-    builder->backend((Engine::Backend) backend);
-}
-
-extern "C" JNIEXPORT void JNICALL Java_com_google_android_filament_Engine_nSetBuilderConfig(JNIEnv*,
-        jclass, jlong nativeBuilder, jlong commandBufferSizeMB, jlong perRenderPassArenaSizeMB,
-        jlong driverHandleArenaSizeMB, jlong minCommandBufferSizeMB, jlong perFrameCommandsSizeMB,
-        jlong jobSystemThreadCount, jboolean disableParallelShaderCompile,
-        jint stereoscopicType, jlong stereoscopicEyeCount,
-        jlong resourceAllocatorCacheSizeMB, jlong resourceAllocatorCacheMaxAge,
-        jboolean disableHandleUseAfterFreeCheck,
-        jint preferredShaderLanguage,
-        jboolean forceGLES2Context, jboolean assertNativeWindowIsValid) {
-    Engine::Builder* builder = (Engine::Builder*) nativeBuilder;
-    Engine::Config config = {
-            .commandBufferSizeMB = (uint32_t) commandBufferSizeMB,
-            .perRenderPassArenaSizeMB = (uint32_t) perRenderPassArenaSizeMB,
-            .driverHandleArenaSizeMB = (uint32_t) driverHandleArenaSizeMB,
-            .minCommandBufferSizeMB = (uint32_t) minCommandBufferSizeMB,
-            .perFrameCommandsSizeMB = (uint32_t) perFrameCommandsSizeMB,
-            .jobSystemThreadCount = (uint32_t) jobSystemThreadCount,
-            .disableParallelShaderCompile = (bool) disableParallelShaderCompile,
-            .stereoscopicType = (Engine::StereoscopicType) stereoscopicType,
-            .stereoscopicEyeCount = (uint8_t) stereoscopicEyeCount,
-            .resourceAllocatorCacheSizeMB = (uint32_t) resourceAllocatorCacheSizeMB,
-            .resourceAllocatorCacheMaxAge = (uint8_t) resourceAllocatorCacheMaxAge,
-            .disableHandleUseAfterFreeCheck = (bool) disableHandleUseAfterFreeCheck,
-            .preferredShaderLanguage = (Engine::Config::ShaderLanguage) preferredShaderLanguage,
-            .forceGLES2Context = (bool) forceGLES2Context,
-            .assertNativeWindowIsValid = (bool) assertNativeWindowIsValid,
-    };
-    builder->config(&config);
-}
-
-extern "C" JNIEXPORT void JNICALL Java_com_google_android_filament_Engine_nSetBuilderFeatureLevel(
-        JNIEnv*, jclass, jlong nativeBuilder, jint ordinal) {
-    Engine::Builder* builder = (Engine::Builder*) nativeBuilder;
-    builder->featureLevel((Engine::FeatureLevel)ordinal);
-}
-
-extern "C" JNIEXPORT void JNICALL Java_com_google_android_filament_Engine_nSetBuilderSharedContext(
-        JNIEnv*, jclass, jlong nativeBuilder, jlong sharedContext) {
-    Engine::Builder* builder = (Engine::Builder*) nativeBuilder;
-    builder->sharedContext((void*) sharedContext);
-}
-
-extern "C" JNIEXPORT void JNICALL Java_com_google_android_filament_Engine_nSetBuilderPaused(
-        JNIEnv*, jclass, jlong nativeBuilder, jboolean paused) {
-    Engine::Builder* builder = (Engine::Builder*) nativeBuilder;
-    builder->paused((bool) paused);
-}
-
-extern "C" JNIEXPORT jlong JNICALL
-Java_com_google_android_filament_Engine_nBuilderBuild(JNIEnv*, jclass, jlong nativeBuilder) {
-    Engine::Builder* builder = (Engine::Builder*) nativeBuilder;
-    return (jlong) builder->build();
-}
-
-extern "C"
-JNIEXPORT jlong JNICALL
-Java_com_google_android_filament_Engine_getSteadyClockTimeNano(JNIEnv *env, jclass clazz) {
-    return (jlong)Engine::getSteadyClockTimeNano();
-}
+}
--- a/android/filament-android/src/main/cpp/EntityManager.cpp
+++ b/android/filament-android/src/main/cpp/EntityManager.cpp
@@ -38,7 +38,7 @@ Java_com_google_android_filament_EntityManager_nCreateArray(JNIEnv* env, jclass,
    // (which it is), but still.
    em->create((size_t) n, reinterpret_cast<Entity *>(entities));

-    env->ReleaseIntArrayElements(entities_, entities, JNI_ABORT);
+    env->ReleaseIntArrayElements(entities_, entities, 0);
 }

 extern "C" JNIEXPORT jint JNICALL
--- a/android/filament-android/src/main/cpp/LightManager.cpp
+++ b/android/filament-android/src/main/cpp/LightManager.cpp
@@ -79,8 +79,7 @@ Java_com_google_android_filament_LightManager_nBuilderShadowOptions(JNIEnv* env,
        jfloat shadowFarHint, jboolean stable, jboolean lispsm,
        jfloat polygonOffsetConstant, jfloat polygonOffsetSlope,
        jboolean screenSpaceContactShadows, jint stepCount,
-        jfloat maxShadowDistance, jboolean elvsm, jfloat blurWidth, jfloat shadowBulbRadius,
-        jfloatArray transform) {
+        jfloat maxShadowDistance, jboolean elvsm, jfloat blurWidth, jfloat shadowBulbRadius) {
    LightManager::Builder *builder = (LightManager::Builder *) nativeBuilder;
    LightManager::ShadowOptions shadowOptions {
            .mapSize = (uint32_t)mapSize,
@@ -103,18 +102,12 @@ Java_com_google_android_filament_LightManager_nBuilderShadowOptions(JNIEnv* env,
            },
            .shadowBulbRadius = shadowBulbRadius
    };
-
    jfloat *nativeSplits = env->GetFloatArrayElements(splitPositions, NULL);
    const jsize splitCount = std::min((jsize) 3, env->GetArrayLength(splitPositions));
-    std::copy_n(nativeSplits, splitCount, shadowOptions.cascadeSplitPositions);
+    for (jsize i = 0; i < splitCount; i++) {
+        shadowOptions.cascadeSplitPositions[i] = nativeSplits[i];
+    }
    env->ReleaseFloatArrayElements(splitPositions, nativeSplits, 0);
-
-    jfloat* nativeTransform = env->GetFloatArrayElements(transform, NULL);
-    std::copy_n(nativeTransform,
-                std::min(4, env->GetArrayLength(transform)),
-                shadowOptions.transform.xyzw.v);
-    env->ReleaseFloatArrayElements(transform, nativeTransform, 0);
-
    builder->shadowOptions(shadowOptions);
 }

--- a/android/filament-android/src/main/cpp/Material.cpp
+++ b/android/filament-android/src/main/cpp/Material.cpp
@@ -19,23 +19,17 @@
 #include <filament/Material.h>

 #include "common/NioUtils.h"
-#include "common/CallbackUtils.h"

 using namespace filament;

 extern "C" JNIEXPORT jlong JNICALL
 Java_com_google_android_filament_Material_nBuilderBuild(JNIEnv *env, jclass,
-        jlong nativeEngine, jobject buffer_, jint size, jint shBandCount) {
+        jlong nativeEngine, jobject buffer_, jint size) {
    Engine* engine = (Engine*) nativeEngine;
    AutoBuffer buffer(env, buffer_, size);
-    auto builder = Material::Builder();
-    if (shBandCount) {
-        builder.sphericalHarmonicsBandCount(shBandCount);
-    }
-    Material* material = builder
+    Material* material = Material::Builder()
            .package(buffer.getData(), buffer.getSize())
            .build(*engine);
-
    return (jlong) material;
 }

@@ -111,22 +105,6 @@ Java_com_google_android_filament_Material_nGetRefractionType(JNIEnv*, jclass,
    return (jint) material->getRefractionType();
 }

-extern "C"
-JNIEXPORT jint JNICALL
-Java_com_google_android_filament_Material_nGetReflectionMode(JNIEnv*, jclass,
-        jlong nativeMaterial) {
-    Material* material = (Material*) nativeMaterial;
-    return (jint) material->getReflectionMode();
-}
-
-extern "C"
-JNIEXPORT jint JNICALL
-Java_com_google_android_filament_Material_nGetFeatureLevel(JNIEnv*, jclass,
-        jlong nativeMaterial) {
-    Material* material = (Material*) nativeMaterial;
-    return (jint) material->getFeatureLevel();
-}
-
 extern "C"
 JNIEXPORT jint JNICALL
 Java_com_google_android_filament_Material_nGetVertexDomain(JNIEnv*, jclass,
@@ -277,17 +255,3 @@ Java_com_google_android_filament_Material_nHasParameter(JNIEnv* env, jclass,
    env->ReleaseStringUTFChars(name_, name);
    return (jboolean) hasParameter;
 }
-
-extern "C"
-JNIEXPORT void JNICALL
-Java_com_google_android_filament_Material_nCompile(JNIEnv *env, jclass clazz,
-        jlong nativeMaterial, jint priority, jint variants, jobject handler, jobject runnable) {
-    Material* material = (Material*) nativeMaterial;
-    JniCallback* jniCallback = JniCallback::make(env, handler, runnable);
-    material->compile(
-            (Material::CompilerPriorityQueue) priority,
-            (UserVariantFilterBit) variants,
-            jniCallback->getHandler(), [jniCallback](Material*){
-                JniCallback::postToJavaAndDestroy(jniCallback);
-            });
-}
--- a/android/filament-android/src/main/cpp/MaterialInstance.cpp
+++ b/android/filament-android/src/main/cpp/MaterialInstance.cpp
@@ -205,7 +205,7 @@ Java_com_google_android_filament_MaterialInstance_nSetIntParameterArray(JNIEnv *
            break;
    }

-    env->ReleaseIntArrayElements(v_, v, JNI_ABORT);
+    env->ReleaseIntArrayElements(v_, v, 0);

    env->ReleaseStringUTFChars(name_, name);
 }
--- a/android/filament-android/src/main/cpp/RenderableManager.cpp
+++ b/android/filament-android/src/main/cpp/RenderableManager.cpp
@@ -104,14 +104,6 @@ Java_com_google_android_filament_RenderableManager_nBuilderGeometry__JIIJJIIII(J
            (size_t) count);
 }

-extern "C"
-JNIEXPORT void JNICALL
-Java_com_google_android_filament_RenderableManager_nBuilderGeometryType(JNIEnv*, jclass,
-        jlong nativeBuilder, int type) {
-    RenderableManager::Builder *builder = (RenderableManager::Builder *) nativeBuilder;
-    builder->geometryType((RenderableManager::Builder::GeometryType)type);
-}
-
 extern "C"
 JNIEXPORT void JNICALL
 Java_com_google_android_filament_RenderableManager_nBuilderMaterial(JNIEnv*, jclass,
@@ -245,18 +237,12 @@ Java_com_google_android_filament_RenderableManager_nBuilderMorphing(JNIEnv*, jcl
 }

 extern "C" JNIEXPORT void JNICALL
-Java_com_google_android_filament_RenderableManager_nBuilderMorphingStandard(JNIEnv*, jclass,
-        jlong nativeBuilder, jlong nativeMorphTargetBuffer) {
+Java_com_google_android_filament_RenderableManager_nBuilderSetMorphTargetBufferAt(JNIEnv*, jclass,
+        jlong nativeBuilder, int level, int primitiveIndex, jlong nativeMorphTargetBuffer,
+        int offset, int count) {
    RenderableManager::Builder *builder = (RenderableManager::Builder *) nativeBuilder;
    MorphTargetBuffer *morphTargetBuffer = (MorphTargetBuffer *) nativeMorphTargetBuffer;
-    builder->morphing(morphTargetBuffer);
-}
-
-extern "C" JNIEXPORT void JNICALL
-Java_com_google_android_filament_RenderableManager_nBuilderSetMorphTargetBufferOffsetAt(JNIEnv*, jclass,
-        jlong nativeBuilder, int level, int primitiveIndex, int offset) {
-    RenderableManager::Builder *builder = (RenderableManager::Builder *) nativeBuilder;
-    builder->morphing(level, primitiveIndex, offset);
+    builder->morphing(level, primitiveIndex, morphTargetBuffer, offset, count);
 }

 extern "C" JNIEXPORT void JNICALL
@@ -328,12 +314,13 @@ Java_com_google_android_filament_RenderableManager_nSetMorphWeights(JNIEnv* env,
 }

 extern "C" JNIEXPORT void JNICALL
-Java_com_google_android_filament_RenderableManager_nSetMorphTargetBufferOffsetAt(JNIEnv*,
+Java_com_google_android_filament_RenderableManager_nSetMorphTargetBufferAt(JNIEnv*,
        jclass, jlong nativeRenderableManager, jint i, int level, jint primitiveIndex,
-        jlong, jint offset) {
+        jlong nativeMorphTargetBuffer, jint offset, jint count) {
    RenderableManager *rm = (RenderableManager *) nativeRenderableManager;
-    rm->setMorphTargetBufferOffsetAt((RenderableManager::Instance) i, (uint8_t) level,
-            (size_t) primitiveIndex, (size_t) offset);
+    MorphTargetBuffer *morphTargetBuffer = (MorphTargetBuffer *) nativeMorphTargetBuffer;
+    rm->setMorphTargetBufferAt((RenderableManager::Instance) i, (uint8_t) level,
+            (size_t) primitiveIndex, morphTargetBuffer, (size_t) offset, (size_t) count);
 }

 extern "C" JNIEXPORT jint JNICALL
--- a/android/filament-android/src/main/cpp/Renderer.cpp
+++ b/android/filament-android/src/main/cpp/Renderer.cpp
@@ -28,14 +28,6 @@
 using namespace filament;
 using namespace backend;

-
-extern "C" JNIEXPORT void JNICALL
-Java_com_google_android_filament_Renderer_nSkipFrame(JNIEnv *, jclass, jlong nativeRenderer,
-        jlong vsyncSteadyClockTimeNano) {
-    Renderer *renderer = (Renderer *) nativeRenderer;
-    renderer->skipFrame(uint64_t(vsyncSteadyClockTimeNano));
-}
-
 extern "C" JNIEXPORT jboolean JNICALL
 Java_com_google_android_filament_Renderer_nBeginFrame(JNIEnv *, jclass, jlong nativeRenderer,
        jlong nativeSwapChain, jlong frameTimeNanos) {
@@ -195,10 +187,3 @@ Java_com_google_android_filament_Renderer_nSetPresentationTime(JNIEnv *, jclass
    Renderer *renderer = (Renderer *) nativeRenderer;
    renderer->setPresentationTime(monotonicClockNanos);
 }
-
-extern "C" JNIEXPORT void JNICALL
-Java_com_google_android_filament_Renderer_nSetVsyncTime(JNIEnv *, jclass,
-    jlong nativeRenderer, jlong steadyClockTimeNano) {
-    Renderer *renderer = (Renderer *) nativeRenderer;
-    renderer->setVsyncTime(steadyClockTimeNano);
-}
--- a/android/filament-android/src/main/cpp/Scene.cpp
+++ b/android/filament-android/src/main/cpp/Scene.cpp
@@ -71,13 +71,6 @@ Java_com_google_android_filament_Scene_nRemoveEntities(JNIEnv *env, jclass type,
    env->ReleaseIntArrayElements(entities, (jint*) nativeEntities, JNI_ABORT);
 }

-extern "C" JNIEXPORT jint JNICALL
-Java_com_google_android_filament_Scene_nGetEntityCount(JNIEnv *env, jclass type,
-        jlong nativeScene) {
-    Scene* scene = (Scene*) nativeScene;
-    return (jint) scene->getEntityCount();
-}
-
 extern "C" JNIEXPORT jint JNICALL
 Java_com_google_android_filament_Scene_nGetRenderableCount(JNIEnv *env, jclass type,
        jlong nativeScene) {
@@ -98,22 +91,3 @@ Java_com_google_android_filament_Scene_nHasEntity(JNIEnv *env, jclass type, jlon
    Entity entity = Entity::import(entityId);
    return (jboolean) scene->hasEntity(entity);
 }
-
-extern "C"
-JNIEXPORT jboolean JNICALL
-Java_com_google_android_filament_Scene_nGetEntities(JNIEnv *env, jclass ,
-        jlong nativeScene, jintArray outArray, jint length) {
-    Scene const* const scene = (Scene*) nativeScene;
-    if (length < scene->getEntityCount()) {
-        // should not happen because we already checked on the java side
-        return JNI_FALSE;
-    }
-    jint *out = (jint *) env->GetIntArrayElements(outArray, nullptr);
-    scene->forEach([out, length, i = 0](Entity entity)mutable {
-        if (i < length) { // this is just paranoia here
-            out[i++] = (jint) entity.getId();
-        }
-    });
-    env->ReleaseIntArrayElements(outArray, (jint*) out, 0);
-    return JNI_TRUE;
-}
--- a/android/filament-android/src/main/cpp/SwapChain.cpp
+++ b/android/filament-android/src/main/cpp/SwapChain.cpp
@@ -34,15 +34,7 @@ Java_com_google_android_filament_SwapChain_nSetFrameCompletedCallback(JNIEnv* en
 }

 extern "C" JNIEXPORT jboolean JNICALL
-Java_com_google_android_filament_SwapChain_nIsSRGBSwapChainSupported(
-        JNIEnv *, jclass, jlong nativeEngine) {
+Java_com_google_android_filament_SwapChain_nIsSRGBSwapChainSupported(JNIEnv *, jclass, jlong nativeEngine) {
    Engine* engine = (Engine*) nativeEngine;
-    return (jboolean)SwapChain::isSRGBSwapChainSupported(*engine);
-}
-
-extern "C" JNIEXPORT jboolean JNICALL
-Java_com_google_android_filament_SwapChain_nIsProtectedContentSupported(
-        JNIEnv *, jclass, jlong nativeEngine) {
-    Engine* engine = (Engine*) nativeEngine;
-    return (jboolean)SwapChain::isProtectedContentSupported(*engine);
+    return (bool)SwapChain::isSRGBSwapChainSupported(*engine);
 }
--- a/android/filament-android/src/main/cpp/ToneMapper.cpp
+++ b/android/filament-android/src/main/cpp/ToneMapper.cpp
@@ -47,16 +47,6 @@ Java_com_google_android_filament_ToneMapper_nCreateFilmicToneMapper(JNIEnv*, jcl
    return (jlong) new FilmicToneMapper();
 }

-extern "C" JNIEXPORT jlong JNICALL
-Java_com_google_android_filament_ToneMapper_nCreatePBRNeutralToneMapper(JNIEnv*, jclass) {
-    return (jlong) new PBRNeutralToneMapper();
-}
-
-extern "C" JNIEXPORT jlong JNICALL
-Java_com_google_android_filament_ToneMapper_nCreateAgxToneMapper(JNIEnv*, jclass, jint look) {
-    return (jlong) new AgxToneMapper(AgxToneMapper::AgxLook(look));
-}
-
 extern "C" JNIEXPORT jlong JNICALL
 Java_com_google_android_filament_ToneMapper_nCreateGenericToneMapper(JNIEnv*, jclass,
        jfloat contrast, jfloat midGrayIn, jfloat midGrayOut, jfloat hdrMax) {
--- a/android/filament-android/src/main/cpp/View.cpp
+++ b/android/filament-android/src/main/cpp/View.cpp
@@ -49,12 +49,6 @@ Java_com_google_android_filament_View_nSetCamera(JNIEnv*, jclass,
    view->setCamera(camera);
 }

-extern "C" JNIEXPORT jboolean JNICALL
-Java_com_google_android_filament_View_nHasCamera(JNIEnv*, jclass, jlong nativeView) {
-    View* view = (View*) nativeView;
-    return (jboolean)view->hasCamera();
-}
-
 extern "C" JNIEXPORT void JNICALL
 Java_com_google_android_filament_View_nSetColorGrading(JNIEnv*, jclass,
        jlong nativeView, jlong nativeColorGrading) {
@@ -222,20 +216,6 @@ Java_com_google_android_filament_View_nIsFrontFaceWindingInverted(JNIEnv*,
    return static_cast<jboolean>(view->isFrontFaceWindingInverted());
 }

-extern "C" JNIEXPORT void JNICALL
-Java_com_google_android_filament_View_nSetTransparentPickingEnabled(JNIEnv*,
-        jclass, jlong nativeView, jboolean enabled) {
-    View* view = (View*) nativeView;
-    view->setTransparentPickingEnabled(enabled);
-}
-
-extern "C" JNIEXPORT jboolean JNICALL
-Java_com_google_android_filament_View_nIsTransparentPickingEnabled(JNIEnv*,
-        jclass, jlong nativeView) {
-    View* view = (View*) nativeView;
-    return static_cast<jboolean>(view->isTransparentPickingEnabled());
-}
-
 extern "C" JNIEXPORT void JNICALL
 Java_com_google_android_filament_View_nSetAmbientOcclusion(JNIEnv*, jclass, jlong nativeView, jint ordinal) {
    View* view = (View*) nativeView;
@@ -302,7 +282,7 @@ Java_com_google_android_filament_View_nSetSSCTOptions(JNIEnv *, jclass, jlong na
 extern "C" JNIEXPORT void JNICALL
 Java_com_google_android_filament_View_nSetBloomOptions(JNIEnv*, jclass,
        jlong nativeView, jlong nativeTexture,
-        jfloat dirtStrength, jfloat strength, jint resolution, jint levels,
+        jfloat dirtStrength, jfloat strength, jint resolution, jfloat anamorphism, jint levels,
        jint blendMode, jboolean threshold, jboolean enabled, jfloat highlight,
        jboolean lensFlare, jboolean starburst, jfloat chromaticAberration, jint ghostCount,
        jfloat ghostSpacing, jfloat ghostThreshold, jfloat haloThickness, jfloat haloRadius,
@@ -314,6 +294,7 @@ Java_com_google_android_filament_View_nSetBloomOptions(JNIEnv*, jclass,
            .dirtStrength = dirtStrength,
            .strength = strength,
            .resolution = (uint32_t)resolution,
+            .anamorphism = anamorphism,
            .levels = (uint8_t)levels,
            .blendMode = (View::BloomOptions::BlendMode)blendMode,
            .threshold = (bool)threshold,
@@ -500,17 +481,6 @@ Java_com_google_android_filament_View_nIsStencilBufferEnabled(JNIEnv *, jclass,
    return view->isStencilBufferEnabled();
 }

-extern "C"
-JNIEXPORT void JNICALL
-Java_com_google_android_filament_View_nSetStereoscopicOptions(JNIEnv *, jclass, jlong nativeView,
-        jboolean enabled) {
-    View* view = (View*) nativeView;
-    View::StereoscopicOptions options {
-        .enabled = (bool) enabled
-    };
-    view->setStereoscopicOptions(options);
-}
-
 extern "C"
 JNIEXPORT void JNICALL
 Java_com_google_android_filament_View_nSetGuardBandOptions(JNIEnv *, jclass,
@@ -545,12 +515,3 @@ Java_com_google_android_filament_View_nGetFogEntity(JNIEnv *env, jclass clazz,
    View *view = (View *) nativeView;
    return (jint)view->getFogEntity().getId();
 }
-
-extern "C"
-JNIEXPORT void JNICALL
-Java_com_google_android_filament_View_nClearFrameHistory(JNIEnv *env, jclass clazz,
-        jlong nativeView, jlong nativeEngine) {
-    View *view = (View *) nativeView;
-    Engine *engine = (Engine *) nativeEngine;
-    view->clearFrameHistory(*engine);
-}
--- a/android/filament-android/src/main/java/com/google/android/filament/Engine.java
+++ b/android/filament-android/src/main/java/com/google/android/filament/Engine.java
@@ -111,8 +111,6 @@ public class Engine {

    private long mNativeObject;

-    private Config mConfig;
-
    @NonNull private final TransformManager mTransformManager;
    @NonNull private final LightManager mLightManager;
    @NonNull private final RenderableManager mRenderableManager;
@@ -152,334 +150,16 @@ public class Engine {
        FEATURE_LEVEL_0,
        /** OpenGL ES 3.0 features (default) */
        FEATURE_LEVEL_1,
-        /** OpenGL ES 3.1 features + 16 textures units + cubemap arrays */
-        FEATURE_LEVEL_2,
        /** OpenGL ES 3.1 features + 31 textures units + cubemap arrays */
-        FEATURE_LEVEL_3,
+        FEATURE_LEVEL_2
    };

-    /**
-     * The type of technique for stereoscopic rendering. (Note that the materials used will need to be
-     * compatible with the chosen technique.)
-     */
-    public enum StereoscopicType {
-        /** No stereoscopic rendering. */
-        NONE,
-        /** Stereoscopic rendering is performed using instanced rendering technique. */
-        INSTANCED,
-        /** Stereoscopic rendering is performed using the multiview feature from the graphics backend. */
-        MULTIVIEW,
-    };
-
-    /**
-     * Constructs <code>Engine</code> objects using a builder pattern.
-     */
-    public static class Builder {
-        @SuppressWarnings({"FieldCanBeLocal", "UnusedDeclaration"})
-        private final BuilderFinalizer mFinalizer;
-        private final long mNativeBuilder;
-        private Config mConfig;
-
-        public Builder() {
-            mNativeBuilder = nCreateBuilder();
-            mFinalizer = new BuilderFinalizer(mNativeBuilder);
-        }
-
-        /**
-         * Sets the {@link Backend} for the Engine.
-         *
-         * @param backend Driver backend to use
-         * @return A reference to this Builder for chaining calls.
-         */
-        public Builder backend(Backend backend) {
-            nSetBuilderBackend(mNativeBuilder, backend.ordinal());
-            return this;
-        }
-
-        /**
-         * Sets a sharedContext for the Engine.
-         *
-         * @param sharedContext  A platform-dependant OpenGL context used as a shared context
-         *                       when creating filament's internal context. On Android this parameter
-         *                       <b>must be</b> an instance of {@link android.opengl.EGLContext}.
-         * @return A reference to this Builder for chaining calls.
-         */
-        public Builder sharedContext(Object sharedContext) {
-            if (Platform.get().validateSharedContext(sharedContext)) {
-                nSetBuilderSharedContext(mNativeBuilder,
-                        Platform.get().getSharedContextNativeHandle(sharedContext));
-                return this;
-            }
-            throw new IllegalArgumentException("Invalid shared context " + sharedContext);
-        }
-
-        /**
-         * Configure the Engine with custom parameters.
-         *
-         * @param config A {@link Config} object
-         * @return A reference to this Builder for chaining calls.
-         */
-        public Builder config(Config config) {
-            mConfig = config;
-            nSetBuilderConfig(mNativeBuilder, config.commandBufferSizeMB,
-                    config.perRenderPassArenaSizeMB, config.driverHandleArenaSizeMB,
-                    config.minCommandBufferSizeMB, config.perFrameCommandsSizeMB,
-                    config.jobSystemThreadCount, config.disableParallelShaderCompile,
-                    config.stereoscopicType.ordinal(), config.stereoscopicEyeCount,
-                    config.resourceAllocatorCacheSizeMB, config.resourceAllocatorCacheMaxAge,
-                    config.disableHandleUseAfterFreeCheck,
-                    config.preferredShaderLanguage.ordinal(),
-                    config.forceGLES2Context, config.assertNativeWindowIsValid);
-            return this;
-        }
-
-        /**
-         * Sets the initial featureLevel for the Engine.
-         *
-         * @param featureLevel The feature level at which initialize Filament.
-         * @return A reference to this Builder for chaining calls.
-         */
-        public Builder featureLevel(FeatureLevel featureLevel) {
-            nSetBuilderFeatureLevel(mNativeBuilder, featureLevel.ordinal());
-            return this;
-        }
-
-        /**
-         * Sets the initial paused state of the rendering thread.
-         *
-         * <p>Warning: This is an experimental API. See {@link Engine#setPaused(boolean)} for
-         * caveats.
-         *
-         * @param paused Whether to start the rendering thread paused.
-         * @return A reference to this Builder for chaining calls.
-         */
-        public Builder paused(boolean paused) {
-            nSetBuilderPaused(mNativeBuilder, paused);
-            return this;
-        }
-
-        /**
-         * Creates an instance of Engine
-         *
-         * @return A newly created <code>Engine</code>, or <code>null</code> if the GPU driver couldn't
-         *         be initialized, for instance if it doesn't support the right version of OpenGL or
-         *         OpenGL ES.
-         *
-         * @exception IllegalStateException can be thrown if there isn't enough memory to
-         * allocate the command buffer.
-         */
-        public Engine build() {
-            long nativeEngine = nBuilderBuild(mNativeBuilder);
-            if (nativeEngine == 0) throw new IllegalStateException("Couldn't create Engine");
-            return new Engine(nativeEngine, mConfig);
-        }
-
-        private static class BuilderFinalizer {
-            private final long mNativeObject;
-
-            BuilderFinalizer(long nativeObject) {
-                mNativeObject = nativeObject;
-            }
-
-            @Override
-            public void finalize() {
-                try {
-                    super.finalize();
-                } catch (Throwable t) { // Ignore
-                } finally {
-                    nDestroyBuilder(mNativeObject);
-                }
-            }
-        }
-    }
-
-    /**
-     * Parameters for customizing the initialization of {@link Engine}.
-     */
-    public static class Config {
-
-        // #defines in Engine.h
-        private static final long FILAMENT_PER_RENDER_PASS_ARENA_SIZE_IN_MB = 3;
-        private static final long FILAMENT_PER_FRAME_COMMANDS_SIZE_IN_MB = 2;
-        private static final long FILAMENT_MIN_COMMAND_BUFFERS_SIZE_IN_MB = 1;
-        private static final long FILAMENT_COMMAND_BUFFER_SIZE_IN_MB =
-                FILAMENT_MIN_COMMAND_BUFFERS_SIZE_IN_MB * 3;
-
-        /**
-         * Size in MiB of the low-level command buffer arena.
-         *
-         * Each new command buffer is allocated from here. If this buffer is too small the program
-         * might terminate or rendering errors might occur.
-         *
-         * This is typically set to minCommandBufferSizeMB * 3, so that up to 3 frames can be
-         * batched-up at once.
-         *
-         * This value affects the application's memory usage.
-         */
-        public long commandBufferSizeMB = FILAMENT_COMMAND_BUFFER_SIZE_IN_MB;
-
-        /**
-         * Size in MiB of the per-frame data arena.
-         *
-         * This is the main arena used for allocations when preparing a frame.
-         * e.g.: Froxel data and high-level commands are allocated from this arena.
-         *
-         * If this size is too small, the program will abort on debug builds and have undefined
-         * behavior otherwise.
-         *
-         * This value affects the application's memory usage.
-         */
-        public long perRenderPassArenaSizeMB = FILAMENT_PER_RENDER_PASS_ARENA_SIZE_IN_MB;
-
-        /**
-         * Size in MiB of the backend's handle arena.
-         *
-         * Backends will fallback to slower heap-based allocations when running out of space and
-         * log this condition.
-         *
-         * If 0, then the default value for the given platform is used
-         *
-         * This value affects the application's memory usage.
-         */
-        public long driverHandleArenaSizeMB = 0;
-
-        /**
-         * Minimum size in MiB of a low-level command buffer.
-         *
-         * This is how much space is guaranteed to be available for low-level commands when a new
-         * buffer is allocated. If this is too small, the engine might have to stall to wait for
-         * more space to become available, this situation is logged.
-         *
-         * This value does not affect the application's memory usage.
-         */
-        public long minCommandBufferSizeMB = FILAMENT_MIN_COMMAND_BUFFERS_SIZE_IN_MB;
-
-        /**
-         * Size in MiB of the per-frame high level command buffer.
-         *
-         * This buffer is related to the number of draw calls achievable within a frame, if it is
-         * too small, the program will abort on debug builds and have undefined behavior otherwise.
-         *
-         * It is allocated from the 'per-render-pass arena' above. Make sure that at least 1 MiB is
-         * left in the per-render-pass arena when deciding the size of this buffer.
-         *
-         * This value does not affect the application's memory usage.
-         */
-        public long perFrameCommandsSizeMB = FILAMENT_PER_FRAME_COMMANDS_SIZE_IN_MB;
-
-        /**
-         * Number of threads to use in Engine's JobSystem.
-         *
-         * Engine uses a utils::JobSystem to carry out paralleization of Engine workloads. This
-         * value sets the number of threads allocated for JobSystem. Configuring this value can be
-         * helpful in CPU-constrained environments where too many threads can cause contention of
-         * CPU and reduce performance.
-         *
-         * The default value is 0, which implies that the Engine will use a heuristic to determine
-         * the number of threads to use.
-         */
-        public long jobSystemThreadCount = 0;
-
-        /**
-         * Number of most-recently destroyed textures to track for use-after-free.
-         *
-         * This will cause the backend to throw an exception when a texture is freed but still bound
-         * to a SamplerGroup and used in a draw call. 0 disables completely.
-         *
-         * Currently only respected by the Metal backend.
-         */
-        public long textureUseAfterFreePoolSize = 0;
-
-        /**
-         * Set to `true` to forcibly disable parallel shader compilation in the backend.
-         * Currently only honored by the GL backend.
-         */
-        public boolean disableParallelShaderCompile = false;
-
-        /**
-         * The type of technique for stereoscopic rendering.
-         *
-         * This setting determines the algorithm used when stereoscopic rendering is enabled. This
-         * decision applies to the entire Engine for the lifetime of the Engine. E.g., multiple
-         * Views created from the Engine must use the same stereoscopic type.
-         *
-         * Each view can enable stereoscopic rendering via the StereoscopicOptions::enable flag.
-         *
-         * @see View#setStereoscopicOptions
-         */
-        public StereoscopicType stereoscopicType = StereoscopicType.NONE;
-
-        /**
-         * The number of eyes to render when stereoscopic rendering is enabled. Supported values are
-         * between 1 and Engine#getMaxStereoscopicEyes() (inclusive).
-         *
-         * @see View#setStereoscopicOptions
-         * @see Engine#getMaxStereoscopicEyes
-         */
-        public long stereoscopicEyeCount = 2;
-
-        /**
-         * @Deprecated This value is no longer used.
-         */
-        public long resourceAllocatorCacheSizeMB = 64;
-
-        /**
-         * This value determines how many frames texture entries are kept for in the cache. This
-         * is a soft limit, meaning some texture older than this are allowed to stay in the cache.
-         * Typically only one texture is evicted per frame.
-         * The default is 1.
-         */
-        public long resourceAllocatorCacheMaxAge = 1;
-
-        /**
-         * Disable backend handles use-after-free checks.
-         */
-        public boolean disableHandleUseAfterFreeCheck = false;
-
-        /**
-         * Sets a preferred shader language for Filament to use.
-         *
-         * The Metal backend supports two shader languages: MSL (Metal Shading Language) and
-         * METAL_LIBRARY (precompiled .metallib). This option controls which shader language is
-         * used when materials contain both.
-         *
-         * By default, when preferredShaderLanguage is unset, Filament will prefer METAL_LIBRARY
-         * shaders if present within a material, falling back to MSL. Setting
-         * preferredShaderLanguage to ShaderLanguage::MSL will instead instruct Filament to check
-         * for the presence of MSL in a material first, falling back to METAL_LIBRARY if MSL is not
-         * present.
-         *
-         * When using a non-Metal backend, setting this has no effect.
-         */
-        public enum ShaderLanguage {
-            DEFAULT,
-            MSL,
-            METAL_LIBRARY,
-        };
-        public ShaderLanguage preferredShaderLanguage = ShaderLanguage.DEFAULT;
-
-        /**
-         * When the OpenGL ES backend is used, setting this value to true will force a GLES2.0
-         * context if supported by the Platform, or if not, will have the backend pretend
-         * it's a GLES2 context. Ignored on other backends.
-         */
-        public boolean forceGLES2Context = false;
-
-        /**
-         * Assert the native window associated to a SwapChain is valid when calling makeCurrent().
-         * This is only supported for:
-         *      - PlatformEGLAndroid
-         */
-        public boolean assertNativeWindowIsValid = false;
-    }
-
-    private Engine(long nativeEngine, Config config) {
+    private Engine(long nativeEngine) {
        mNativeObject = nativeEngine;
        mTransformManager = new TransformManager(nGetTransformManager(nativeEngine));
        mLightManager = new LightManager(nGetLightManager(nativeEngine));
        mRenderableManager = new RenderableManager(nGetRenderableManager(nativeEngine));
        mEntityManager = new EntityManager(nGetEntityManager(nativeEngine));
-        mConfig = config;
    }

    /**
@@ -497,7 +177,9 @@ public class Engine {
     */
    @NonNull
    public static Engine create() {
-        return new Builder().build();
+        long nativeEngine = nCreateEngine(0, 0);
+        if (nativeEngine == 0) throw new IllegalStateException("Couldn't create Engine");
+        return new Engine(nativeEngine);
    }

    /**
@@ -517,9 +199,9 @@ public class Engine {
     */
    @NonNull
    public static Engine create(@NonNull Backend backend) {
-        return new Builder()
-            .backend(backend)
-            .build();
+        long nativeEngine = nCreateEngine(backend.ordinal(), 0);
+        if (nativeEngine == 0) throw new IllegalStateException("Couldn't create Engine");
+        return new Engine(nativeEngine);
    }

    /**
@@ -541,9 +223,13 @@ public class Engine {
     */
    @NonNull
    public static Engine create(@NonNull Object sharedContext) {
-        return new Builder()
-            .sharedContext(sharedContext)
-            .build();
+        if (Platform.get().validateSharedContext(sharedContext)) {
+            long nativeEngine = nCreateEngine(0,
+                    Platform.get().getSharedContextNativeHandle(sharedContext));
+            if (nativeEngine == 0) throw new IllegalStateException("Couldn't create Engine");
+            return new Engine(nativeEngine);
+        }
+        throw new IllegalArgumentException("Invalid shared context " + sharedContext);
    }

    /**
@@ -610,23 +296,17 @@ public class Engine {
    }

    /**
-     * Activate all features of a given feature level. If an explicit feature level is not specified
-     * at Engine initialization time via {@link Builder#featureLevel}, the default feature level is
-     * {@link FeatureLevel#FEATURE_LEVEL_0} on devices not compatible with GLES 3.0; otherwise, the
-     * default is {@link FeatureLevel::FEATURE_LEVEL_1}. The selected feature level must not be
-     * higher than the value returned by {@link #getActiveFeatureLevel} and it's not possible lower
-     * the active feature level. Additionally, it is not possible to modify the feature level at all
-     * if the Engine was initialized at {@link FeatureLevel#FEATURE_LEVEL_0}.
+     * Activate all features of a given feature level. By default FeatureLevel::FEATURE_LEVEL_1 is
+     * active. The selected feature level must not be higher than the value returned by
+     * getActiveFeatureLevel() and it's not possible lower the active feature level.
     *
-     * @param featureLevel the feature level to activate. If featureLevel is lower than {@link
-     *                     #getActiveFeatureLevel}, the current (higher) feature level is kept. If
-     *                     featureLevel is higher than {@link #getSupportedFeatureLevel}, or if the
-     *                     engine was initialized at feature level 0, an exception is thrown, or the
-     *                     program is terminated if exceptions are disabled.
+     * @param featureLevel the feature level to activate. If featureLevel is lower than
+     *                     getActiveFeatureLevel(), the current (higher) feature level is kept.
+     *                     If featureLevel is higher than getSupportedFeatureLevel(), an exception
+     *                     is thrown, or the program is terminated if exceptions are disabled.
     *
     * @return the active feature level.
     *
-     * @see Builder#featureLevel
     * @see #getSupportedFeatureLevel
     * @see #getActiveFeatureLevel
     */
@@ -672,37 +352,6 @@ public class Engine {
        return nIsAutomaticInstancingEnabled(getNativeObject());
    }

-    /**
-     * Retrieves the configuration settings of this {@link Engine}.
-     *
-     * This method returns the configuration object that was supplied to the Engine's {@link
-     * Builder#config} method during the creation of this Engine. If the {@link Builder::config}
-     * method was not explicitly called (or called with null), this method returns the default
-     * configuration settings.
-     *
-     * @return a {@link Config} object with this Engine's configuration
-     * @see Builder#config
-     */
-    @NonNull
-    public Config getConfig() {
-        if (mConfig == null) {
-            mConfig = new Config();
-        }
-        return mConfig;
-    }
-
-    /**
-     * Returns the maximum number of stereoscopic eyes supported by Filament. The actual number of
-     * eyes rendered is set at Engine creation time with the {@link
-     * Engine#Config#stereoscopicEyeCount} setting.
-     *
-     * @return the max number of stereoscopic eyes supported
-     * @see Engine#Config#stereoscopicEyeCount
-     */
-    public long getMaxStereoscopicEyes() {
-        return nGetMaxStereoscopicEyes(getNativeObject());
-    }
-

    // SwapChain

@@ -717,7 +366,7 @@ public class Engine {
     */
    @NonNull
    public SwapChain createSwapChain(@NonNull Object surface) {
-        return createSwapChain(surface, SwapChainFlags.CONFIG_DEFAULT);
+        return createSwapChain(surface, SwapChain.CONFIG_DEFAULT);
    }

    /**
@@ -725,15 +374,15 @@ public class Engine {
     *
     * @param surface on Android, <b>must be</b> an instance of {@link android.view.Surface}
     *
-     * @param flags configuration flags, see {@link SwapChainFlags}
+     * @param flags configuration flags, see {@link SwapChain}
     *
     * @return a newly created {@link SwapChain} object
     *
     * @exception IllegalStateException can be thrown if the SwapChain couldn't be created
     *
-     * @see SwapChainFlags#CONFIG_DEFAULT
-     * @see SwapChainFlags#CONFIG_TRANSPARENT
-     * @see SwapChainFlags#CONFIG_READABLE
+     * @see SwapChain#CONFIG_DEFAULT
+     * @see SwapChain#CONFIG_TRANSPARENT
+     * @see SwapChain#CONFIG_READABLE
     *
     */
    @NonNull
@@ -751,22 +400,21 @@ public class Engine {
     *
     * @param width  width of the rendering buffer
     * @param height height of the rendering buffer
-     * @param flags  configuration flags, see {@link SwapChainFlags}
+     * @param flags  configuration flags, see {@link SwapChain}
     *
     * @return a newly created {@link SwapChain} object
     *
     * @exception IllegalStateException can be thrown if the SwapChain couldn't be created
     *
-     * @see SwapChainFlags#CONFIG_DEFAULT
-     * @see SwapChainFlags#CONFIG_TRANSPARENT
-     * @see SwapChainFlags#CONFIG_READABLE
+     * @see SwapChain#CONFIG_DEFAULT
+     * @see SwapChain#CONFIG_TRANSPARENT
+     * @see SwapChain#CONFIG_READABLE
     *
     */
    @NonNull
    public SwapChain createSwapChain(int width, int height, long flags) {
        if (width >= 0 && height >= 0) {
-            long nativeSwapChain =
-                nCreateSwapChainHeadless(getNativeObject(), width, height, flags);
+            long nativeSwapChain = nCreateSwapChainHeadless(getNativeObject(), width, height, flags);
            if (nativeSwapChain == 0) throw new IllegalStateException("Couldn't create SwapChain");
            return new SwapChain(nativeSwapChain, null);
        }
@@ -778,12 +426,11 @@ public class Engine {
     *
     * @param surface a properly initialized {@link NativeSurface}
     *
-     * @param flags configuration flags, see {@link SwapChainFlags}
+     * @param flags configuration flags, see {@link SwapChain}
     *
     * @return a newly created {@link SwapChain} object
     *
-     * @exception IllegalStateException can be thrown if the {@link SwapChainFlags} couldn't be
-     *            created
+     * @exception IllegalStateException can be thrown if the {@link SwapChain} couldn't be created
     */
    @NonNull
    public SwapChain createSwapChainFromNativeSurface(@NonNull NativeSurface surface, long flags) {
@@ -892,24 +539,6 @@ public class Engine {
        return nIsValidMaterial(getNativeObject(), object.getNativeObject());
    }

-    /**
-     * Returns whether the object is valid.
-     * @param object Object to check for validity
-     * @return returns true if the specified object is valid.
-     */
-    public boolean isValidMaterialInstance(@NonNull Material ma, MaterialInstance mi) {
-        return nIsValidMaterialInstance(getNativeObject(), ma.getNativeObject(), mi.getNativeObject());
-    }
-
-    /**
-     * Returns whether the object is valid.
-     * @param object Object to check for validity
-     * @return returns true if the specified object is valid.
-     */
-    public boolean isValidExpensiveMaterialInstance(@NonNull MaterialInstance object) {
-        return nIsValidExpensiveMaterialInstance(getNativeObject(), object.getNativeObject());
-    }
-
    /**
     * Returns whether the object is valid.
     * @param object Object to check for validity
@@ -1259,63 +888,6 @@ public class Engine {
        nFlushAndWait(getNativeObject());
    }

-    /**
-     * Kicks the hardware thread (e.g. the OpenGL, Vulkan or Metal thread) but does not wait
-     * for commands to be either executed or the hardware finished.
-     *
-     * <p>This is typically used after creating a lot of objects to start draining the command
-     * queue which has a limited size.</p>
-     */
-    public void flush() {
-        nFlush(getNativeObject());
-    }
-
-    /**
-     * Get paused state of rendering thread.
-     *
-     * <p>Warning: This is an experimental API.
-     *
-     * @see #setPaused
-     */
-    public boolean isPaused() {
-        return nIsPaused(getNativeObject());
-    }
-
-    /**
-     * Pause or resume the rendering thread.
-     *
-     * <p>Warning: This is an experimental API. In particular, note the following caveats.
-     *
-     * <ul><li>
-     * Buffer callbacks will never be called as long as the rendering thread is paused.
-     * Do not rely on a buffer callback to unpause the thread.
-     * </li><li>
-     * While the rendering thread is paused, rendering commands will continue to be queued until the
-     * buffer limit is reached. When the limit is reached, the program will abort.
-     * </li></ul>
-     */
-    public void setPaused(boolean paused) {
-        nSetPaused(getNativeObject(), paused);
-    }
-
-    /**
-     * Switch the command queue to unprotected mode. Protected mode can be activated via
-     * Renderer::beginFrame() using a protected SwapChain.
-     * @see Renderer
-     * @see SwapChain
-     */
-    public void unprotected() {
-        nUnprotected(getNativeObject());
-    }
-
-    /**
-     * Get the current time. This is a convenience function that simply returns the
-     * time in nanosecond since epoch of std::chrono::steady_clock.
-     * @return current time in nanosecond since epoch of std::chrono::steady_clock.
-     * @see Renderer#beginFrame
-     */
-    public static native long getSteadyClockTimeNano();
-
    @UsedByReflection("TextureHelper.java")
    public long getNativeObject() {
        if (mNativeObject == 0) {
@@ -1342,6 +914,7 @@ public class Engine {
        }
    }

+    private static native long nCreateEngine(long backend, long sharedContext);
    private static native void nDestroyEngine(long nativeEngine);
    private static native long nGetBackend(long nativeEngine);
    private static native long nCreateSwapChain(long nativeEngine, Object nativeWindow, long flags);
@@ -1381,8 +954,6 @@ public class Engine {
    private static native boolean nIsValidSkinningBuffer(long nativeEngine, long nativeSkinningBuffer);
    private static native boolean nIsValidIndirectLight(long nativeEngine, long nativeIndirectLight);
    private static native boolean nIsValidMaterial(long nativeEngine, long nativeMaterial);
-    private static native boolean nIsValidMaterialInstance(long nativeEngine, long nativeMaterial, long nativeMaterialInstance);
-    private static native boolean nIsValidExpensiveMaterialInstance(long nativeEngine, long nativeMaterialInstance);
    private static native boolean nIsValidSkybox(long nativeEngine, long nativeSkybox);
    private static native boolean nIsValidColorGrading(long nativeEngine, long nativeColorGrading);
    private static native boolean nIsValidTexture(long nativeEngine, long nativeTexture);
@@ -1390,10 +961,6 @@ public class Engine {
    private static native boolean nIsValidSwapChain(long nativeEngine, long nativeSwapChain);
    private static native void nDestroyEntity(long nativeEngine, int entity);
    private static native void nFlushAndWait(long nativeEngine);
-    private static native void nFlush(long nativeEngine);
-    private static native boolean nIsPaused(long nativeEngine);
-    private static native void nSetPaused(long nativeEngine, boolean paused);
-    private static native void nUnprotected(long nativeEngine);
    private static native long nGetTransformManager(long nativeEngine);
    private static native long nGetLightManager(long nativeEngine);
    private static native long nGetRenderableManager(long nativeEngine);
@@ -1401,24 +968,7 @@ public class Engine {
    private static native long nGetEntityManager(long nativeEngine);
    private static native void nSetAutomaticInstancingEnabled(long nativeEngine, boolean enable);
    private static native boolean nIsAutomaticInstancingEnabled(long nativeEngine);
-    private static native long nGetMaxStereoscopicEyes(long nativeEngine);
    private static native int nGetSupportedFeatureLevel(long nativeEngine);
    private static native int nSetActiveFeatureLevel(long nativeEngine, int ordinal);
    private static native int nGetActiveFeatureLevel(long nativeEngine);
-
-    private static native long nCreateBuilder();
-    private static native void nDestroyBuilder(long nativeBuilder);
-    private static native void nSetBuilderBackend(long nativeBuilder, long backend);
-    private static native void nSetBuilderConfig(long nativeBuilder, long commandBufferSizeMB,
-            long perRenderPassArenaSizeMB, long driverHandleArenaSizeMB,
-            long minCommandBufferSizeMB, long perFrameCommandsSizeMB, long jobSystemThreadCount,
-            boolean disableParallelShaderCompile, int stereoscopicType, long stereoscopicEyeCount,
-            long resourceAllocatorCacheSizeMB, long resourceAllocatorCacheMaxAge,
-            boolean disableHandleUseAfterFreeCheck,
-            int preferredShaderLanguage,
-            boolean forceGLES2Context, boolean assertNativeWindowIsValid);
-    private static native void nSetBuilderFeatureLevel(long nativeBuilder, int ordinal);
-    private static native void nSetBuilderSharedContext(long nativeBuilder, long sharedContext);
-    private static native void nSetBuilderPaused(long nativeBuilder, boolean paused);
-    private static native long nBuilderBuild(long nativeBuilder);
 }
--- a/android/filament-android/src/main/java/com/google/android/filament/LightManager.java
+++ b/android/filament-android/src/main/java/com/google/android/filament/LightManager.java
@@ -258,7 +258,6 @@ public class LightManager {
         * shadows that are too far and wouldn't contribute to the scene much, improving
         * performance and quality. This value is always positive.
         * Use 0.0f to use the camera far distance.
-         * This only affect directional lights.
         */
        public float shadowFar = 0.0f;

@@ -369,17 +368,6 @@ public class LightManager {
         * enabled. (2cm by default).
         */
        public float shadowBulbRadius = 0.02f;
-
-        /**
-         * Transforms the shadow direction. Must be a unit quaternion.
-         * The default is identity.
-         * Ignored if the light type isn't directional. For artistic use. Use with caution.
-         * The quaternion is stored as the imaginary part in the first 3 elements and the real
-         * part in the last element of the transform array.
-         */
-        @NonNull
-        @Size(min = 4, max = 4)
-        public float[] transform = { 0.0f, 0.0f, 0.0f, 1.0f };
    }

    public static class ShadowCascades {
@@ -518,7 +506,7 @@ public class LightManager {
                    options.polygonOffsetConstant, options.polygonOffsetSlope,
                    options.screenSpaceContactShadows,
                    options.stepCount, options.maxShadowDistance,
-                    options.elvsm, options.blurWidth, options.shadowBulbRadius, options.transform);
+                    options.elvsm, options.blurWidth, options.shadowBulbRadius);
            return this;
        }

@@ -1181,7 +1169,7 @@ public class LightManager {
             boolean stable, boolean lispsm,
             float polygonOffsetConstant, float polygonOffsetSlope,
             boolean screenSpaceContactShadows, int stepCount, float maxShadowDistance,
-             boolean elvsm, float blurWidth, float shadowBulbRadius, float[] transform);
+             boolean elvsm, float blurWidth, float shadowBulbRadius);
    private static native void nBuilderCastLight(long nativeBuilder, boolean enabled);
    private static native void nBuilderPosition(long nativeBuilder, float x, float y, float z);
    private static native void nBuilderDirection(long nativeBuilder, float x, float y, float z);
--- a/android/filament-android/src/main/java/com/google/android/filament/Material.java
+++ b/android/filament-android/src/main/java/com/google/android/filament/Material.java
@@ -18,11 +18,9 @@ package com.google.android.filament;

 import androidx.annotation.IntRange;
 import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
 import androidx.annotation.Size;

 import com.google.android.filament.proguard.UsedByNative;
-import com.google.android.filament.Engine.FeatureLevel;

 import java.nio.Buffer;
 import java.util.ArrayList;
@@ -48,8 +46,6 @@ public class Material {
        static final BlendingMode[] sBlendingModeValues = BlendingMode.values();
        static final RefractionMode[] sRefractionModeValues = RefractionMode.values();
        static final RefractionType[] sRefractionTypeValues = RefractionType.values();
-        static final ReflectionMode[] sReflectionModeValues = ReflectionMode.values();
-        static final FeatureLevel[] sFeatureLevelValues = FeatureLevel.values();
        static final VertexDomain[] sVertexDomainValues = VertexDomain.values();
        static final CullingMode[] sCullingModeValues = CullingMode.values();
        static final VertexBuffer.VertexAttribute[] sVertexAttributeValues =
@@ -185,18 +181,6 @@ public class Material {
        THIN
    }

-    /**
-     * Supported reflection modes
-     *
-     * @see
-     * <a href="https://google.github.io/filament/Materials.html#materialdefinitions/materialblock/lighting:reflections">
-     * Lighting: reflections</a>
-     */
-    public enum ReflectionMode {
-        DEFAULT,
-        SCREEN_SPACE
-    }
-
    /**
     * Supported types of vertex domains
     *
@@ -239,31 +223,6 @@ public class Material {
        FRONT_AND_BACK
    }

-    public enum CompilerPriorityQueue {
-        HIGH,
-        LOW
-    }
-
-    public static class UserVariantFilterBit {
-        /** Directional lighting */
-        public static int DIRECTIONAL_LIGHTING = 0x01;
-        /** Dynamic lighting */
-        public static int DYNAMIC_LIGHTING = 0x02;
-        /** Shadow receiver */
-        public static int SHADOW_RECEIVER = 0x04;
-        /** Skinning */
-        public static int SKINNING = 0x08;
-        /** Fog */
-        public static int FOG = 0x10;
-        /** Variance shadow maps */
-        public static int VSM = 0x20;
-        /** Screen-space reflections */
-        public static int SSR = 0x40;
-        /** Instanced stereo rendering */
-        public static int STE = 0x80;
-        public static int ALL = 0xFF;
-    }
-
    @UsedByNative("Material.cpp")
    public static class Parameter {
        private static final Type[] sTypeValues = Type.values();
@@ -346,7 +305,6 @@ public class Material {
    public static class Builder {
        private Buffer mBuffer;
        private int mSize;
-        private int mShBandCount = 0;

        /**
         * Specifies the material data. The material data is a binary blob produced by
@@ -362,22 +320,6 @@ public class Material {
            return this;
        }

-        /**
-         * Sets the quality of the indirect lights computations. This is only taken into account
-         * if this material is lit and in the surface domain. This setting will affect the
-         * IndirectLight computation if one is specified on the Scene and Spherical Harmonics
-         * are used for the irradiance.
-         *
-         * @param shBandCount Number of spherical harmonic bands. Must be 1, 2 or 3 (default).
-         * @return Reference to this Builder for chaining calls.
-         * @see IndirectLight
-         */
-        @NonNull
-        public Builder sphericalHarmonicsBandCount(@IntRange(from = 0) int shBandCount) {
-            mShBandCount = shBandCount;
-            return this;
-        }
-
        /**
         * Creates and returns the Material object.
         *
@@ -389,62 +331,12 @@ public class Material {
         */
        @NonNull
        public Material build(@NonNull Engine engine) {
-            long nativeMaterial = nBuilderBuild(engine.getNativeObject(),
-                mBuffer, mSize, mShBandCount);
+            long nativeMaterial = nBuilderBuild(engine.getNativeObject(), mBuffer, mSize);
            if (nativeMaterial == 0) throw new IllegalStateException("Couldn't create Material");
            return new Material(nativeMaterial);
        }
    }

-
-    /**
-     * Asynchronously ensures that a subset of this Material's variants are compiled. After issuing
-     * several compile() calls in a row, it is recommended to call {@link Engine#flush}
-     * such that the backend can start the compilation work as soon as possible.
-     * The provided callback is guaranteed to be called on the main thread after all specified
-     * variants of the material are compiled. This can take hundreds of milliseconds.
-     *<p>
-     * If all the material's variants are already compiled, the callback will be scheduled as
-     * soon as possible, but this might take a few dozen millisecond, corresponding to how
-     * many previous frames are enqueued in the backend. This also varies by backend. Therefore,
-     * it is recommended to only call this method once per material shortly after creation.
-     *</p>
-     *<p>
-     * If the same variant is scheduled for compilation multiple times, the first scheduling
-     * takes precedence; later scheduling are ignored.
-     *</p>
-     *<p>
-     * caveat: A consequence is that if a variant is scheduled on the low priority queue and later
-     * scheduled again on the high priority queue, the later scheduling is ignored.
-     * Therefore, the second callback could be called before the variant is compiled.
-     * However, the first callback, if specified, will trigger as expected.
-     *</p>
-     *<p>
-     * The callback is guaranteed to be called. If the engine is destroyed while some material
-     * variants are still compiling or in the queue, these will be discarded and the corresponding
-     * callback will be called. In that case however the Material pointer passed to the callback
-     * is guaranteed to be invalid (either because it's been destroyed by the user already, or,
-     * because it's been cleaned-up by the Engine).
-     *</p>
-     *<p>
-     * {@link UserVariantFilterBit#ALL} should be used with caution. Only variants that an application
-     * needs should be included in the variants argument. For example, the STE variant is only used
-     * for stereoscopic rendering. If an application is not planning to render in stereo, this bit
-     * should be turned off to avoid unnecessary material compilations.
-     *</p>
-     * @param priority      Which priority queue to use, LOW or HIGH.
-     * @param variants      Variants to include to the compile command.
-     * @param handler       An {@link java.util.concurrent.Executor Executor}. On Android this can also be a {@link android.os.Handler Handler}.
-     * @param callback      callback called on the main thread when the compilation is done on
-     *                      by backend.
-     */
-    public void compile(@NonNull CompilerPriorityQueue priority,
-                        int variants,
-                        @Nullable Object handler,
-                        @Nullable Runnable callback) {
-        nCompile(getNativeObject(), priority.ordinal(), variants, handler, callback);
-    }
-
    /**
     * Creates a new instance of this material. Material instances should be freed using
     * {@link Engine#destroyMaterialInstance(MaterialInstance)}.
@@ -545,28 +437,6 @@ public class Material {
        return EnumCache.sRefractionTypeValues[nGetRefractionType(getNativeObject())];
    }

-    /**
-     * Returns the reflection mode of this material.
-     *
-     * @see
-     * <a href="https://google.github.io/filament/Materials.html#materialdefinitions/materialblock/lighting:reflections">
-     * Lighting: reflections</a>
-     */
-    public ReflectionMode getReflectionMode() {
-        return EnumCache.sReflectionModeValues[nGetReflectionMode(getNativeObject())];
-    }
-
-    /**
-     * Returns the minimum required feature level for this material.
-     *
-     * @see
-     * <a href="https://google.github.io/filament/Materials.html#materialdefinitions/materialblock/general:featurelevel">
-     * General: featureLevel</a>
-     */
-    public FeatureLevel getFeatureLevel() {
-        return EnumCache.sFeatureLevelValues[nGetFeatureLevel(getNativeObject())];
-    }
-
    /**
     * Returns the vertex domain of this material.
     *
@@ -1041,12 +911,11 @@ public class Material {
        mNativeObject = 0;
    }

-    private static native long nBuilderBuild(long nativeEngine, @NonNull Buffer buffer, int size, int shBandCount);
+    private static native long nBuilderBuild(long nativeEngine, @NonNull Buffer buffer, int size);
    private static native long nCreateInstance(long nativeMaterial);
    private static native long nCreateInstanceWithName(long nativeMaterial, @NonNull String name);
    private static native long nGetDefaultInstance(long nativeMaterial);

-    private static native void nCompile(long nativeMaterial, int priority, int variants, Object handler, Runnable runnable);
    private static native String nGetName(long nativeMaterial);
    private static native int nGetShading(long nativeMaterial);
    private static native int nGetInterpolation(long nativeMaterial);
@@ -1063,8 +932,6 @@ public class Material {
    private static native float nGetSpecularAntiAliasingThreshold(long nativeMaterial);
    private static native int nGetRefractionMode(long nativeMaterial);
    private static native int nGetRefractionType(long nativeMaterial);
-    private static native int nGetReflectionMode(long nativeMaterial);
-    private static native int nGetFeatureLevel(long nativeMaterial);


    private static native int nGetParameterCount(long nativeMaterial);
--- a/android/filament-android/src/main/java/com/google/android/filament/MorphTargetBuffer.java
+++ b/android/filament-android/src/main/java/com/google/android/filament/MorphTargetBuffer.java
@@ -74,7 +74,7 @@ public class MorphTargetBuffer {
         *
         * @exception IllegalStateException if the MorphTargetBuffer could not be created
         *
-         * @see #setMorphTargetBufferOffsetAt
+         * @see #setMorphTargetBufferAt
         */
        @NonNull
        public MorphTargetBuffer build(@NonNull Engine engine) {
--- a/android/filament-android/src/main/java/com/google/android/filament/RenderableManager.java
+++ b/android/filament-android/src/main/java/com/google/android/filament/RenderableManager.java
@@ -175,32 +175,6 @@ public class RenderableManager {
            return this;
        }

-        /**
-         * Type of geometry for a Renderable
-         */
-        public enum GeometryType {
-            /** dynamic gemoetry has no restriction */
-            DYNAMIC,
-            /** bounds and world space transform are immutable */
-            STATIC_BOUNDS,
-            /** skinning/morphing not allowed and Vertex/IndexBuffer immutables */
-            STATIC
-        }
-
-        /**
-         * Specify whether this renderable has static bounds. In this context his means that
-         * the renderable's bounding box cannot change and that the renderable's transform is
-         * assumed immutable. Changing the renderable's transform via the TransformManager
-         * can lead to corrupted graphics. Note that skinning and morphing are not forbidden.
-         * Disabled by default.
-         * @param enable whether this renderable has static bounds. false by default.
-         */
-        @NonNull
-        public Builder geometryType(GeometryType type) {
-            nBuilderGeometryType(mNativeBuilder, type.ordinal());
-            return this;
-        }
-
        /**
         * Binds a material instance to the specified primitive.
         *
@@ -524,7 +498,14 @@ public class RenderableManager {
        }

        /**
-         * Controls if the renderable has legacy vertex morphing targets, zero by default.
+         * Controls if the renderable has vertex morphing targets, zero by default. This is
+         * required to enable GPU morphing.
+         *
+         * <p>Filament supports two morphing modes: standard (default) and legacy.</p>
+         *
+         * <p>For standard morphing, A {@link MorphTargetBuffer} must be created and provided via
+         * {@link RenderableManager#setMorphTargetBufferAt}. Standard morphing supports up to
+         * <code>CONFIG_MAX_MORPH_TARGET_COUNT</code> morph targets.</p>
         *
         * For legacy morphing, the attached {@link VertexBuffer} must provide data in the
         * appropriate {@link VertexBuffer.VertexAttribute} slots (<code>MORPH_POSITION_0</code> etc).
@@ -542,22 +523,6 @@ public class RenderableManager {
            return this;
        }

-        /**
-         * Controls if the renderable has vertex morphing targets, zero by default.
-         *
-         * <p>For standard morphing, A {@link MorphTargetBuffer} must be provided.
-         * Standard morphing supports up to
-         * <code>CONFIG_MAX_MORPH_TARGET_COUNT</code> morph targets.</p>
-         *
-         * <p>See also {@link RenderableManager#setMorphWeights}, which can be called on a per-frame basis
-         * to advance the animation.</p>
-         */
-        @NonNull
-        public Builder morphing(@NonNull MorphTargetBuffer morphTargetBuffer) {
-            nBuilderMorphingStandard(mNativeBuilder, morphTargetBuffer.getNativeObject());
-            return this;
-        }
-
        /**
         * Specifies the morph target buffer for a primitive.
         *
@@ -569,13 +534,31 @@ public class RenderableManager {
         *
         * @param level the level of detail (lod), only 0 can be specified
         * @param primitiveIndex zero-based index of the primitive, must be less than the count passed to Builder constructor
+         * @param morphTargetBuffer specifies the morph target buffer
         * @param offset specifies where in the morph target buffer to start reading (expressed as a number of vertices)
+         * @param count number of vertices in the morph target buffer to read, must equal the geometry's count (for triangles, this should be a multiple of 3)
         */
        @NonNull
        public Builder morphing(@IntRange(from = 0) int level,
                                @IntRange(from = 0) int primitiveIndex,
-                                @IntRange(from = 0) int offset) {
-            nBuilderSetMorphTargetBufferOffsetAt(mNativeBuilder, level, primitiveIndex, offset);
+                                @NonNull MorphTargetBuffer morphTargetBuffer,
+                                @IntRange(from = 0) int offset,
+                                @IntRange(from = 0) int count) {
+            nBuilderSetMorphTargetBufferAt(mNativeBuilder, level, primitiveIndex,
+                    morphTargetBuffer.getNativeObject(), offset, count);
+            return this;
+        }
+
+        /**
+         * Utility method to specify morph target buffer for a primitive.
+         * For details, see the {@link RenderableManager.Builder#morphing}.
+         */
+        @NonNull
+        public Builder morphing(@IntRange(from = 0) int level,
+                                @IntRange(from = 0) int primitiveIndex,
+                                @NonNull MorphTargetBuffer morphTargetBuffer) {
+            nBuilderSetMorphTargetBufferAt(mNativeBuilder, level, primitiveIndex,
+                    morphTargetBuffer.getNativeObject(), 0, morphTargetBuffer.getVertexCount());
            return this;
        }

@@ -678,11 +661,26 @@ public class RenderableManager {
     *
     * @see Builder#morphing
     */
-    public void setMorphTargetBufferOffsetAt(@EntityInstance int i,
+    public void setMorphTargetBufferAt(@EntityInstance int i,
                                       @IntRange(from = 0) int level,
                                       @IntRange(from = 0) int primitiveIndex,
-                                       @IntRange(from = 0) int offset) {
-        nSetMorphTargetBufferOffsetAt(mNativeObject, i, level, primitiveIndex, 0, offset);
+                                       @NonNull MorphTargetBuffer morphTargetBuffer,
+                                       @IntRange(from = 0) int offset,
+                                       @IntRange(from = 0) int count) {
+        nSetMorphTargetBufferAt(mNativeObject, i, level, primitiveIndex,
+                morphTargetBuffer.getNativeObject(), offset, count);
+    }
+
+    /**
+     * Utility method to change morph target buffer for the given primitive.
+     * For details, see the {@link RenderableManager#setMorphTargetBufferAt}.
+     */
+    public void setMorphTargetBufferAt(@EntityInstance int i,
+                                       @IntRange(from = 0) int level,
+                                       @IntRange(from = 0) int primitiveIndex,
+                                       @NonNull MorphTargetBuffer morphTargetBuffer) {
+        nSetMorphTargetBufferAt(mNativeObject, i, level, primitiveIndex,
+                morphTargetBuffer.getNativeObject(), 0, morphTargetBuffer.getVertexCount());
    }

    /**
@@ -966,7 +964,6 @@ public class RenderableManager {
    private static native void nBuilderGeometry(long nativeBuilder, int index, int value, long nativeVertexBuffer, long nativeIndexBuffer);
    private static native void nBuilderGeometry(long nativeBuilder, int index, int value, long nativeVertexBuffer, long nativeIndexBuffer, int offset, int count);
    private static native void nBuilderGeometry(long nativeBuilder, int index, int value, long nativeVertexBuffer, long nativeIndexBuffer, int offset, int minIndex, int maxIndex, int count);
-    private static native void nBuilderGeometryType(long nativeBuilder, int type);
    private static native void nBuilderMaterial(long nativeBuilder, int index, long nativeMaterialInstance);
    private static native void nBuilderBlendOrder(long nativeBuilder, int index, int blendOrder);
    private static native void nBuilderGlobalBlendOrderEnabled(long nativeBuilder, int index, boolean enabled);
@@ -982,8 +979,7 @@ public class RenderableManager {
    private static native int nBuilderSkinningBones(long nativeBuilder, int boneCount, Buffer bones, int remaining);
    private static native void nBuilderSkinningBuffer(long nativeBuilder, long nativeSkinningBuffer, int boneCount, int offset);
    private static native void nBuilderMorphing(long nativeBuilder, int targetCount);
-    private static native void nBuilderMorphingStandard(long nativeBuilder, long nativeMorphTargetBuffer);
-    private static native void nBuilderSetMorphTargetBufferOffsetAt(long nativeBuilder, int level, int primitiveIndex, int offset);
+    private static native void nBuilderSetMorphTargetBufferAt(long nativeBuilder, int level, int primitiveIndex, long nativeMorphTargetBuffer, int offset, int count);
    private static native void nBuilderEnableSkinningBuffers(long nativeBuilder, boolean enabled);
    private static native void nBuilderFog(long nativeBuilder, boolean enabled);
    private static native void nBuilderLightChannel(long nativeRenderableManager, int channel, boolean enable);
@@ -993,7 +989,7 @@ public class RenderableManager {
    private static native int nSetBonesAsMatrices(long nativeObject, int i, Buffer matrices, int remaining, int boneCount, int offset);
    private static native int nSetBonesAsQuaternions(long nativeObject, int i, Buffer quaternions, int remaining, int boneCount, int offset);
    private static native void nSetMorphWeights(long nativeObject, int instance, float[] weights, int offset);
-    private static native void nSetMorphTargetBufferOffsetAt(long nativeObject, int i, int level, int primitiveIndex, long nativeMorphTargetBuffer, int offset);
+    private static native void nSetMorphTargetBufferAt(long nativeObject, int i, int level, int primitiveIndex, long nativeMorphTargetBuffer, int offset, int count);
    private static native int nGetMorphTargetCount(long nativeObject, int i);
    private static native void nSetAxisAlignedBoundingBox(long nativeRenderableManager, int i, float cx, float cy, float cz, float ex, float ey, float ez);
    private static native void nSetLayerMask(long nativeRenderableManager, int i, int select, int value);
--- a/android/filament-android/src/main/java/com/google/android/filament/Renderer.java
+++ b/android/filament-android/src/main/java/com/google/android/filament/Renderer.java
@@ -101,7 +101,7 @@ public class Renderer {
        /**
         * Desired frame interval in unit of 1 / DisplayInfo.refreshRate.
         */
-        public float interval = 1.0f;
+        public float interval = 1.0f / 60.0f;

        /**
         * Additional headroom for the GPU as a ratio of the targetFrameTime.
@@ -284,33 +284,6 @@ public class Renderer {
        nSetPresentationTime(getNativeObject(), monotonicClockNanos);
    }

-    /**
-     * The use of this method is optional. It sets the VSYNC time expressed as the duration in
-     * nanosecond since epoch of std::chrono::steady_clock.
-     * If called, passing 0 to frameTimeNanos in Renderer.BeginFrame will use this
-     * time instead.
-     * @param steadyClockTimeNano duration in nanosecond since epoch of std::chrono::steady_clock
-     * @see Engine#getSteadyClockTimeNano
-     * @see Renderer#beginFrame
-     */
-    public void setVsyncTime(long steadyClockTimeNano) {
-        nSetVsyncTime(getNativeObject(), steadyClockTimeNano);
-    }
-
-    /**
-     * Call skipFrame when momentarily skipping frames, for instance if the content of the
-     * scene doesn't change.
-     *
-     * @param vsyncSteadyClockTimeNano The time in nanoseconds when the frame started being rendered,
-     *                       in the {@link System#nanoTime()} timebase. Divide this value by 1000000 to
-     *                       convert it to the {@link android.os.SystemClock#uptimeMillis()}
-     *                       time base. This typically comes from
-     *                       {@link android.view.Choreographer.FrameCallback}.
-     */
-    public void skipFrame(long vsyncSteadyClockTimeNano) {
-        nSkipFrame(getNativeObject(), vsyncSteadyClockTimeNano);
-    }
-
    /**
     * Sets up a frame for this <code>Renderer</code>.
     * <p><code>beginFrame</code> manages frame pacing, and returns whether or not a frame should be
@@ -729,8 +702,6 @@ public class Renderer {
    }

    private static native void nSetPresentationTime(long nativeObject, long monotonicClockNanos);
-    private static native void nSetVsyncTime(long nativeObject, long steadyClockTimeNano);
-    private static native void nSkipFrame(long nativeObject, long vsyncSteadyClockTimeNano);
    private static native boolean nBeginFrame(long nativeRenderer, long nativeSwapChain, long frameTimeNanos);
    private static native void nEndFrame(long nativeRenderer);
    private static native void nRender(long nativeRenderer, long nativeView);
--- a/android/filament-android/src/main/java/com/google/android/filament/Scene.java
+++ b/android/filament-android/src/main/java/com/google/android/filament/Scene.java
@@ -16,7 +16,6 @@

 package com.google.android.filament;

-import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;

 /**
@@ -147,29 +146,18 @@ public class Scene {
    }

    /**
-     * Returns the total number of Entities in the <code>Scene</code>, whether alive or not.
+     * Returns the number of {@link RenderableManager} components in the <code>Scene</code>.
     *
-     * @return the total number of Entities in the <code>Scene</code>.
-     */
-    public int getEntityCount() {
-        return nGetEntityCount(getNativeObject());
-    }
-
-    /**
-     * Returns the number of active (alive) {@link RenderableManager} components in the
-     * <code>Scene</code>.
-     *
-     * @return number of {@link RenderableManager} components in the <code>Scene</code>.
+     * @return number of {@link RenderableManager} components in the <code>Scene</code>..
     */
    public int getRenderableCount() {
        return nGetRenderableCount(getNativeObject());
    }

    /**
-     * Returns the number of active (alive) {@link LightManager} components in the
-     * <code>Scene</code>.
+     * Returns the number of {@link LightManager} components in the <code>Scene</code>.
     *
-     * @return number of {@link LightManager} components in the <code>Scene</code>.
+     * @return number of {@link LightManager} components in the <code>Scene</code>..
     */
    public int getLightCount() {
        return nGetLightCount(getNativeObject());
@@ -191,52 +179,6 @@ public class Scene {
        return mNativeObject;
    }

-    /**
-     * Returns the list of all entities in the Scene. If outArray is provided and large enough,
-     * it is used to store the list and returned, otherwise a new array is allocated and returned.
-     * @param outArray an array to store the list of entities in the scene.
-     * @return outArray if it was used or a newly allocated array.
-     * @see #getEntityCount
-     */
-    public int[] getEntities(@Nullable int[] outArray) {
-        int c = getEntityCount();
-        if (outArray == null || outArray.length < c) {
-            outArray = new int[c];
-        }
-        boolean success = nGetEntities(getNativeObject(), outArray, outArray.length);
-        if (!success) {
-            throw new IllegalStateException("Error retriving Scene's entities");
-        }
-        return outArray;
-    }
-
-    /**
-     * Returns the list of all entities in the Scene in a newly allocated array.
-     * @return an array containing the list of all entities in the scene.
-     * @see #getEntityCount
-     */
-    public int[] getEntities() {
-        return getEntities(null);
-    }
-
-    public interface EntityProcessor {
-        void process(@Entity int entity);
-    }
-
-    /**
-     * Invokes user functor on each entity in the scene.
-     *
-     * It is not allowed to add or remove an entity from the scene within the functor.
-     *
-     * @param entityProcessor User provided functor called for each entity in the scene
-     */
-    public void forEach(@NonNull EntityProcessor entityProcessor) {
-        int[] entities = getEntities(null);
-        for (int entity : entities) {
-            entityProcessor.process(entity);
-        }
-    }
-
    void clearNativeObject() {
        mNativeObject = 0;
    }
@@ -247,9 +189,7 @@ public class Scene {
    private static native void nAddEntities(long nativeScene, int[] entities);
    private static native void nRemove(long nativeScene, int entity);
    private static native void nRemoveEntities(long nativeScene, int[] entities);
-    private static native int nGetEntityCount(long nativeScene);
    private static native int nGetRenderableCount(long nativeScene);
    private static native int nGetLightCount(long nativeScene);
    private static native boolean nHasEntity(long nativeScene, int entity);
-    private static native boolean nGetEntities(long nativeScene, int[] outArray, int length);
 }
--- a/android/filament-android/src/main/java/com/google/android/filament/SwapChain.java
+++ b/android/filament-android/src/main/java/com/google/android/filament/SwapChain.java
@@ -68,30 +68,52 @@ public class SwapChain {
    private final Object mSurface;
    private long mNativeObject;

+    public static final long CONFIG_DEFAULT = 0x0;
+
+    /**
+     * This flag indicates that the <code>SwapChain</code> must be allocated with an
+     * alpha-channel.
+     */
+    public static final long CONFIG_TRANSPARENT = 0x1;
+
+    /**
+     * This flag indicates that the <code>SwapChain</code> may be used as a source surface
+     * for reading back render results.  This config must be set when creating
+     * any <code>SwapChain</code>  that will be used as the source for a blit operation.
+     *
+     * @see Renderer#copyFrame
+     */
+    public static final long CONFIG_READABLE = 0x2;
+
+    /**
+     * Indicates that the native X11 window is an XCB window rather than an XLIB window.
+     * This is ignored on non-Linux platforms and in builds that support only one X11 API.
+     */
+    public static final long CONFIG_ENABLE_XCB = 0x4;
+
+    /**
+     * Indicates that the SwapChain must automatically perform linear to sRGB encoding.
+     *
+     * This flag is ignored if isSRGBSwapChainSupported() is false.
+     *
+     * When using this flag, post-processing should be disabled.
+     *
+     * @see SwapChain#isSRGBSwapChainSupported
+     * @see View#setPostProcessingEnabled
+     */
+    public static final long CONFIG_SRGB_COLORSPACE = 0x10;
+
    SwapChain(long nativeSwapChain, Object surface) {
        mNativeObject = nativeSwapChain;
        mSurface = surface;
    }

    /**
-     * Return whether createSwapChain supports the CONFIG_PROTECTED_CONTENT flag.
+     * Return whether createSwapChain supports the SWAP_CHAIN_CONFIG_SRGB_COLORSPACE flag.
     * The default implementation returns false.
     *
     * @param engine A reference to the filament Engine
-     * @return true if CONFIG_PROTECTED_CONTENT is supported, false otherwise.
-     * @see SwapChainFlags#CONFIG_PROTECTED_CONTENT
-     */
-    public static boolean isProtectedContentSupported(@NonNull Engine engine) {
-        return nIsProtectedContentSupported(engine.getNativeObject());
-    }
-
-    /**
-     * Return whether createSwapChain supports the CONFIG_SRGB_COLORSPACE flag.
-     * The default implementation returns false.
-     *
-     * @param engine A reference to the filament Engine
-     * @return true if CONFIG_SRGB_COLORSPACE is supported, false otherwise.
-     * @see SwapChainFlags#CONFIG_SRGB_COLORSPACE
+     * @return true if SWAP_CHAIN_CONFIG_SRGB_COLORSPACE is supported, false otherwise.
     */
    public static boolean isSRGBSwapChainSupported(@NonNull Engine engine) {
        return nIsSRGBSwapChainSupported(engine.getNativeObject());
@@ -139,5 +161,4 @@ public class SwapChain {

    private static native void nSetFrameCompletedCallback(long nativeSwapChain, Object handler, Runnable callback);
    private static native boolean nIsSRGBSwapChainSupported(long nativeEngine);
-    private static native boolean nIsProtectedContentSupported(long nativeEngine);
 }
--- a/android/filament-android/src/main/java/com/google/android/filament/SwapChainFlags.java
+++ b/android/filament-android/src/main/java/com/google/android/filament/SwapChainFlags.java
@@ -1,97 +0,0 @@
-/*
- * Copyright (C) 2024 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.google.android.filament;
-
-// Note: SwapChainFlags is kept separate from SwapChain so that UiHelper does not need to depend
-// on SwapChain. This allows clients to use UiHelper without requiring all of Filament's Java
-// classes.
-
-/**
- * Flags that a <code>SwapChain</code> can be created with to control behavior.
- *
- * @see Engine#createSwapChain
- * @see Engine#createSwapChainFromNativeSurface
- */
-public final class SwapChainFlags {
-
-    public static final long CONFIG_DEFAULT = 0x0;
-
-    /**
-     * This flag indicates that the <code>SwapChain</code> must be allocated with an
-     * alpha-channel.
-     */
-    public static final long CONFIG_TRANSPARENT = 0x1;
-
-    /**
-     * This flag indicates that the <code>SwapChain</code> may be used as a source surface
-     * for reading back render results.  This config must be set when creating
-     * any <code>SwapChain</code>  that will be used as the source for a blit operation.
-     *
-     * @see Renderer#copyFrame
-     */
-    public static final long CONFIG_READABLE = 0x2;
-
-    /**
-     * Indicates that the native X11 window is an XCB window rather than an XLIB window.
-     * This is ignored on non-Linux platforms and in builds that support only one X11 API.
-     */
-    public static final long CONFIG_ENABLE_XCB = 0x4;
-
-    /**
-     * Indicates that the SwapChain must automatically perform linear to sRGB encoding.
-     *
-     * This flag is ignored if isSRGBSwapChainSupported() is false.
-     *
-     * When using this flag, post-processing should be disabled.
-     *
-     * @see SwapChain#isSRGBSwapChainSupported
-     * @see View#setPostProcessingEnabled
-     */
-    public static final long CONFIG_SRGB_COLORSPACE = 0x10;
-
-    /**
-     * Indicates that this SwapChain should allocate a stencil buffer in addition to a depth buffer.
-     *
-     * This flag is necessary when using View::setStencilBufferEnabled and rendering directly into
-     * the SwapChain (when post-processing is disabled).
-     *
-     * The specific format of the stencil buffer depends on platform support. The following pixel
-     * formats are tried, in order of preference:
-     *
-     * Depth only (without CONFIG_HAS_STENCIL_BUFFER):
-     * - DEPTH32F
-     * - DEPTH24
-     *
-     * Depth + stencil (with CONFIG_HAS_STENCIL_BUFFER):
-     * - DEPTH32F_STENCIL8
-     * - DEPTH24F_STENCIL8
-     *
-     * Note that enabling the stencil buffer may hinder depth precision and should only be used if
-     * necessary.
-     *
-     * @see View#setStencilBufferEnabled
-     * @see View#setPostProcessingEnabled
-     */
-    public static final long CONFIG_HAS_STENCIL_BUFFER = 0x20;
-
-    /**
-     * The SwapChain contains protected content. Only supported when isProtectedContentSupported()
-     * is true.
-     */
-    public static final long CONFIG_PROTECTED_CONTENT   = 0x40;
-}
-
--- a/android/filament-android/src/main/java/com/google/android/filament/Texture.java
+++ b/android/filament-android/src/main/java/com/google/android/filament/Texture.java
@@ -849,10 +849,6 @@ public class Texture {
        public static final int SAMPLEABLE = 0x10;
        /** Texture can be used as a subpass input */
        public static final int SUBPASS_INPUT = 0x20;
-        /** Texture can be used the source of a blit() */
-        public static final int BLIT_SRC = 0x40;
-        /** Texture can be used the destination of a blit() */
-        public static final int BLIT_DST = 0x80;
        /** by default textures are <code>UPLOADABLE</code> and <code>SAMPLEABLE</code>*/
        public static final int DEFAULT = UPLOADABLE | SAMPLEABLE;
    }
--- a/android/filament-android/src/main/java/com/google/android/filament/ToneMapper.java
+++ b/android/filament-android/src/main/java/com/google/android/filament/ToneMapper.java
@@ -16,14 +16,12 @@ package com.google.android.filament;
 * <li>Configurable tone mapping operators</li>
 * <ul>
 *   <li>GenericToneMapper</li>
- *   <li>AgXToneMapper</li>
 * </ul>
 * <li>Fixed-aesthetic tone mapping operators</li>
 * <ul>
 *   <li>ACESToneMapper</li>
 *   <li>ACESLegacyToneMapper</li>
 *   <li>FilmicToneMapper</li>
- *   <li>PBRNeutralToneMapper</li>
 * </ul>
 * <li>Debug/validation tone mapping operators</li>
 * <ul>
@@ -102,55 +100,6 @@ public class ToneMapper {
        }
    }

-    /**
-     * Khronos PBR Neutral tone mapping operator. This tone mapper was designed
-     * to preserve the appearance of materials across lighting conditions while
-     * avoiding artifacts in the highlights in high dynamic range conditions.
-     */
-    public static class PBRNeutralToneMapper extends ToneMapper {
-        public PBRNeutralToneMapper() {
-            super(nCreatePBRNeutralToneMapper());
-        }
-    }
-
-    /**
-     * AgX tone mapping operator.
-     */
-    public static class Agx extends ToneMapper {
-        public enum AgxLook {
-            /**
-             * Base contrast with no look applied
-             */
-            NONE,
-
-            /**
-             * A punchy and more chroma laden look for sRGB displays
-             */
-            PUNCHY,
-
-            /**
-             * A golden tinted, slightly washed look for BT.1886 displays
-             */
-            GOLDEN
-        }
-
-        /**
-         * Builds a new AgX tone mapper with no look applied.
-         */
-        public Agx() {
-            this(AgxLook.NONE);
-        }
-
-        /**
-         * Builds a new AgX tone mapper.
-         *
-         * @param look: an optional creative adjustment to contrast and saturation
-         */
-        public Agx(AgxLook look) {
-            super(nCreateAgxToneMapper(look.ordinal()));
-        }
-    }
-
    /**
     * Generic tone mapping operator that gives control over the tone mapping
     * curve. This operator can be used to control the aesthetics of the final
@@ -245,8 +194,6 @@ public class ToneMapper {
    private static native long nCreateACESToneMapper();
    private static native long nCreateACESLegacyToneMapper();
    private static native long nCreateFilmicToneMapper();
-    private static native long nCreatePBRNeutralToneMapper();
-    private static native long nCreateAgxToneMapper(int look);
    private static native long nCreateGenericToneMapper(
            float contrast, float midGrayIn, float midGrayOut, float hdrMax);

--- a/android/filament-android/src/main/java/com/google/android/filament/View.java
+++ b/android/filament-android/src/main/java/com/google/android/filament/View.java
@@ -75,7 +75,6 @@ public class View {
    private AmbientOcclusionOptions mAmbientOcclusionOptions;
    private BloomOptions mBloomOptions;
    private FogOptions mFogOptions;
-    private StereoscopicOptions mStereoscopicOptions;
    private RenderTarget mRenderTarget;
    private BlendMode mBlendMode;
    private DepthOfFieldOptions mDepthOfFieldOptions;
@@ -241,15 +240,6 @@ public class View {
        nSetCamera(getNativeObject(), camera == null ? 0 : camera.getNativeObject());
    }

-    /**
-     * Query whether a camera is set.
-     * @return true if a camera is set, false otherwise
-     * @see #setCamera
-     */
-    public boolean hasCamera() {
-        return nHasCamera(getNativeObject());
-    }
-
    /**
     * Gets this View's associated Camera, or null if none has been assigned.
     *
@@ -745,33 +735,6 @@ public class View {
        nSetFrontFaceWindingInverted(getNativeObject(), inverted);
    }

-    /**
-     * Returns true if transparent picking is enabled.
-     *
-     * @see #setTransparentPickingEnabled
-     */
-    public boolean isTransparentPickingEnabled() {
-        return nIsTransparentPickingEnabled(getNativeObject());
-    }
-
-    /**
-     * Enables or disables transparent picking. Disabled by default.
-     *
-     * When transparent picking is enabled, View::pick() will pick from both
-     * transparent and opaque renderables. When disabled, View::pick() will only
-     * pick from opaque renderables.
-     *
-     * <p>
-     * Transparent picking will create an extra pass for rendering depth
-     * from both transparent and opaque renderables. 
-     * </p>
-     *
-     * @param enabled true enables transparent picking, false disables it.
-     */
-    public void setTransparentPickingEnabled(boolean enabled) {
-        nSetTransparentPickingEnabled(getNativeObject(), enabled);
-    }
-
    /**
     * Sets options relative to dynamic lighting for this view.
     *
@@ -941,7 +904,7 @@ public class View {
        mBloomOptions = options;
        nSetBloomOptions(getNativeObject(), options.dirt != null ? options.dirt.getNativeObject() : 0,
                options.dirtStrength, options.strength, options.resolution,
-                options.levels, options.blendMode.ordinal(),
+                options.anamorphism, options.levels, options.blendMode.ordinal(),
                options.threshold, options.enabled, options.highlight,
                options.lensFlare, options.starburst, options.chromaticAberration,
                options.ghostCount, options.ghostSpacing, options.ghostThreshold,
@@ -1069,8 +1032,7 @@ public class View {
     * </p>
     *
     * <p>
-     * If post-processing is disabled, then the SwapChain must have the CONFIG_HAS_STENCIL_BUFFER
-     * flag set in order to use the stencil buffer.
+     * Post-processing must be enabled in order to use the stencil buffer.
     * </p>
     *
     * <p>
@@ -1092,51 +1054,6 @@ public class View {
        return nIsStencilBufferEnabled(getNativeObject());
    }

-    /**
-     * Sets the stereoscopic rendering options for this view.
-     *
-     * <p>
-     * Currently, only one type of stereoscopic rendering is supported: side-by-side.
-     * Side-by-side stereo rendering splits the viewport into two halves: a left and right half.
-     * Eye 0 will render to the left half, while Eye 1 will render into the right half.
-     * </p>
-     *
-     * <p>
-     * Currently, the following features are not supported with stereoscopic rendering:
-     * - post-processing
-     * - shadowing
-     * - punctual lights
-     * </p>
-     *
-     * <p>
-     * Stereo rendering depends on device and platform support. To check if stereo rendering is
-     * supported, use {@link Engine#isStereoSupported()}. If stereo rendering is not supported, then
-     * the stereoscopic options have no effect.
-     * </p>
-     *
-     * @param options The stereoscopic options to use on this view
-     * @see #getStereoscopicOptions
-     */
-    public void setStereoscopicOptions(@NonNull StereoscopicOptions options) {
-        mStereoscopicOptions = options;
-        nSetStereoscopicOptions(getNativeObject(), options.enabled);
-    }
-
-    /**
-     * Gets the stereoscopic options.
-     *
-     * @return options Stereoscopic options currently set.
-     * @see #setStereoscopicOptions
-     */
-    @NonNull
-    public StereoscopicOptions getStereoscopicOptions() {
-        if (mStereoscopicOptions == null) {
-            mStereoscopicOptions = new StereoscopicOptions();
-        }
-        return mStereoscopicOptions;
-    }
-
-
    /**
     * A class containing the result of a picking query
     */
@@ -1260,18 +1177,6 @@ public class View {
        return nGetFogEntity(getNativeObject());
    }

-    /**
-     * When certain temporal features are used (e.g.: TAA or Screen-space reflections), the view
-     * keeps a history of previous frame renders associated with the Renderer the view was last
-     * used with. When switching Renderer, it may be necessary to clear that history by calling
-     * this method. Similarly, if the whole content of the screen change, like when a cut-scene
-     * starts, clearing the history might be needed to avoid artifacts due to the previous frame
-     * being very different.
-     */
-    public void clearFrameHistory(Engine engine) {
-        nClearFrameHistory(getNativeObject(), engine.getNativeObject());
-    }
-
    public long getNativeObject() {
        if (mNativeObject == 0) {
            throw new IllegalStateException("Calling method on destroyed View");
@@ -1286,7 +1191,6 @@ public class View {
    private static native void nSetName(long nativeView, String name);
    private static native void nSetScene(long nativeView, long nativeScene);
    private static native void nSetCamera(long nativeView, long nativeCamera);
-    private static native boolean nHasCamera(long nativeView);
    private static native void nSetViewport(long nativeView, int left, int bottom, int width, int height);
    private static native void nSetVisibleLayers(long nativeView, int select, int value);
    private static native void nSetShadowingEnabled(long nativeView, boolean enabled);
@@ -1308,16 +1212,13 @@ public class View {
    private static native boolean nIsPostProcessingEnabled(long nativeView);
    private static native void nSetFrontFaceWindingInverted(long nativeView, boolean inverted);
    private static native boolean nIsFrontFaceWindingInverted(long nativeView);
-    private static native void nSetTransparentPickingEnabled(long nativeView, boolean enabled);
-    private static native boolean nIsTransparentPickingEnabled(long nativeView);
    private static native void nSetAmbientOcclusion(long nativeView, int ordinal);
    private static native int nGetAmbientOcclusion(long nativeView);
    private static native void nSetAmbientOcclusionOptions(long nativeView, float radius, float bias, float power, float resolution, float intensity, float bilateralThreshold, int quality, int lowPassFilter, int upsampling, boolean enabled, boolean bentNormals, float minHorizonAngleRad);
    private static native void nSetSSCTOptions(long nativeView, float ssctLightConeRad, float ssctStartTraceDistance, float ssctContactDistanceMax, float ssctIntensity, float v, float v1, float v2, float ssctDepthBias, float ssctDepthSlopeBias, int ssctSampleCount, int ssctRayCount, boolean ssctEnabled);
-    private static native void nSetBloomOptions(long nativeView, long dirtNativeObject, float dirtStrength, float strength, int resolution, int levels, int blendMode, boolean threshold, boolean enabled, float highlight,
+    private static native void nSetBloomOptions(long nativeView, long dirtNativeObject, float dirtStrength, float strength, int resolution, float anamorphism, int levels, int blendMode, boolean threshold, boolean enabled, float highlight,
            boolean lensFlare, boolean starburst, float chromaticAberration, int ghostCount, float ghostSpacing, float ghostThreshold, float haloThickness, float haloRadius, float haloThreshold);
    private static native void nSetFogOptions(long nativeView, float distance, float maximumOpacity, float height, float heightFalloff, float cutOffDistance, float v, float v1, float v2, float density, float inScatteringStart, float inScatteringSize, boolean fogColorFromIbl, long skyColorNativeObject, boolean enabled);
-    private static native void nSetStereoscopicOptions(long nativeView, boolean enabled);
    private static native void nSetBlendMode(long nativeView, int blendMode);
    private static native void nSetDepthOfFieldOptions(long nativeView, float cocScale, float maxApertureDiameter, boolean enabled, int filter,
            boolean nativeResolution, int foregroundRingCount, int backgroundRingCount, int fastGatherRingCount, int maxForegroundCOC, int maxBackgroundCOC);
@@ -1335,7 +1236,7 @@ public class View {
    private static native void nSetMaterialGlobal(long nativeView, int index, float x, float y, float z, float w);
    private static native void nGetMaterialGlobal(long nativeView, int index, float[] out);
    private static native int nGetFogEntity(long nativeView);
-    private static native void nClearFrameHistory(long nativeView, long nativeEngine);
+

    /**
     * List of available ambient occlusion techniques.
@@ -1452,6 +1353,8 @@ public class View {
     * blendMode:   Whether the bloom effect is purely additive (false) or mixed with the original
     *              image (true).
     *
+     * anamorphism: Bloom's aspect ratio (x/y), for artistic purposes.
+     *
     * threshold:   When enabled, a threshold at 1.0 is applied on the source image, this is
     *              useful for artistic reasons and is usually needed when a dirt texture is used.
     *
@@ -1490,6 +1393,10 @@ public class View {
         * resolution of vertical axis (2^levels to 2048)
         */
        public int resolution = 384;
+        /**
+         * bloom x/y aspect-ratio (1/32 to 32)
+         */
+        public float anamorphism = 1.0f;
        /**
         * number of blur levels (1 to 11)
         */
@@ -1511,17 +1418,6 @@ public class View {
         * limit highlights to this value before bloom [10, +inf]
         */
        public float highlight = 1000.0f;
-        /**
-         * Bloom quality level.
-         * LOW (default): use a more optimized down-sampling filter, however there can be artifacts
-         *      with dynamic resolution, this can be alleviated by using the homogenous mode.
-         * MEDIUM: Good balance between quality and performance.
-         * HIGH: In this mode the bloom resolution is automatically increased to avoid artifacts.
-         *      This mode can be significantly slower on mobile, especially at high resolution.
-         *      This mode greatly improves the anamorphic bloom.
-         */
-        @NonNull
-        public QualityLevel quality = QualityLevel.LOW;
        /**
         * enable screen-space lens flare
         */
@@ -1688,10 +1584,6 @@ public class View {
         * circle of confusion scale factor (amount of blur)
         */
        public float cocScale = 1.0f;
-        /**
-         * width/height aspect ratio of the circle of confusion (simulate anamorphic lenses)
-         */
-        public float cocAspectRatio = 1.0f;
        /**
         * maximum aperture diameter in meters (zero to disable rotation)
         */
@@ -1907,7 +1799,7 @@ public class View {
    }

    /**
-     * Options for Multi-Sample Anti-aliasing (MSAA)
+     * Options for Temporal Multi-Sample Anti-aliasing (MSAA)
     * @see setMultiSampleAntiAliasingOptions()
     */
    public static class MultiSampleAntiAliasingOptions {
@@ -1931,111 +1823,21 @@ public class View {

    /**
     * Options for Temporal Anti-aliasing (TAA)
-     * Most TAA parameters are extremely costly to change, as they will trigger the TAA post-process
-     * shaders to be recompiled. These options should be changed or set during initialization.
-     * `filterWidth`, `feedback` and `jitterPattern`, however, can be changed at any time.
-     *
-     * `feedback` of 0.1 effectively accumulates a maximum of 19 samples in steady state.
-     * see "A Survey of Temporal Antialiasing Techniques" by Lei Yang and all for more information.
-     *
     * @see setTemporalAntiAliasingOptions()
     */
    public static class TemporalAntiAliasingOptions {
-        public enum BoxType {
-            /**
-             * use an AABB neighborhood
-             */
-            AABB,
-            /**
-             * use the variance of the neighborhood (not recommended)
-             */
-            VARIANCE,
-            /**
-             * use both AABB and variance
-             */
-            AABB_VARIANCE,
-        }
-
-        public enum BoxClipping {
-            /**
-             * Accurate box clipping
-             */
-            ACCURATE,
-            /**
-             * clamping
-             */
-            CLAMP,
-            /**
-             * no rejections (use for debugging)
-             */
-            NONE,
-        }
-
-        public enum JitterPattern {
-            RGSS_X4,
-            UNIFORM_HELIX_X4,
-            HALTON_23_X8,
-            HALTON_23_X16,
-            HALTON_23_X32,
-        }
-
        /**
-         * reconstruction filter width typically between 0.2 (sharper, aliased) and 1.5 (smoother)
+         * reconstruction filter width typically between 0 (sharper, aliased) and 1 (smoother)
         */
        public float filterWidth = 1.0f;
        /**
         * history feedback, between 0 (maximum temporal AA) and 1 (no temporal AA).
         */
-        public float feedback = 0.12f;
-        /**
-         * texturing lod bias (typically -1 or -2)
-         */
-        public float lodBias = -1.0f;
-        /**
-         * post-TAA sharpen, especially useful when upscaling is true.
-         */
-        public float sharpness = 0.0f;
+        public float feedback = 0.04f;
        /**
         * enables or disables temporal anti-aliasing
         */
        public boolean enabled = false;
-        /**
-         * 4x TAA upscaling. Disables Dynamic Resolution. [BETA]
-         */
-        public boolean upscaling = false;
-        /**
-         * whether to filter the history buffer
-         */
-        public boolean filterHistory = true;
-        /**
-         * whether to apply the reconstruction filter to the input
-         */
-        public boolean filterInput = true;
-        /**
-         * whether to use the YcoCg color-space for history rejection
-         */
-        public boolean useYCoCg = false;
-        /**
-         * type of color gamut box
-         */
-        @NonNull
-        public TemporalAntiAliasingOptions.BoxType boxType = TemporalAntiAliasingOptions.BoxType.AABB;
-        /**
-         * clipping algorithm
-         */
-        @NonNull
-        public TemporalAntiAliasingOptions.BoxClipping boxClipping = TemporalAntiAliasingOptions.BoxClipping.ACCURATE;
-        @NonNull
-        public TemporalAntiAliasingOptions.JitterPattern jitterPattern = TemporalAntiAliasingOptions.JitterPattern.HALTON_23_X16;
-        public float varianceGamma = 1.0f;
-        /**
-         * adjust the feedback dynamically to reduce flickering
-         */
-        public boolean preventFlickering = false;
-        /**
-         * whether to apply history reprojection (debug option)
-         */
-        public boolean historyReprojection = true;
    }

    /**
@@ -2122,7 +1924,6 @@ public class View {
         * PCF with soft shadows and contact hardening
         */
        PCSS,
-        PCFd,
    }

    /**
--- a/android/filament-android/src/main/java/com/google/android/filament/android/UiHelper.java
+++ b/android/filament-android/src/main/java/com/google/android/filament/android/UiHelper.java
@@ -27,7 +27,7 @@ import android.view.SurfaceHolder;
 import android.view.SurfaceView;
 import android.view.TextureView;

-import com.google.android.filament.SwapChainFlags;
+import com.google.android.filament.SwapChain;

 /**
 * UiHelper is a simple class that can manage either a SurfaceView, TextureView, or a SurfaceHolder
@@ -182,85 +182,28 @@ public class UiHelper {
        void detach();
    }

-    private class SurfaceViewHandler implements RenderSurface, SurfaceHolder.Callback {
-        @NonNull private final SurfaceView mSurfaceView;
+    private static class SurfaceViewHandler implements RenderSurface {
+        private final SurfaceView mSurfaceView;

-        SurfaceViewHandler(@NonNull SurfaceView surfaceView) {
-            mSurfaceView = surfaceView;
-
-            @NonNull SurfaceHolder holder = surfaceView.getHolder();
-            holder.addCallback(this);
-
-            if (mDesiredWidth > 0 && mDesiredHeight > 0) {
-                holder.setFixedSize(mDesiredWidth, mDesiredHeight);
-            }
-
-            // in case the SurfaceView's surface already existed
-            final Surface surface = holder.getSurface();
-            if (surface != null && surface.isValid()) {
-                surfaceCreated(holder);
-                // there is no way to retrieve the actual PixelFormat, since it is not used
-                // in the callback, we can use whatever we want.
-                surfaceChanged(holder, PixelFormat.RGBA_8888,
-                    holder.getSurfaceFrame().width(), holder.getSurfaceFrame().height());
-            }
+        SurfaceViewHandler(SurfaceView surface) {
+            mSurfaceView = surface;
        }

        @Override
        public void resize(int width, int height) {
-            @NonNull SurfaceHolder holder = mSurfaceView.getHolder();
-            holder.setFixedSize(width, height);
+            mSurfaceView.getHolder().setFixedSize(width, height);
        }

        @Override
        public void detach() {
-            @NonNull SurfaceHolder holder = mSurfaceView.getHolder();
-            holder.removeCallback(this);
-        }
-
-        @Override
-        public void surfaceCreated(@NonNull SurfaceHolder holder) {
-            if (LOGGING) Log.d(LOG_TAG, "surfaceCreated()");
-            createSwapChain(holder.getSurface());
-        }
-
-        @Override
-        public void surfaceChanged(
-            @NonNull SurfaceHolder holder, int format, int width, int height) {
-            // Note: this is always called at least once after surfaceCreated()
-            if (LOGGING) Log.d(LOG_TAG, "surfaceChanged(" + width + ", " + height + ")");
-            if (mRenderCallback != null) {
-                mRenderCallback.onResized(width, height);
-            }
-        }
-
-        @Override
-        public void surfaceDestroyed(@NonNull SurfaceHolder holder) {
-            if (LOGGING) Log.d(LOG_TAG, "surfaceDestroyed()");
-            destroySwapChain();
        }
    }

-    private class SurfaceHolderHandler implements RenderSurface, SurfaceHolder.Callback {
+    private static class SurfaceHolderHandler implements RenderSurface {
        private final SurfaceHolder mSurfaceHolder;

-        SurfaceHolderHandler(@NonNull SurfaceHolder holder) {
-            mSurfaceHolder = holder;
-            holder.addCallback(this);
-
-            if (mDesiredWidth > 0 && mDesiredHeight > 0) {
-                holder.setFixedSize(mDesiredWidth, mDesiredHeight);
-            }
-
-            // in case the SurfaceHolder's surface already existed
-            final Surface surface = holder.getSurface();
-            if (surface != null && surface.isValid()) {
-                surfaceCreated(holder);
-                // there is no way to retrieve the actual PixelFormat, since it is not used
-                // in the callback, we can use whatever we want.
-                surfaceChanged(holder, PixelFormat.RGBA_8888,
-                    holder.getSurfaceFrame().width(), holder.getSurfaceFrame().height());
-            }
+        SurfaceHolderHandler(SurfaceHolder surface) {
+            mSurfaceHolder = surface;
        }

        @Override
@@ -270,127 +213,30 @@ public class UiHelper {

        @Override
        public void detach() {
-            mSurfaceHolder.removeCallback(this);
-        }
-
-        @Override
-        public void surfaceCreated(@NonNull SurfaceHolder holder) {
-            if (LOGGING) Log.d(LOG_TAG, "surfaceCreated()");
-            createSwapChain(holder.getSurface());
-        }
-
-        @Override
-        public void surfaceChanged(@NonNull SurfaceHolder holder, int format, int width, int height) {
-            // Note: this is always called at least once after surfaceCreated()
-            if (LOGGING) Log.d(LOG_TAG, "surfaceChanged(" + width + ", " + height + ")");
-            if (mRenderCallback != null) {
-                mRenderCallback.onResized(width, height);
-            }
-        }
-
-        @Override
-        public void surfaceDestroyed(@NonNull SurfaceHolder surfaceHolder) {
-            if (LOGGING) Log.d(LOG_TAG, "surfaceDestroyed()");
-            destroySwapChain();
        }
    }

-    private class TextureViewHandler implements RenderSurface, TextureView.SurfaceTextureListener {
+    private class TextureViewHandler implements RenderSurface {
        private final TextureView mTextureView;
        private Surface mSurface;

-        TextureViewHandler(@NonNull TextureView view) {
-            mTextureView = view;
-            mTextureView.setSurfaceTextureListener(this);
-            // in case the View's SurfaceTexture already existed
-            if (view.isAvailable()) {
-                SurfaceTexture surfaceTexture = view.getSurfaceTexture();
-                if (surfaceTexture != null) {
-                    this.onSurfaceTextureAvailable(surfaceTexture,
-                        mDesiredWidth, mDesiredHeight);
-                }
-            }
-        }
+        TextureViewHandler(TextureView surface) { mTextureView = surface; }

        @Override
        public void resize(int width, int height) {
            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.ICE_CREAM_SANDWICH_MR1) {
-                final SurfaceTexture surfaceTexture = mTextureView.getSurfaceTexture();
-                if (surfaceTexture != null) {
-                    surfaceTexture.setDefaultBufferSize(width, height);
-                }
-            }
-            if (mRenderCallback != null) {
-                // the call above won't cause TextureView.onSurfaceTextureSizeChanged()
-                mRenderCallback.onResized(width, height);
+                mTextureView.getSurfaceTexture().setDefaultBufferSize(width, height);
            }
+            // the call above won't cause TextureView.onSurfaceTextureSizeChanged()
+            mRenderCallback.onResized(width, height);
        }

        @Override
        public void detach() {
-            mTextureView.setSurfaceTextureListener(null);
-        }
-
-
-        @Override
-        public void onSurfaceTextureAvailable(
-            @NonNull SurfaceTexture surfaceTexture, int width, int height) {
-            if (LOGGING) Log.d(LOG_TAG, "onSurfaceTextureAvailable()");
-
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.ICE_CREAM_SANDWICH_MR1) {
-                if (mDesiredWidth > 0 && mDesiredHeight > 0) {
-                    surfaceTexture.setDefaultBufferSize(mDesiredWidth, mDesiredHeight);
-                }
-            }
-
-            final Surface surface = new Surface(surfaceTexture);
-            setSurface(surface);
-            createSwapChain(surface);
-
-            if (mRenderCallback != null) {
-                // Call this the first time because onSurfaceTextureSizeChanged()
-                // isn't called at initialization time
-                mRenderCallback.onResized(width, height);
-            }
-        }
-
-        @Override
-        public void onSurfaceTextureSizeChanged(
-            @NonNull SurfaceTexture surfaceTexture, int width, int height) {
-            if (LOGGING) Log.d(LOG_TAG, "onSurfaceTextureSizeChanged()");
-            if (mRenderCallback != null) {
-                if (mDesiredWidth > 0 && mDesiredHeight > 0) {
-                    surfaceTexture.setDefaultBufferSize(mDesiredWidth, mDesiredHeight);
-                    mRenderCallback.onResized(mDesiredWidth, mDesiredHeight);
-                } else {
-                    mRenderCallback.onResized(width, height);
-                }
-                // We must recreate the SwapChain to guarantee that it sees the new size.
-                // More precisely, for an EGL client, the EGLSurface must be recreated. For
-                // a Vulkan client, the SwapChain must be recreated. Calling
-                // onNativeWindowChanged() will accomplish that.
-                // This requirement comes from SurfaceTexture.setDefaultBufferSize()
-                // documentation.
-                final Surface surface = getSurface();
-                if (surface != null) {
-                    mRenderCallback.onNativeWindowChanged(surface);
-                }
-            }
-        }
-
-        @Override
-        public boolean onSurfaceTextureDestroyed(@NonNull SurfaceTexture surfaceTexture) {
-            if (LOGGING) Log.d(LOG_TAG, "onSurfaceTextureDestroyed()");
            setSurface(null);
-            destroySwapChain();
-            return true;
        }

-        @Override
-        public void onSurfaceTextureUpdated(@NonNull SurfaceTexture surface) { }
-
-
-        private void setSurface(@Nullable Surface surface) {
+        void setSurface(Surface surface) {
            if (surface == null) {
                if (mSurface != null) {
                    mSurface.release();
@@ -399,7 +245,7 @@ public class UiHelper {
            mSurface = surface;
        }

-        private Surface getSurface() {
+        public Surface getSurface() {
            return mSurface;
        }
    }
@@ -445,9 +291,6 @@ public class UiHelper {
     * {@link #attachTo(TextureView)}, or {@link #attachTo(SurfaceHolder)}.
     */
    public void detach() {
-        if (mRenderSurface != null) {
-            mRenderSurface.detach();
-        }
        destroySwapChain();
        mNativeWindow = null;
        mRenderSurface = null;
@@ -455,6 +298,7 @@ public class UiHelper {

    /**
     * Checks whether we are ready to render into the attached surface.
+     *
     * Using OpenGL ES when this returns true, will result in drawing commands being lost,
     * HOWEVER, GLES state will be preserved. This is useful to initialize the engine.
     *
@@ -499,6 +343,7 @@ public class UiHelper {
    /**
     * Controls whether the render target (SurfaceView or TextureView) is opaque or not.
     * The render target is considered opaque by default.
+     *
     * Must be called before calling {@link #attachTo(SurfaceView)}, {@link #attachTo(TextureView)},
     * or {@link #attachTo(SurfaceHolder)}.
     *
@@ -521,8 +366,10 @@ public class UiHelper {
     * positioned above other surfaces but below the activity's surface. This property
     * only has an effect when used in combination with {@link #setOpaque(boolean) setOpaque(false)}
     * and does not affect TextureView targets.
+     *
     * Must be called before calling {@link #attachTo(SurfaceView)}
     * or {@link #attachTo(TextureView)}.
+     *
     * Has no effect when using {@link #attachTo(SurfaceHolder)}.
     *
     * @param overlay Indicates whether the render target should be rendered below the activity's
@@ -538,11 +385,12 @@ public class UiHelper {
     * the options set on this UiHelper.
     */
    public long getSwapChainFlags() {
-        return isOpaque() ? SwapChainFlags.CONFIG_DEFAULT : SwapChainFlags.CONFIG_TRANSPARENT;
+        return isOpaque() ? SwapChain.CONFIG_DEFAULT : SwapChain.CONFIG_TRANSPARENT;
    }

    /**
     * Associate UiHelper with a SurfaceView.
+     *
     * As soon as SurfaceView is ready (i.e. has a Surface), we'll create the
     * EGL resources needed, and call user callbacks if needed.
     */
@@ -557,32 +405,171 @@ public class UiHelper {
                view.setZOrderOnTop(translucent);
            }

-            view.getHolder().setFormat(isOpaque() ? PixelFormat.OPAQUE : PixelFormat.TRANSLUCENT);
+            int format = isOpaque() ? PixelFormat.OPAQUE : PixelFormat.TRANSLUCENT;
+            view.getHolder().setFormat(format);
+
            mRenderSurface = new SurfaceViewHandler(view);
+
+            final SurfaceHolder.Callback callback = new SurfaceHolder.Callback() {
+                @Override
+                public void surfaceCreated(SurfaceHolder holder) {
+                    if (LOGGING) Log.d(LOG_TAG, "surfaceCreated()");
+                    createSwapChain(holder.getSurface());
+                }
+
+                @Override
+                public void surfaceChanged(
+                        SurfaceHolder holder, int format, int width, int height) {
+                    // Note: this is always called at least once after surfaceCreated()
+                    if (LOGGING) Log.d(LOG_TAG, "surfaceChanged(" + width + ", " + height + ")");
+                    mRenderCallback.onResized(width, height);
+                }
+
+                @Override
+                public void surfaceDestroyed(SurfaceHolder holder) {
+                    if (LOGGING) Log.d(LOG_TAG, "surfaceDestroyed()");
+                    destroySwapChain();
+                }
+            };
+
+            SurfaceHolder holder = view.getHolder();
+            holder.addCallback(callback);
+            if (mDesiredWidth > 0 && mDesiredHeight > 0) {
+                holder.setFixedSize(mDesiredWidth, mDesiredHeight);
+            }
+
+            // in case the SurfaceView's surface already existed
+            final Surface surface = holder.getSurface();
+            if (surface != null && surface.isValid()) {
+                callback.surfaceCreated(holder);
+                callback.surfaceChanged(holder, format,
+                        holder.getSurfaceFrame().width(), holder.getSurfaceFrame().height());
+            }
        }
    }

    /**
     * Associate UiHelper with a TextureView.
+     *
     * As soon as TextureView is ready (i.e. has a buffer), we'll create the
     * EGL resources needed, and call user callbacks if needed.
     */
    public void attachTo(@NonNull TextureView view) {
        if (attach(view)) {
            view.setOpaque(isOpaque());
+
            mRenderSurface = new TextureViewHandler(view);
+
+            TextureView.SurfaceTextureListener listener = new TextureView.SurfaceTextureListener() {
+                @Override
+                public void onSurfaceTextureAvailable(
+                        SurfaceTexture surfaceTexture, int width, int height) {
+                    if (LOGGING) Log.d(LOG_TAG, "onSurfaceTextureAvailable()");
+
+                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.ICE_CREAM_SANDWICH_MR1) {
+                        if (mDesiredWidth > 0 && mDesiredHeight > 0) {
+                            surfaceTexture.setDefaultBufferSize(mDesiredWidth, mDesiredHeight);
+                        }
+                    }
+
+                    Surface surface = new Surface(surfaceTexture);
+                    TextureViewHandler textureViewHandler = (TextureViewHandler) mRenderSurface;
+                    textureViewHandler.setSurface(surface);
+
+                    createSwapChain(surface);
+
+                    // Call this the first time because onSurfaceTextureSizeChanged()
+                    // isn't called at initialization time
+                    mRenderCallback.onResized(width, height);
+                }
+
+                @Override
+                public void onSurfaceTextureSizeChanged(
+                        SurfaceTexture surfaceTexture, int width, int height) {
+                    if (LOGGING) Log.d(LOG_TAG, "onSurfaceTextureSizeChanged()");
+                    if (mDesiredWidth > 0 && mDesiredHeight > 0) {
+                        surfaceTexture.setDefaultBufferSize(mDesiredWidth, mDesiredHeight);
+                        mRenderCallback.onResized(mDesiredWidth, mDesiredHeight);
+                    } else {
+                        mRenderCallback.onResized(width, height);
+                    }
+                    // We must recreate the SwapChain to guarantee that it sees the new size.
+                    // More precisely, for an EGL client, the EGLSurface must be recreated. For
+                    // a Vulkan client, the SwapChain must be recreated. Calling
+                    // onNativeWindowChanged() will accomplish that.
+                    // This requirement comes from SurfaceTexture.setDefaultBufferSize()
+                    // documentation.
+                    TextureViewHandler textureViewHandler = (TextureViewHandler) mRenderSurface;
+                    mRenderCallback.onNativeWindowChanged(textureViewHandler.getSurface());
+                }
+
+                @Override
+                public boolean onSurfaceTextureDestroyed(SurfaceTexture surfaceTexture) {
+                    if (LOGGING) Log.d(LOG_TAG, "onSurfaceTextureDestroyed()");
+                    destroySwapChain();
+                    return true;
+                }
+
+                @Override
+                public void onSurfaceTextureUpdated(SurfaceTexture surface) { }
+            };
+
+            view.setSurfaceTextureListener(listener);
+
+            // in case the View's SurfaceTexture already existed
+            if (view.isAvailable()) {
+                SurfaceTexture surfaceTexture = view.getSurfaceTexture();
+                listener.onSurfaceTextureAvailable(surfaceTexture, mDesiredWidth, mDesiredHeight);
+            }
        }
    }

    /**
     * Associate UiHelper with a SurfaceHolder.
+     *
     * As soon as a Surface is created, we'll create the
     * EGL resources needed, and call user callbacks if needed.
     */
    public void attachTo(@NonNull SurfaceHolder holder) {
        if (attach(holder)) {
-            holder.setFormat(isOpaque() ? PixelFormat.OPAQUE : PixelFormat.TRANSLUCENT);
+            int format = isOpaque() ? PixelFormat.OPAQUE : PixelFormat.TRANSLUCENT;
+            holder.setFormat(format);
+
            mRenderSurface = new SurfaceHolderHandler(holder);
+
+            final SurfaceHolder.Callback callback = new SurfaceHolder.Callback() {
+                @Override
+                public void surfaceCreated(SurfaceHolder surfaceHolder) {
+                    if (LOGGING) Log.d(LOG_TAG, "surfaceCreated()");
+                    createSwapChain(holder.getSurface());
+                }
+
+                @Override
+                public void surfaceChanged(SurfaceHolder holder, int format, int width, int height) {
+                    // Note: this is always called at least once after surfaceCreated()
+                    if (LOGGING) Log.d(LOG_TAG, "surfaceChanged(" + width + ", " + height + ")");
+                    mRenderCallback.onResized(width, height);
+                }
+
+                @Override
+                public void surfaceDestroyed(SurfaceHolder surfaceHolder) {
+                    if (LOGGING) Log.d(LOG_TAG, "surfaceDestroyed()");
+                    destroySwapChain();
+                }
+            };
+
+            holder.addCallback(callback);
+            if (mDesiredWidth > 0 && mDesiredHeight > 0) {
+                holder.setFixedSize(mDesiredWidth, mDesiredHeight);
+            }
+
+            // in case the SurfaceHolder's surface already existed
+            final Surface surface = holder.getSurface();
+            if (surface != null && surface.isValid()) {
+                callback.surfaceCreated(holder);
+                callback.surfaceChanged(holder, format,
+                        holder.getSurfaceFrame().width(), holder.getSurfaceFrame().height());
+            }
        }
    }

@@ -593,10 +580,6 @@ public class UiHelper {
                // nothing to do
                return false;
            }
-            if (mRenderSurface != null) {
-                mRenderSurface.detach();
-                mRenderSurface = null;
-            }
            destroySwapChain();
        }
        mNativeWindow = nativeWindow;
@@ -604,16 +587,15 @@ public class UiHelper {
    }

    private void createSwapChain(@NonNull Surface surface) {
-        if (mRenderCallback != null) {
-            mRenderCallback.onNativeWindowChanged(surface);
-        }
+        mRenderCallback.onNativeWindowChanged(surface);
        mHasSwapChain = true;
    }

    private void destroySwapChain() {
-        if (mRenderCallback != null) {
-            mRenderCallback.onDetachedFromSurface();
+        if (mRenderSurface != null) {
+            mRenderSurface.detach();
        }
+        mRenderCallback.onDetachedFromSurface();
        mHasSwapChain = false;
    }
 }
--- a/android/filament-utils-android/CMakeLists.txt
+++ b/android/filament-utils-android/CMakeLists.txt
@@ -31,7 +31,6 @@ set_target_properties(iblprefilter PROPERTIES IMPORTED_LOCATION
        ${FILAMENT_DIR}/lib/${ANDROID_ABI}/libfilament-iblprefilter.a)

 set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} -Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/libfilament-utils-jni.map")
-set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-z,max-page-size=16384")

 add_library(filament-utils-jni SHARED
        src/main/cpp/AutomationEngine.cpp
--- a/android/filament-utils-android/build.gradle
+++ b/android/filament-utils-android/build.gradle
@@ -12,6 +12,9 @@ android {
        }
    }

+    defaultConfig {
+        missingDimensionStrategy 'functionality', 'full'
+    }
    packagingOptions {
        // No need to package up the following shared libs, which arise as a side effect of our
        // externalNativeBuild dependencies. When clients pick and choose from project-level gradle
--- a/android/filament-utils-android/src/main/cpp/Manipulator.cpp
+++ b/android/filament-utils-android/src/main/cpp/Manipulator.cpp
@@ -125,11 +125,6 @@ extern "C" JNIEXPORT void Java_com_google_android_filament_utils_Manipulator_nBu
    builder->groundPlane(a, b, c, d);
 }

-extern "C" JNIEXPORT void Java_com_google_android_filament_utils_Manipulator_nBuilderPanning(JNIEnv*, jclass, jlong nativeBuilder, jboolean enabled) {
-    Builder* builder = (Builder*) nativeBuilder;
-    builder->panning(enabled);
-}
-
 extern "C" JNIEXPORT long Java_com_google_android_filament_utils_Manipulator_nBuilderBuild(JNIEnv*, jclass, jlong nativeBuilder, jint mode) {
    Builder* builder = (Builder*) nativeBuilder;
    return (jlong) builder->build((Mode) mode);
--- a/android/filament-utils-android/src/main/java/com/google/android/filament/utils/Half.kt
+++ b/android/filament-utils-android/src/main/java/com/google/android/filament/utils/Half.kt
@@ -17,8 +17,6 @@
 // Operators +, *, / based on http://half.sourceforge.net/ by Christian Rau
 // and licensed under MIT

-@file:Suppress("NOTHING_TO_INLINE")
-
 package com.google.android.filament.utils

 import com.google.android.filament.utils.Half.Companion.POSITIVE_INFINITY
--- a/android/filament-utils-android/src/main/java/com/google/android/filament/utils/Manipulator.java
+++ b/android/filament-utils-android/src/main/java/com/google/android/filament/utils/Manipulator.java
@@ -274,17 +274,6 @@ public class Manipulator {
            return this;
        }

-        /**
-         * Sets whether panning is enabled in the manipulator.
-         *
-         * @return this <code>Builder</code> object for chaining calls
-         */
-        @NonNull
-        public Builder panning(Boolean enabled) {
-            nBuilderPanning(mNativeBuilder, enabled);
-            return this;
-        }
-
        /**
         * Creates and returns the <code>Manipulator</code> object.
         *
@@ -494,7 +483,6 @@ public class Manipulator {
    private static native void nBuilderFlightPanSpeed(long nativeBuilder, float x, float y);
    private static native void nBuilderFlightMoveDamping(long nativeBuilder, float damping);
    private static native void nBuilderGroundPlane(long nativeBuilder, float a, float b, float c, float d);
-    private static native void nBuilderPanning(long nativeBuilder, Boolean enabled);
    private static native long nBuilderBuild(long nativeBuilder, int mode);

    private static native void nDestroyManipulator(long nativeManip);
--- a/android/gltfio-android/CMakeLists.txt
+++ b/android/gltfio-android/CMakeLists.txt
@@ -44,7 +44,6 @@ set_target_properties(uberarchive PROPERTIES IMPORTED_LOCATION
        ${FILAMENT_DIR}/lib/${ANDROID_ABI}/libuberarchive.a)

 set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} -Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/libgltfio-jni.map")
-set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-z,max-page-size=16384")

 set(GLTFIO_SRCS
        ${GLTFIO_DIR}/include/gltfio/Animator.h
@@ -53,7 +52,6 @@ set(GLTFIO_SRCS
        ${GLTFIO_DIR}/include/gltfio/FilamentInstance.h
        ${GLTFIO_DIR}/include/gltfio/MaterialProvider.h
        ${GLTFIO_DIR}/include/gltfio/NodeManager.h
-        ${GLTFIO_DIR}/include/gltfio/TrsTransformManager.h
        ${GLTFIO_DIR}/include/gltfio/ResourceLoader.h
        ${GLTFIO_DIR}/include/gltfio/TextureProvider.h
        ${GLTFIO_DIR}/include/gltfio/math.h
@@ -71,31 +69,18 @@ set(GLTFIO_SRCS
        ${GLTFIO_DIR}/src/FilamentAsset.cpp
        ${GLTFIO_DIR}/src/FilamentInstance.cpp
        ${GLTFIO_DIR}/src/FNodeManager.h
-        ${GLTFIO_DIR}/src/FTrsTransformManager.h
        ${GLTFIO_DIR}/src/GltfEnums.h
        ${GLTFIO_DIR}/src/Ktx2Provider.cpp
        ${GLTFIO_DIR}/src/MaterialProvider.cpp
        ${GLTFIO_DIR}/src/NodeManager.cpp
-        ${GLTFIO_DIR}/src/TrsTransformManager.cpp
        ${GLTFIO_DIR}/src/ResourceLoader.cpp
        ${GLTFIO_DIR}/src/StbProvider.cpp
        ${GLTFIO_DIR}/src/TangentsJob.cpp
        ${GLTFIO_DIR}/src/TangentsJob.h
        ${GLTFIO_DIR}/src/UbershaderProvider.cpp
-        ${GLTFIO_DIR}/src/Utility.cpp
-        ${GLTFIO_DIR}/src/Utility.h
        ${GLTFIO_DIR}/src/Wireframe.cpp
        ${GLTFIO_DIR}/src/Wireframe.h
        ${GLTFIO_DIR}/src/downcast.h
-        ${GLTFIO_DIR}/src/extended/AssetLoaderExtended.cpp
-        ${GLTFIO_DIR}/src/extended/AssetLoaderExtended.h
-        ${GLTFIO_DIR}/src/extended/ResourceLoaderExtended.cpp
-        ${GLTFIO_DIR}/src/extended/ResourceLoaderExtended.h
-        ${GLTFIO_DIR}/src/extended/TangentsJobExtended.cpp
-        ${GLTFIO_DIR}/src/extended/TangentsJobExtended.h
-        ${GLTFIO_DIR}/src/extended/TangentSpaceMeshWrapper.cpp
-        ${GLTFIO_DIR}/src/extended/TangentSpaceMeshWrapper.h
-

        src/main/cpp/Animator.cpp
        src/main/cpp/AssetLoader.cpp
@@ -120,6 +105,7 @@ set(GLTFIO_INCLUDE_DIRS
        ../../third_party/cgltf
        ../../third_party/meshoptimizer/src
        ../../third_party/robin-map
+        ../../third_party/hat-trie
        ../../third_party/stb
        ../../libs/utils/include
        ../../libs/ktxreader/include
--- a/android/gltfio-android/build.gradle
+++ b/android/gltfio-android/build.gradle
@@ -1,6 +1,12 @@
 android {
    namespace 'com.google.android.filament.gltfio'

+    flavorDimensions "functionality"
+    productFlavors {
+        full {
+            dimension "functionality"
+        }
+    }
    packagingOptions {
        // No need to package up the following shared libs, which arise as a side effect of our
        // externalNativeBuild dependencies. When clients pick and choose from project-level gradle
@@ -12,7 +18,7 @@ android {
    }

    publishing {
-        singleVariant("release") {
+        singleVariant("fullRelease") {
            withSourcesJar()
            withJavadocJar()
        }
@@ -30,9 +36,9 @@ apply from: rootProject.file('gradle/gradle-mvn-push.gradle')
 afterEvaluate { project ->
    publishing {
        publications {
-            release(MavenPublication) {
+            fullRelease(MavenPublication) {
                artifactId = POM_ARTIFACT_ID_FULL
-                from components.release
+                from components.fullRelease
            }
        }
    }
--- a/android/gltfio-android/src/main/java/com/google/android/filament/gltfio/FilamentInstance.java
+++ b/android/gltfio-android/src/main/java/com/google/android/filament/gltfio/FilamentInstance.java
@@ -144,7 +144,7 @@ public class FilamentInstance {
     *
     * Ignored if variantIndex is out of bounds.
     */
-    public void applyMaterialVariant(@IntRange(from = 0) int variantIndex) {
+    void applyMaterialVariant(@IntRange(from = 0) int variantIndex) {
        nApplyMaterialVariant(mNativeObject, variantIndex);
    }

--- a/android/gradle.properties
+++ b/android/gradle.properties
@@ -1,5 +1,5 @@
 GROUP=com.google.android.filament
-VERSION_NAME=1.56.0
+VERSION_NAME=1.42.0

 POM_DESCRIPTION=Real-time physically based rendering engine for Android.

--- a/android/gradle/wrapper/gradle-wrapper.properties
+++ b/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Wed Nov 17 10:40:18 PST 2021
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
--- a/android/samples/README.md
+++ b/android/samples/README.md
@@ -87,9 +87,9 @@ compile Filament's native library and Filament's AAR for this project. The easie
 is to install all the required dependencies and to run the following commands at the root of the
 source tree:

-```shell
-./build.sh -p desktop -i release
-./build.sh -p android release
+```
+$ ./build.sh -p desktop -i release
+$ ./build.sh -p android release
 ```

 This will build all the native components and the AAR required by this sample application.
@@ -100,8 +100,8 @@ distribution/install directory for desktop (produced by make/ninja install). Thi
 contain `bin/matc` and `bin/cmgen`.

 Example:
-```shell
-./gradlew -Pfilament_tools_dir=../../dist-release assembleDebug
+```
+$ ./gradlew -Pfilament_tools_dir=../../dist-release assembleDebug
 ```

 ## Important: SDK location
@@ -110,24 +110,14 @@ Either ensure your `ANDROID_HOME` environment variable is set or make sure the r
 contains a `local.properties` file with the `sdk.dir` property pointing to your installation of
 the Android SDK.

-## Compiling
-
-### Android Studio
+## Android Studio

 You must use the latest stable release of Android Studio. To open the project, point Studio to the
 `android` folder. After opening the project and syncing to gradle, select the sample of your choice
 using the drop-down widget in the toolbar.

+## Compiling
+
 To compile and run each sample make sure you have selected the appropriate build variant
 (arm7, arm8, x86 or x86_64). If you are not sure you can simply select the "universal"
 variant which includes all the other ones.
-
-### Command Line
-
-From the `android` directory in the project root:
-
-```shell
-./gradlew :samples:sample-hello-triangle:installDebug
-```
-
-Replace `sample-hello-triangle` with your preferred project.
--- a/android/samples/sample-gltf-viewer/build.gradle
+++ b/android/samples/sample-gltf-viewer/build.gradle
@@ -6,10 +6,6 @@ plugins {

 project.ext.isSample = true

-kotlin {
-    jvmToolchain(versions.jdk)
-}
-
 filamentTools {
    cmgenArgs = "-q --format=ktx --size=256 --extract-blur=0.1 --deploy=src/main/assets/envs/default_env"
    iblInputFile = project.layout.projectDirectory.file("../../../third_party/environments/lightroom_14b.hdr")
@@ -17,7 +13,7 @@ filamentTools {
 }

 // don't forget to update MainACtivity.kt when/if changing this.
-tasks.register('copyMesh', Copy) {
+task copyMesh(type: Copy) {
    from "../../../third_party/models/BusterDrone"
    into "src/main/assets/models"
 }
@@ -34,8 +30,9 @@ android {
    compileSdkVersion versions.compileSdk
    defaultConfig {
        applicationId "com.google.android.filament.gltf"
-        minSdkVersion versions.minSdk
+        minSdkVersion 19
        targetSdkVersion versions.targetSdk
+        missingDimensionStrategy 'functionality', 'full'
    }

    // NOTE: This is a workaround required because the AGP task collectReleaseDependencies
--- a/android/samples/sample-gltf-viewer/src/main/java/com/google/android/filament/gltf/MainActivity.kt
+++ b/android/samples/sample-gltf-viewer/src/main/java/com/google/android/filament/gltf/MainActivity.kt
@@ -26,7 +26,6 @@ import android.widget.TextView
 import android.widget.Toast
 import com.google.android.filament.Fence
 import com.google.android.filament.IndirectLight
-import com.google.android.filament.Material
 import com.google.android.filament.Skybox
 import com.google.android.filament.View
 import com.google.android.filament.View.OnPickCallback
@@ -393,36 +392,6 @@ class MainActivity : Activity() {
                    Log.i(TAG, "The Filament backend took $total ms to load the model geometry.")
                    modelViewer.engine.destroyFence(it)
                    loadStartFence = null
-
-                    val materials = mutableSetOf<Material>()
-                    val rcm = modelViewer.engine.renderableManager
-                    modelViewer.scene.forEach {
-                        val entity = it
-                        if (rcm.hasComponent(entity)) {
-                            val ri = rcm.getInstance(entity)
-                            val c = rcm.getPrimitiveCount(ri)
-                            for (i in 0 until c) {
-                                val mi = rcm.getMaterialInstanceAt(ri, i)
-                                val ma = mi.material
-                                materials.add(ma)
-                            }
-                        }
-                    }
-                    materials.forEach {
-                        it.compile(
-                            Material.CompilerPriorityQueue.HIGH,
-                            Material.UserVariantFilterBit.DIRECTIONAL_LIGHTING or
-                            Material.UserVariantFilterBit.DYNAMIC_LIGHTING or
-                            Material.UserVariantFilterBit.SHADOW_RECEIVER,
-                            null, null)
-                        it.compile(
-                            Material.CompilerPriorityQueue.LOW,
-                            Material.UserVariantFilterBit.FOG or
-                            Material.UserVariantFilterBit.SKINNING or
-                            Material.UserVariantFilterBit.SSR or
-                            Material.UserVariantFilterBit.VSM,
-                            null, null)
-                    }
                }
            }

--- a/android/samples/sample-hello-triangle/src/main/java/com/google/android/filament/hellotriangle/MainActivity.kt
+++ b/android/samples/sample-hello-triangle/src/main/java/com/google/android/filament/hellotriangle/MainActivity.kt
@@ -20,8 +20,6 @@ import android.animation.ValueAnimator
 import android.app.Activity
 import android.opengl.Matrix
 import android.os.Bundle
-import android.os.Handler
-import android.os.Looper
 import android.view.Choreographer
 import android.view.Surface
 import android.view.SurfaceView
@@ -112,7 +110,7 @@ class MainActivity : Activity() {
    }

    private fun setupFilament() {
-        engine = Engine.Builder().featureLevel(Engine.FeatureLevel.FEATURE_LEVEL_0).build()
+        engine = Engine.create()
        renderer = engine.createRenderer()
        scene = engine.createScene()
        view = engine.createView()
@@ -122,8 +120,13 @@ class MainActivity : Activity() {
    private fun setupView() {
        scene.skybox = Skybox.Builder().color(0.035f, 0.035f, 0.035f, 1.0f).build(engine)

-        // post-processing is not supported at feature level 0
-        view.isPostProcessingEnabled = false
+        if (engine.activeFeatureLevel == Engine.FeatureLevel.FEATURE_LEVEL_0) {
+            // post-processing is not supported at feature level 0
+            view.isPostProcessingEnabled = false
+        } else {
+            // NOTE: Try to disable post-processing (tone-mapping, etc.) to see the difference
+            // view.isPostProcessingEnabled = false
+        }

        // Tell the view which camera we want to use
        view.camera = camera
@@ -157,16 +160,12 @@ class MainActivity : Activity() {
    }

    private fun loadMaterial() {
-        readUncompressedAsset("materials/baked_color.filamat").let {
+        var name = "materials/baked_color.filamat"
+        if (engine.activeFeatureLevel == Engine.FeatureLevel.FEATURE_LEVEL_0) {
+            name = "materials/baked_color_es2.filamat"
+        }
+        readUncompressedAsset(name).let {
            material = Material.Builder().payload(it, it.remaining()).build(engine)
-            material.compile(
-                Material.CompilerPriorityQueue.HIGH,
-                Material.UserVariantFilterBit.ALL,
-                Handler(Looper.getMainLooper())) {
-                        android.util.Log.i("hellotriangle",
-                            "Material " + material.name + " compiled.")
-            }
-            engine.flush()
        }
    }

@@ -321,7 +320,7 @@ class MainActivity : Activity() {
            var flags = uiHelper.swapChainFlags
            if (engine.activeFeatureLevel == Engine.FeatureLevel.FEATURE_LEVEL_0) {
                if (SwapChain.isSRGBSwapChainSupported(engine)) {
-                    flags = flags or SwapChainFlags.CONFIG_SRGB_COLORSPACE
+                    flags = flags or SwapChain.CONFIG_SRGB_COLORSPACE
                }
            }

--- a/android/samples/sample-hello-triangle/src/main/materials/baked_color.mat
+++ b/android/samples/sample-hello-triangle/src/main/materials/baked_color.mat
@@ -17,8 +17,7 @@ material {
    ],

    // This material disables all lighting
-    shadingModel : unlit,
-    featureLevel : 0
+    shadingModel : unlit
 }

 fragment {
--- a/android/samples/sample-hello-triangle/src/main/materials/baked_color_es2.mat
+++ b/android/samples/sample-hello-triangle/src/main/materials/baked_color_es2.mat
@@ -0,0 +1,33 @@
+// Simple unlit material that uses the colors associated with each vertex.
+//
+// This source material must be compiled to a binary material using the matc tool.
+// The command used to compile this material is:
+// matc -p mobile -a opengl -o app/src/main/assets/baked_color.filamat app/src/materials/baked_color.mat
+//
+// See build.gradle for an example of how to compile materials automatically
+// Please refer to the documentation for more information about matc and the materials system.
+
+material {
+    name : baked_color,
+
+    // Lists the required vertex attributes
+    // Here we only need a color (RGBA)
+    requires : [
+        color
+    ],
+
+    // This material disables all lighting
+    shadingModel : unlit,
+    featureLevel : 0
+}
+
+fragment {
+    void material(inout MaterialInputs material) {
+        // You must always call the prepareMaterial() function
+        prepareMaterial(material);
+
+        // We set the material's color to the color interpolated from
+        // the model's vertices
+        material.baseColor = getColor();
+    }
+}
--- a/android/samples/sample-material-builder/build.gradle
+++ b/android/samples/sample-material-builder/build.gradle
@@ -32,6 +32,13 @@ android {
        targetSdkVersion versions.targetSdk
    }

+    // The filamat library has two variants: full and lite. Here we default to the "full" variant.
+    // Replace "full" with "lite" to use the filamat-lite variant, which has a smaller binary size
+    // but comes with certain restrictions. See "Filamat Lite" in libs/filamat/README.md.
+    defaultConfig {
+        missingDimensionStrategy 'functionality', 'full'
+    }
+
    // NOTE: This is a workaround required because the AGP task collectReleaseDependencies
    //       is not configuration-cache friendly yet; this is only useful for Play publication
    dependenciesInfo {
--- a/android/samples/sample-textured-object/build.gradle
+++ b/android/samples/sample-textured-object/build.gradle
@@ -33,6 +33,7 @@ android {
        applicationId "com.google.android.filament.textured"
        minSdkVersion versions.minSdk
        targetSdkVersion versions.targetSdk
+        missingDimensionStrategy 'functionality', 'full'
    }

    // NOTE: This is a workaround required because the AGP task collectReleaseDependencies
--- a/build.sh
+++ b/build.sh
@@ -44,6 +44,8 @@ function print_help {
    echo "        Exclude Vulkan support from the Android build."
    echo "    -s"
    echo "        Add iOS simulator support to the iOS build."
+    echo "    -t"
+    echo "        Enable SwiftShader support for Vulkan in desktop builds."
    echo "    -e"
    echo "        Enable EGL on Linux support for desktop builds."
    echo "    -l"
@@ -59,17 +61,6 @@ function print_help {
    echo "    -b"
    echo "        Enable Address and Undefined Behavior Sanitizers (asan/ubsan) for debugging."
    echo "        This is only for the desktop build."
-    echo "    -x value"
-    echo "        Define a preprocessor flag FILAMENT_BACKEND_DEBUG_FLAG with [value]. This is useful for"
-    echo "        enabling debug paths in the backend from the build script. For example, make a"
-    echo "        systrace-enabled build without directly changing #defines. Remember to add -f when"
-    echo "        changing this option."
-    echo "    -X osmesa_path"
-    echo "        Indicates a path to a completed OSMesa build. OSMesa is used to create an offscreen GL"
-    echo "        context for software rasterization"
-    echo "    -S type"
-    echo "        Enable stereoscopic rendering where type is one of [instanced|multiview]. This is only"
-    echo "        meant for building the samples."
    echo ""
    echo "Build types:"
    echo "    release"
@@ -169,6 +160,8 @@ INSTALL_COMMAND=
 VULKAN_ANDROID_OPTION="-DFILAMENT_SUPPORTS_VULKAN=ON"
 VULKAN_ANDROID_GRADLE_OPTION=""

+SWIFTSHADER_OPTION="-DFILAMENT_USE_SWIFTSHADER=OFF"
+
 EGL_ON_LINUX_OPTION="-DFILAMENT_SUPPORTS_EGL_ON_LINUX=OFF"

 MATDBG_OPTION="-DFILAMENT_ENABLE_MATDBG=OFF"
@@ -179,12 +172,6 @@ MATOPT_GRADLE_OPTION=""

 ASAN_UBSAN_OPTION=""

-BACKEND_DEBUG_FLAG_OPTION=""
-
-STEREOSCOPIC_OPTION=""
-
-OSMESA_OPTION=""
-
 IOS_BUILD_SIMULATOR=false
 BUILD_UNIVERSAL_LIBRARIES=false

@@ -204,7 +191,6 @@ function build_clean {
    rm -Rf android/filamat-android/build android/filamat-android/.externalNativeBuild android/filamat-android/.cxx
    rm -Rf android/gltfio-android/build android/gltfio-android/.externalNativeBuild android/gltfio-android/.cxx
    rm -Rf android/filament-utils-android/build android/filament-utils-android/.externalNativeBuild android/filament-utils-android/.cxx
-    rm -f compile_commands.json
 }

 function build_clean_aggressive {
@@ -224,10 +210,13 @@ function build_desktop_target {
    echo "Building ${lc_target} in out/cmake-${lc_target}..."
    mkdir -p "out/cmake-${lc_target}"

-    pushd "out/cmake-${lc_target}" > /dev/null
+    cd "out/cmake-${lc_target}"

+    # On macOS, set the deployment target to 10.15.
    local lc_name=$(echo "${UNAME}" | tr '[:upper:]' '[:lower:]')
    if [[ "${lc_name}" == "darwin" ]]; then
+        local deployment_target="-DCMAKE_OSX_DEPLOYMENT_TARGET=10.15"
+
        if [[ "${BUILD_UNIVERSAL_LIBRARIES}" == "true" ]]; then
            local architectures="-DCMAKE_OSX_ARCHITECTURES=arm64;x86_64"
        fi
@@ -239,17 +228,14 @@ function build_desktop_target {
            -DIMPORT_EXECUTABLES_DIR=out \
            -DCMAKE_BUILD_TYPE="$1" \
            -DCMAKE_INSTALL_PREFIX="../${lc_target}/filament" \
+            ${SWIFTSHADER_OPTION} \
            ${EGL_ON_LINUX_OPTION} \
            ${MATDBG_OPTION} \
            ${MATOPT_OPTION} \
            ${ASAN_UBSAN_OPTION} \
-            ${BACKEND_DEBUG_FLAG_OPTION} \
-            ${STEREOSCOPIC_OPTION} \
-            ${OSMESA_OPTION} \
+            ${deployment_target} \
            ${architectures} \
            ../..
-        ln -sf "out/cmake-${lc_target}/compile_commands.json" \
-           ../../compile_commands.json
    fi
    ${BUILD_COMMAND} ${build_targets}

@@ -261,13 +247,12 @@ function build_desktop_target {
    if [[ -d "../${lc_target}/filament" ]]; then
        if [[ "${ISSUE_ARCHIVES}" == "true" ]]; then
            echo "Generating out/filament-${lc_target}-${LC_UNAME}.tgz..."
-            pushd "../${lc_target}" > /dev/null
+            cd "../${lc_target}"
            tar -czvf "../filament-${lc_target}-${LC_UNAME}.tgz" filament
-            popd > /dev/null
        fi
    fi

-    popd > /dev/null
+    cd ../..
 }

 function build_desktop {
@@ -285,7 +270,7 @@ function build_webgl_with_target {

    echo "Building WebGL ${lc_target}..."
    mkdir -p "out/cmake-webgl-${lc_target}"
-    pushd "out/cmake-webgl-${lc_target}" > /dev/null
+    cd "out/cmake-webgl-${lc_target}"

    if [[ ! "${BUILD_TARGETS}" ]]; then
        BUILD_TARGETS=${BUILD_CUSTOM_TARGETS}
@@ -304,10 +289,7 @@ function build_webgl_with_target {
            -DCMAKE_BUILD_TYPE="$1" \
            -DCMAKE_INSTALL_PREFIX="../webgl-${lc_target}/filament" \
            -DWEBGL=1 \
-            ${BACKEND_DEBUG_FLAG_OPTION} \
            ../..
-        ln -sf "out/cmake-webgl-${lc_target}/compile_commands.json" \
-           ../../compile_commands.json
        ${BUILD_COMMAND} ${BUILD_TARGETS}
        )
    fi
@@ -325,17 +307,17 @@ function build_webgl_with_target {

        if [[ "${ISSUE_ARCHIVES}" == "true" ]]; then
            echo "Generating out/filament-${lc_target}-web.tgz..."
-            pushd web/filament-js > /dev/null
+            cd web/filament-js
            tar -cvf "../../../filament-${lc_target}-web.tar" filament.js
            tar -rvf "../../../filament-${lc_target}-web.tar" filament.wasm
            tar -rvf "../../../filament-${lc_target}-web.tar" filament.d.ts
-            popd > /dev/null
+            cd -
            gzip -c "../filament-${lc_target}-web.tar" > "../filament-${lc_target}-web.tgz"
            rm "../filament-${lc_target}-web.tar"
        fi
    fi

-    popd > /dev/null
+    cd ../..
 }

 function build_webgl {
@@ -366,7 +348,7 @@ function build_android_target {
    echo "Building Android ${lc_target} (${arch})..."
    mkdir -p "out/cmake-android-${lc_target}-${arch}"

-    pushd "out/cmake-android-${lc_target}-${arch}" > /dev/null
+    cd "out/cmake-android-${lc_target}-${arch}"

    if [[ ! -d "CMakeFiles" ]] || [[ "${ISSUE_CMAKE_ALWAYS}" == "true" ]]; then
        cmake \
@@ -379,17 +361,13 @@ function build_android_target {
            ${MATDBG_OPTION} \
            ${MATOPT_OPTION} \
            ${VULKAN_ANDROID_OPTION} \
-            ${BACKEND_DEBUG_FLAG_OPTION} \
-            ${STEREOSCOPIC_OPTION} \
            ../..
-        ln -sf "out/cmake-android-${lc_target}-${arch}/compile_commands.json" \
-           ../../compile_commands.json
    fi

    # We must always install Android libraries to build the AAR
    ${BUILD_COMMAND} install

-    popd > /dev/null
+    cd ../..
 }

 function build_android_arch {
@@ -410,9 +388,9 @@ function archive_android {
    if [[ -d "out/android-${lc_target}/filament" ]]; then
        if [[ "${ISSUE_ARCHIVES}" == "true" ]]; then
            echo "Generating out/filament-android-${lc_target}-${LC_UNAME}.tgz..."
-            pushd "out/android-${lc_target}" > /dev/null
+            cd "out/android-${lc_target}"
            tar -czvf "../filament-android-${lc_target}-${LC_UNAME}.tgz" filament
-            popd > /dev/null
+            cd ../..
        fi
    fi
 }
@@ -490,7 +468,7 @@ function build_android {
        archive_android "Release"
    fi

-    pushd android > /dev/null
+    cd android

    if [[ "${ISSUE_DEBUG_BUILD}" == "true" ]]; then
        ./gradlew \
@@ -520,13 +498,13 @@ function build_android {

        if [[ "${INSTALL_COMMAND}" ]]; then
            echo "Installing out/filamat-android-debug.aar..."
-            cp filamat-android/build/outputs/aar/filamat-android-debug.aar ../out/filamat-android-debug.aar
+            cp filamat-android/build/outputs/aar/filamat-android-full-debug.aar ../out/filamat-android-debug.aar

            echo "Installing out/filament-android-debug.aar..."
            cp filament-android/build/outputs/aar/filament-android-debug.aar ../out/

            echo "Installing out/gltfio-android-debug.aar..."
-            cp gltfio-android/build/outputs/aar/gltfio-android-debug.aar ../out/gltfio-android-debug.aar
+            cp gltfio-android/build/outputs/aar/gltfio-android-full-debug.aar ../out/gltfio-android-debug.aar

            echo "Installing out/filament-utils-android-debug.aar..."
            cp filament-utils-android/build/outputs/aar/filament-utils-android-debug.aar ../out/filament-utils-android-debug.aar
@@ -534,7 +512,7 @@ function build_android {
            if [[ "${BUILD_ANDROID_SAMPLES}" == "true" ]]; then
                for sample in ${ANDROID_SAMPLES}; do
                    echo "Installing out/${sample}-debug.apk"
-                    cp samples/${sample}/build/outputs/apk/debug/${sample}-debug.apk \
+                    cp samples/${sample}/build/outputs/apk/debug/${sample}-debug-unsigned.apk \
                        ../out/${sample}-debug.apk
                done
            fi
@@ -569,13 +547,14 @@ function build_android {

        if [[ "${INSTALL_COMMAND}" ]]; then
            echo "Installing out/filamat-android-release.aar..."
-            cp filamat-android/build/outputs/aar/filamat-android-release.aar ../out/filamat-android-release.aar
+            cp filamat-android/build/outputs/aar/filamat-android-lite-release.aar ../out/
+            cp filamat-android/build/outputs/aar/filamat-android-full-release.aar ../out/filamat-android-release.aar

            echo "Installing out/filament-android-release.aar..."
            cp filament-android/build/outputs/aar/filament-android-release.aar ../out/

            echo "Installing out/gltfio-android-release.aar..."
-            cp gltfio-android/build/outputs/aar/gltfio-android-release.aar ../out/gltfio-android-release.aar
+            cp gltfio-android/build/outputs/aar/gltfio-android-full-release.aar ../out/gltfio-android-release.aar

            echo "Installing out/filament-utils-android-release.aar..."
            cp filament-utils-android/build/outputs/aar/filament-utils-android-release.aar ../out/filament-utils-android-release.aar
@@ -590,7 +569,7 @@ function build_android {
        fi
    fi

-    popd > /dev/null
+    cd ..
 }

 function build_ios_target {
@@ -601,7 +580,7 @@ function build_ios_target {
    echo "Building iOS ${lc_target} (${arch}) for ${platform}..."
    mkdir -p "out/cmake-ios-${lc_target}-${arch}"

-    pushd "out/cmake-ios-${lc_target}-${arch}" > /dev/null
+    cd "out/cmake-ios-${lc_target}-${arch}"

    if [[ ! -d "CMakeFiles" ]] || [[ "${ISSUE_CMAKE_ALWAYS}" == "true" ]]; then
        cmake \
@@ -615,10 +594,7 @@ function build_ios_target {
            -DCMAKE_TOOLCHAIN_FILE=../../third_party/clang/iOS.cmake \
            ${MATDBG_OPTION} \
            ${MATOPT_OPTION} \
-            ${STEREOSCOPIC_OPTION} \
            ../..
-        ln -sf "out/cmake-ios-${lc_target}-${arch}/compile_commands.json" \
-           ../../compile_commands.json
    fi

    ${BUILD_COMMAND}
@@ -628,7 +604,7 @@ function build_ios_target {
        ${BUILD_COMMAND} ${INSTALL_COMMAND}
    fi

-    popd > /dev/null
+    cd ../..
 }

 function archive_ios {
@@ -637,9 +613,9 @@ function archive_ios {
    if [[ -d "out/ios-${lc_target}/filament" ]]; then
        if [[ "${ISSUE_ARCHIVES}" == "true" ]]; then
            echo "Generating out/filament-${lc_target}-ios.tgz..."
-            pushd "out/ios-${lc_target}" > /dev/null
+            cd "out/ios-${lc_target}"
            tar -czvf "../filament-${lc_target}-ios.tgz" filament
-            popd > /dev/null
+            cd ../..
        fi
    fi
 }
@@ -698,14 +674,14 @@ function build_web_docs {

    mkdir -p out/web-docs
    cp -f docs/web-docs-package.json out/web-docs/package.json
-    pushd out/web-docs > /dev/null
+    cd out/web-docs

    npm install > /dev/null

    # Generate documents
    npx markdeep-rasterizer ../../docs/Filament.md.html ../../docs/Materials.md.html  ../../docs/

-    popd > /dev/null
+    cd ../..
 }

 function validate_build_command {
@@ -749,13 +725,6 @@ function validate_build_command {
            exit 1
        fi
    fi
-
-    # Make sure FILAMENT_BACKEND_DEBUG_FLAG is only meant for debug builds
-    if [[ "${ISSUE_DEBUG_BUILD}" != "true" ]] && [[ ! -z "${BACKEND_DEBUG_FLAG_OPTION}" ]]; then
-        echo "Error: cannot specify FILAMENT_BACKEND_DEBUG_FLAG in non-debug build"
-        exit 1
-    fi
-
    set -e
 }

@@ -785,28 +754,15 @@ function run_tests {
    fi
 }

-function check_debug_release_build {
-    if [[ "${ISSUE_DEBUG_BUILD}" == "true" || \
-          "${ISSUE_RELEASE_BUILD}" == "true" || \
-          "${ISSUE_CLEAN}" == "true" || \
-          "${ISSUE_WEB_DOCS}" == "true" ]]; then
-        "$@";
-    else
-        echo "You must declare a debug or release target for $@ builds."
-        echo ""
-        exit 1
-    fi
-}
-
 # Beginning of the script

 pushd "$(dirname "$0")" > /dev/null

-while getopts ":hacCfgijmp:q:uvslwedk:bx:S:X:" opt; do
+while getopts ":hacCfgijmp:q:uvslwtedk:b" opt; do
    case ${opt} in
        h)
            print_help
-            exit 0
+            exit 1
            ;;
        a)
            ISSUE_ARCHIVES=true
@@ -842,7 +798,7 @@ while getopts ":hacCfgijmp:q:uvslwedk:bx:S:X:" opt; do
            platforms=$(echo "${OPTARG}" | tr ',' '\n')
            for platform in ${platforms}
            do
-                case $(echo "${platform}" | tr '[:upper:]' '[:lower:]') in
+                case ${platform} in
                    desktop)
                        ISSUE_DESKTOP_BUILD=true
                    ;;
@@ -861,12 +817,6 @@ while getopts ":hacCfgijmp:q:uvslwedk:bx:S:X:" opt; do
                        ISSUE_DESKTOP_BUILD=true
                        ISSUE_WEBGL_BUILD=false
                    ;;
-                    *)
-                        echo "Unknown platform ${platform}"
-                        echo "Platform must be one of [desktop|android|ios|webgl|all]"
-                        echo ""
-                        exit 1
-                    ;;
                esac
            done
            ;;
@@ -879,7 +829,7 @@ while getopts ":hacCfgijmp:q:uvslwedk:bx:S:X:" opt; do
            abis=$(echo "${OPTARG}" | tr ',' '\n')
            for abi in ${abis}
            do
-                case $(echo "${abi}" | tr '[:upper:]' '[:lower:]') in
+                case ${abi} in
                    armeabi-v7a)
                        ABI_ARMEABI_V7A=true
                    ;;
@@ -898,12 +848,6 @@ while getopts ":hacCfgijmp:q:uvslwedk:bx:S:X:" opt; do
                        ABI_X86=true
                        ABI_X86_64=true
                    ;;
-                    *)
-                        echo "Unknown abi ${abi}"
-                        echo "ABI must be one of [armeabi-v7a|arm64-v8a|x86|x86_64|all]"
-                        echo ""
-                        exit 1
-                    ;;
                esac
            done
            ;;
@@ -921,6 +865,10 @@ while getopts ":hacCfgijmp:q:uvslwedk:bx:S:X:" opt; do
            IOS_BUILD_SIMULATOR=true
            echo "iOS simulator support enabled."
            ;;
+        t)
+            SWIFTSHADER_OPTION="-DFILAMENT_USE_SWIFTSHADER=ON"
+            echo "SwiftShader support enabled."
+            ;;
        e)
            EGL_ON_LINUX_OPTION="-DFILAMENT_SUPPORTS_EGL_ON_LINUX=ON -DFILAMENT_SKIP_SDL2=ON -DFILAMENT_SKIP_SAMPLES=ON"
            echo "EGL on Linux support enabled; skipping SDL2."
@@ -940,24 +888,6 @@ while getopts ":hacCfgijmp:q:uvslwedk:bx:S:X:" opt; do
        b)  ASAN_UBSAN_OPTION="-DFILAMENT_ENABLE_ASAN_UBSAN=ON"
            echo "Enabled ASAN/UBSAN"
            ;;
-        x)  BACKEND_DEBUG_FLAG_OPTION="-DFILAMENT_BACKEND_DEBUG_FLAG=${OPTARG}"
-            ;;
-        S)  case $(echo "${OPTARG}" | tr '[:upper:]' '[:lower:]') in
-                instanced)
-                    STEREOSCOPIC_OPTION="-DFILAMENT_SAMPLES_STEREO_TYPE=instanced"
-                    ;;
-                multiview)
-                    STEREOSCOPIC_OPTION="-DFILAMENT_SAMPLES_STEREO_TYPE=multiview"
-                    ;;
-                *)
-                    echo "Unknown stereoscopic type ${OPTARG}"
-                    echo "Type must be one of [instanced|multiview]"
-                    echo ""
-                    exit 1
-            esac
-            ;;
-        X)  OSMESA_OPTION="-DFILAMENT_OSMESA_PATH=${OPTARG}"
-            ;;
        \?)
            echo "Invalid option: -${OPTARG}" >&2
            echo ""
@@ -981,9 +911,9 @@ fi
 shift $((OPTIND - 1))

 for arg; do
-    if [[ $(echo "${arg}" | tr '[:upper:]' '[:lower:]') == "release" ]]; then
+    if [[ "${arg}" == "release" ]]; then
        ISSUE_RELEASE_BUILD=true
-    elif [[ $(echo "${arg}" | tr '[:upper:]' '[:lower:]') == "debug" ]]; then
+    elif [[ "${arg}" == "debug" ]]; then
        ISSUE_DEBUG_BUILD=true
    else
        BUILD_CUSTOM_TARGETS="${BUILD_CUSTOM_TARGETS} ${arg}"
@@ -1001,19 +931,19 @@ if [[ "${ISSUE_CLEAN_AGGRESSIVE}" == "true" ]]; then
 fi

 if [[ "${ISSUE_DESKTOP_BUILD}" == "true" ]]; then
-    check_debug_release_build build_desktop
+    build_desktop
 fi

 if [[ "${ISSUE_ANDROID_BUILD}" == "true" ]]; then
-    check_debug_release_build build_android
+    build_android
 fi

 if [[ "${ISSUE_IOS_BUILD}" == "true" ]]; then
-    check_debug_release_build build_ios
+    build_ios
 fi

 if [[ "${ISSUE_WEBGL_BUILD}" == "true" ]]; then
-    check_debug_release_build build_webgl
+    build_webgl
 fi

 if [[ "${ISSUE_WEB_DOCS}" == "true" ]]; then
--- a/build/android/build.sh
+++ b/build/android/build.sh
@@ -57,10 +57,15 @@ FILAMENT_NDK_VERSION=${FILAMENT_NDK_VERSION:-$(cat `dirname $0`/ndk.version)}

 # Install the required NDK version specifically (if not present)
 if [[ ! -d "${ANDROID_HOME}/ndk/$FILAMENT_NDK_VERSION" ]]; then
-    yes | ${ANDROID_HOME}/cmdline-tools/latest/bin/sdkmanager --licenses
-    ${ANDROID_HOME}/cmdline-tools/latest/bin/sdkmanager "ndk;$FILAMENT_NDK_VERSION"
+    ${ANDROID_HOME}/cmdline-tools/latest/bin/sdkmanager "ndk;$FILAMENT_NDK_VERSION" > /dev/null
 fi
+
+# Only build 1 64 bit target during presubmit to cut down build times during presubmit
+# Continuous builds will build everything
 ANDROID_ABIS=
+if [[ "$TARGET" == "presubmit" ]]; then
+  ANDROID_ABIS="-q arm64-v8a"
+fi

 # Build the Android sample-gltf-viewer APK during release.
 BUILD_SAMPLES=
@@ -68,19 +73,5 @@ if [[ "$TARGET" == "release" ]]; then
    BUILD_SAMPLES="-k sample-gltf-viewer"
 fi

-function build_android() {
-    local ABI=$1
-
-    # Do the following in two steps so that we do not run out of space
-    if [[ -n "${BUILD_DEBUG}" ]]; then
-        FILAMENT_NDK_VERSION=${FILAMENT_NDK_VERSION} ./build.sh -p android -q ${ABI} -c ${BUILD_SAMPLES} ${GENERATE_ARCHIVES} ${BUILD_DEBUG}
-        rm -rf out/cmake-android-debug-*
-    fi
-    if [[ -n "${BUILD_RELEASE}" ]]; then
-        FILAMENT_NDK_VERSION=${FILAMENT_NDK_VERSION} ./build.sh -p android -q ${ABI} -c ${BUILD_SAMPLES} ${GENERATE_ARCHIVES} ${BUILD_RELEASE}
-        rm -rf out/cmake-android-release-*
-    fi
-}
-
 pushd `dirname $0`/../.. > /dev/null
-build_android $2
+FILAMENT_NDK_VERSION=${FILAMENT_NDK_VERSION} ./build.sh -p android $ANDROID_ABIS -c $BUILD_SAMPLES $GENERATE_ARCHIVES $BUILD_DEBUG $BUILD_RELEASE
--- a/build/android/ndk.version
+++ b/build/android/ndk.version
@@ -1 +1 @@
-27.0.11718014
+25.1.8937393
--- a/build/common/bump-version.sh
+++ b/build/common/bump-version.sh
@@ -50,7 +50,7 @@ function replace {
    FIND_STR="${1//\{\{VERSION\}\}/${VERSION_REGEX}}"
    REPLACE_STR="${1//\{\{VERSION\}\}/${NEW_VERSION}}"
    local FILE_NAME="$2"
-    if [ $IS_DARWIN == 1 ]; then
+    if [ IS_DARWIN ]; then
        sed -i '' -E "s/${FIND_STR}/${REPLACE_STR}/" "${FILE_NAME}"
    else
        sed -i -E "s/${FIND_STR}/${REPLACE_STR}/" "${FILE_NAME}"
--- a/build/common/test_list.txt
+++ b/build/common/test_list.txt
@@ -5,6 +5,7 @@ libs/math/test_math
 libs/image/test_image compare libs/image/tests/reference/
 libs/utils/test_utils
 libs/filamat/test_filamat
+libs/filamat/test_filamat_lite
 tools/matc/test_matc
 tools/cmgen/test_cmgen compare
 tools/glslminifier/test_glslminifier
--- a/build/linux/combine-static-libs.sh
+++ b/build/linux/combine-static-libs.sh
@@ -125,13 +125,7 @@ if [[ "${has_universal}" == "true" ]]; then

        arch_output="${OUTPUT_PATH%.a}_${arch}.a"
        arch_outputs+=("$arch_output")
-
-        archives=()
-        while IFS=  read -r -d $'\0'; do
-            archives+=("$REPLY")
-        done < <(find "$(pwd)/${archs_temp_dir}/${arch}" -iname '*.a' -print0)
-
-        combine_static_libs "$arch_output" "$archives"
+        combine_static_libs "$arch_output" $(find "$(pwd)/${archs_temp_dir}/${arch}" -iname '*.a')
    done

    # Finally, combine the single-architecture archives into a universal binary.
--- a/build/swiftshader/Dockerfile
+++ b/build/swiftshader/Dockerfile
@@ -0,0 +1,53 @@
+# Build the image:
+#   docker build --no-cache --tag ssfilament -f build/swiftshader/Dockerfile .
+#   docker tag ssfilament ghcr.io/filament-assets/swiftshader
+#
+# Publish the image:
+#   docker login ghcr.io --username <user> --password <token>
+#   docker push ghcr.io/filament-assets/swiftshader
+#
+# Run the image and mount the current directory:
+#   docker run -it -v `pwd`:/trees/filament -t ssfilament
+
+FROM ubuntu:focal
+WORKDIR /trees
+ARG DEBIAN_FRONTEND=noninteractive
+ENV SWIFTSHADER_LD_LIBRARY_PATH=/trees/swiftshader/build
+ENV CXXFLAGS='-fno-builtin -Wno-pass-failed'
+
+RUN apt-get update && \
+    apt-get --no-install-recommends install -y \
+	apt-transport-https \
+	apt-utils \
+	build-essential \
+	cmake \
+	ca-certificates \
+	git \
+	ninja-build \
+	python \
+	python3 \
+	xorg-dev \
+	clang-7 \
+	libc++-7-dev \
+	libc++abi-7-dev \
+	lldb
+
+# Ensure that clang is used instead of gcc.
+RUN set -eux ;\
+    update-alternatives --install /usr/bin/clang clang /usr/bin/clang-7 100 ;\
+    update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-7 100 ;\
+    update-alternatives --install /usr/bin/cc cc /usr/bin/clang 100 ;\
+    update-alternatives --install /usr/bin/c++ c++ /usr/bin/clang++ 100
+
+# Get patch files from the local Filament tree.
+COPY build/swiftshader/*.diff .
+
+# Clone SwiftShader, apply patches, and build it.
+RUN set -eux ;\
+	git clone https://swiftshader.googlesource.com/SwiftShader swiftshader ;\
+    cd swiftshader ;\
+	git checkout 139f5c3 ;\
+	git apply /trees/*.diff ;\
+    cd build ;\
+    cmake .. -GNinja -DCMAKE_BUILD_TYPE=Release ;\
+    ninja
--- a/build/swiftshader/gallery.py
+++ b/build/swiftshader/gallery.py
@@ -0,0 +1,56 @@
+#!/usr/bin/env python3
+
+from pathlib import Path
+import os
+
+spath = os.path.dirname(os.path.realpath(__file__))
+
+path = Path(spath)
+
+folder = "../../results/"
+
+images = list(path.glob(folder + '*.png'))
+
+images.sort()
+
+gallery = open(path.absolute().joinpath(folder + 'index.html'), 'w')
+
+gallery.write("""<html>
+<head>
+<script type="module" src="https://unpkg.com/img-comparison-slider@latest/dist/component/component.esm.js"></script>
+<script nomodule="" src="https://unpkg.com/img-comparison-slider@latest/dist/component/component.js"></script>
+<link rel="stylesheet" href="https://unpkg.com/img-comparison-slider@latest/dist/collection/styles/initial.css"/>
+<style>
+    h2 {
+        font-weight: normal;
+        margin-top: 150px;
+        margin-bottom: 20px;
+    }
+    a {
+        text-decoration: none;
+        font-family: 'Segoe UI', Tahoma, Geneva, Verdana, sans-serif;
+        color: blue;
+    }
+    a:hover {
+        font-weight: bold;
+    }
+</style>
+</head>
+<body>
+""")
+
+tag = ''
+
+for image in images:
+    group = image.stem.rstrip('0123456789')
+    before = f'https://filament-assets.github.io/golden/{group}/{image.name}'
+    after = image.name
+    gallery.write('\n')
+    gallery.write(f'<h2><a href="{image.stem}.json">{image.stem}.json</a></h2>\n')
+    gallery.write('<img-comparison-slider>\n')
+    gallery.write(f'<img slot="before" src="{before}" /> <img slot="after" src="{after}" />\n')
+    gallery.write('</img-comparison-slider>\n')
+
+gallery.write("""</body>
+</html>
+""")
--- a/build/swiftshader/patch_00.diff
+++ b/build/swiftshader/patch_00.diff
@@ -0,0 +1,62 @@
+diff --git a/src/Vulkan/VkPipeline.cpp b/src/Vulkan/VkPipeline.cpp
+index 86913ec72..3b35345af 100644
+--- a/src/Vulkan/VkPipeline.cpp
+++ b/src/Vulkan/VkPipeline.cpp
+@@ -71,7 +71,56 @@ std::vector<uint32_t> preprocessSpirv(
+ 	if(optimize)
+ 	{
+ 		// Full optimization list taken from spirv-opt.
+-		opt.RegisterPerformancePasses();
+
+		// We have removed CreateRedundancyEliminationPass because it segfaults when encountering:
+		//     %389 = OpCompositeConstruct %7 %386 %387 %388 %86
+		// When inserting an entry into instruction_to_value_ (which is an unordered_map)
+		// This could perhaps be investigated further with help from asan.
+
+		using namespace spvtools;
+		opt.RegisterPass(CreateWrapOpKillPass())
+			.RegisterPass(CreateDeadBranchElimPass())
+			.RegisterPass(CreateMergeReturnPass())
+			.RegisterPass(CreateInlineExhaustivePass())
+			.RegisterPass(CreateAggressiveDCEPass())
+			.RegisterPass(CreatePrivateToLocalPass())
+			.RegisterPass(CreateLocalSingleBlockLoadStoreElimPass())
+			.RegisterPass(CreateLocalSingleStoreElimPass())
+			.RegisterPass(CreateAggressiveDCEPass())
+			.RegisterPass(CreateScalarReplacementPass())
+			.RegisterPass(CreateLocalAccessChainConvertPass())
+			.RegisterPass(CreateLocalSingleBlockLoadStoreElimPass())
+			.RegisterPass(CreateLocalSingleStoreElimPass())
+			.RegisterPass(CreateAggressiveDCEPass())
+			.RegisterPass(CreateLocalMultiStoreElimPass())
+			.RegisterPass(CreateAggressiveDCEPass())
+			.RegisterPass(CreateCCPPass())
+			.RegisterPass(CreateAggressiveDCEPass())
+			.RegisterPass(CreateLoopUnrollPass(true))
+			.RegisterPass(CreateDeadBranchElimPass())
+			.RegisterPass(CreateRedundancyEliminationPass()) // workaround for SEGFAULT
+			.RegisterPass(CreateCombineAccessChainsPass())
+			.RegisterPass(CreateSimplificationPass())
+			.RegisterPass(CreateScalarReplacementPass())
+			.RegisterPass(CreateLocalAccessChainConvertPass())
+			.RegisterPass(CreateLocalSingleBlockLoadStoreElimPass())
+			.RegisterPass(CreateLocalSingleStoreElimPass())
+			.RegisterPass(CreateAggressiveDCEPass())
+			.RegisterPass(CreateSSARewritePass())
+			.RegisterPass(CreateAggressiveDCEPass())
+			.RegisterPass(CreateVectorDCEPass())
+			.RegisterPass(CreateDeadInsertElimPass())
+			.RegisterPass(CreateDeadBranchElimPass())
+			.RegisterPass(CreateSimplificationPass())
+			.RegisterPass(CreateIfConversionPass())
+			.RegisterPass(CreateCopyPropagateArraysPass())
+			.RegisterPass(CreateReduceLoadSizePass())
+			.RegisterPass(CreateAggressiveDCEPass())
+			.RegisterPass(CreateBlockMergePass())
+			.RegisterPass(CreateRedundancyEliminationPass()) // workaround for SEGFAULT
+			.RegisterPass(CreateDeadBranchElimPass())
+			.RegisterPass(CreateBlockMergePass())
+			.RegisterPass(CreateSimplificationPass());
+ 	}
+ 
+ 	std::vector<uint32_t> optimized;
--- a/build/swiftshader/test.sh
+++ b/build/swiftshader/test.sh
@@ -0,0 +1,127 @@
+#!/bin/bash
+set -e
+
+function print_help {
+    local self_name=$(basename "$0")
+    echo "This script issues docker commands for testing Filament with SwiftShader."
+    echo "The usual sequence of commands is: fetch, start, build filament release, and run."
+    echo ""
+    echo "Usage:"
+    echo "    $self_name [command]"
+    echo ""
+    echo "Commands:"
+    echo "    build filament [debug | release]"
+    echo "        Use the container to build Filament."
+    echo "    build swiftshader [debug | release]"
+    echo "        Use the container to do a clean rebuild of SwiftShader."
+    echo "        (Note that the container already has SwiftShader built.)"
+    echo "    fetch"
+    echo "        Download the docker image from the central repository."
+    echo "    help"
+    echo "        Print this help message."
+    echo "    logs"
+    echo "        Print messages from the container's kernel ring buffer."
+    echo "        This is useful for diagnosing OOM issues."
+    echo "    run [lldb]"
+    echo "        Launch a test inside the container, optionally via lldb."
+    echo "    shell"
+    echo "        Interact with a bash prompt in the container."
+    echo "    start"
+    echo "        Start a container from the image."
+    echo "    stop"
+    echo "        Stop the container."
+    echo ""
+}
+
+# Change the current working directory to the Filament root.
+pushd "$(dirname "$0")/../.." > /dev/null
+
+if [[ "$1" == "build" ]] && [[ "$2" == "filament" ]]; then
+    docker exec runner filament/build.sh -t $3 gltf_viewer
+    exit $?
+fi
+
+if [[ "$1" == "build" ]] && [[ "$2" == "swiftshader" ]]; then
+    BUILD_TYPE="$3"
+    BUILD_TYPE="$(tr '[:lower:]' '[:upper:]' <<< ${BUILD_TYPE:0:1})${BUILD_TYPE:1}"
+    docker exec --workdir /trees/swiftshader runner rm -rf build
+    docker exec --workdir /trees/swiftshader runner mkdir build
+    docker exec --workdir /trees/swiftshader/build runner cmake -GNinja -DCMAKE_BUILD_TYPE="$BUILD_TYPE" ..
+    docker exec --workdir /trees/swiftshader/build runner ninja
+    exit $?
+fi
+
+if [[ "$1" == "fetch" ]]; then
+    docker pull ghcr.io/filament-assets/swiftshader:latest
+    docker tag ghcr.io/filament-assets/swiftshader:latest ssfilament
+    exit $?
+fi
+
+if [[ "$1" == "help" ]]; then
+    print_help
+    exit 0
+fi
+
+if [[ "$1" == "logs" ]]; then
+    docker exec runner dmesg --human --read-clear
+    exit $?
+fi
+
+if [[ "$1" == "run" ]] && [[ "$2" == "lldb" ]]; then
+    docker exec -i --workdir /trees/filament/results runner \
+          lldb --batch -o run -o bt -- \
+          ../out/cmake-release/samples/gltf_viewer \
+          --headless \
+          --batch ../libs/viewer/tests/basic.json \
+          --api vulkan
+    docker exec runner /trees/filament/build/swiftshader/gallery.py
+    exit $?
+fi
+
+if [[ "$1" == "run" ]]; then
+    docker exec --tty  --workdir /trees/filament/results runner \
+          /usr/bin/catchsegv \
+          ../out/cmake-release/samples/gltf_viewer \
+          --headless \
+          --batch ../libs/viewer/tests/basic.json \
+          --api vulkan
+    docker exec runner /trees/filament/build/swiftshader/gallery.py
+    exit $?
+fi
+
+if [[ "$1" == "shell" ]]; then
+    docker exec --interactive --tty runner /bin/bash
+    exit $?
+fi
+
+# Notes on options being passed to docker's run command:
+#
+# - The memory constraint seems to prevent an OOM signal in GitHub Actions.
+# - The cap / security args allow use of lldb and creation of core dumps.
+# - The privileged arg allows use of dmesg for examining OOM logs.
+#
+# Currently, a GitHub Actions VM has 2 CPUs, 7 GB RAM, and 14 GB of SSD disk space.
+#
+# Please be aware that Docker Desktop might impose additional resource constraints, and that those
+# settings can only be controlled with its GUI. We recommend at least 7 GB of memory and 2 GB swap.
+if [[ "$1" == "start" ]]; then
+    mkdir -p results
+    docker run --tty --rm --detach --privileged \
+          --memory 6.5g \
+          --name runner \
+          --cap-add=SYS_PTRACE \
+          --security-opt seccomp=unconfined \
+          --security-opt apparmor=unconfined \
+          --volume `pwd`:/trees/filament \
+          --workdir /trees \
+          ssfilament
+    exit $?
+fi
+
+if [[ "$1" == "stop" ]]; then
+    docker container rm runner --force
+    exit $?
+fi
+
+print_help
+exit 1
--- a/build/toolchain-arm7-linux-android.cmake
+++ b/build/toolchain-arm7-linux-android.cmake
@@ -21,7 +21,7 @@ set(CMAKE_SYSTEM_NAME Linux)
 set(CMAKE_SYSTEM_VERSION 1)

 # android
-set(API_LEVEL 21)
+set(API_LEVEL 19)

 # architecture
 set(ARCH armv7a-linux-androideabi)
--- a/build/toolchain-x86-linux-android.cmake
+++ b/build/toolchain-x86-linux-android.cmake
@@ -21,7 +21,7 @@ set(CMAKE_SYSTEM_NAME Linux)
 set(CMAKE_SYSTEM_VERSION 1)

 # android
-set(API_LEVEL 21)
+set(API_LEVEL 19)

 # architecture
 set(ARCH i686-linux-android)
--- a/build/web/ci-common.sh
+++ b/build/web/ci-common.sh
@@ -1,6 +1,7 @@
 #!/bin/bash
 if [ `uname` == "Linux" ];then
-    source `dirname $0`/../linux/ci-common.sh
+    curl -OL https://github.com/ninja-build/ninja/releases/download/v1.10.2/ninja-linux.zip
+    unzip -q ninja-linux.zip
 elif [ `uname` == "Darwin" ];then
    curl -OL https://github.com/ninja-build/ninja/releases/download/v1.10.2/ninja-mac.zip
    unzip -q ninja-mac.zip
@@ -12,6 +13,9 @@ fi
 chmod +x ninja
 export PATH="$PWD:$PATH"

+# FIXME: kokoro machines have node and npm but currently they are symlinked to non-existent files
+# npm install -g typescript
+
 # Install emscripten.
 curl -L https://github.com/emscripten-core/emsdk/archive/refs/tags/3.1.15.zip > emsdk.zip
 unzip emsdk.zip ; mv emsdk-* emsdk ; cd emsdk
--- a/build/windows/build-github.bat
+++ b/build/windows/build-github.bat
@@ -115,23 +115,17 @@ cmake ..\.. ^
    -DFILAMENT_SUPPORTS_VULKAN=ON ^
    || exit /b

-set build_flags=-j %NUMBER_OF_PROCESSORS%
-
-@echo on
-
-:: we've upgraded the windows machines, so the following are no longer accurate as of 09/19/24, but
-:: keeping around the comment for record.
-
 :: Attempt to fix "error C1060: compiler is out of heap space" seen on CI.
 :: Some resource libraries require significant heap space to compile, so first compile them serially.
-:: cmake --build . --target filagui --config %config% %build_flags% || exit /b
-:: cmake --build . --target uberarchive --config %config% %build_flags% || exit /b
-:: cmake --build . --target gltf-demo-resources --config %config% %build_flags% || exit /b
-:: cmake --build . --target filamentapp-resources --config %config% %build_flags% || exit /b
-:: cmake --build . --target sample-resources --config %config% %build_flags% || exit /b
-:: cmake --build . --target suzanne-resources --config %config% %build_flags% || exit /b
+@echo on
+cmake --build . --target filagui --config %config% || exit /b
+cmake --build . --target uberarchive --config %config% || exit /b
+cmake --build . --target gltf-demo-resources --config %config% || exit /b
+cmake --build . --target filamentapp-resources --config %config% || exit /b
+cmake --build . --target sample-resources --config %config% || exit /b
+cmake --build . --target suzanne-resources --config %config% || exit /b

-cmake --build . %INSTALL% --config %config% %build_flags% -- /m || exit /b
+cmake --build . %INSTALL% --config %config% -- /m || exit /b
@echo off

 echo Disk info after building variant: %variant%
--- a/docs/Filament.html
+++ b/docs/Filament.html
@@ -476,7 +476,7 @@ Energy conservation is one of the key components of a good BRDF for physically b
 <p>


-For the specular term, \(f_r\) is a mirror BRDF that can be modeled with the Fresnel law, noted \(F\) in the Cook-Torrance approximation of the microfacet model integration:
+For the specular term, \(f_m\) is a mirror BRDF that can be modeled with the Fresnel law, noted \(F\) in the Cook-Torrance approximation of the microfacet model integration:

 </p><p>

@@ -857,7 +857,7 @@ The full GLSL implementation of the standard model is shown in <a href="#listing
 <span class="line">    <span class="hljs-comment">// perceptually linear roughness to roughness (see parameterization)</span></span>
 <span class="line">    <span class="hljs-type">float</span> roughness = perceptualRoughness * perceptualRoughness;</span>
 <span class="line"></span>
-<span class="line">    <span class="hljs-type">float</span> D = D_GGX(NoH, roughness);</span>
+<span class="line">    <span class="hljs-type">float</span> D = D_GGX(NoH, a);</span>
 <span class="line">    <span class="hljs-type">vec3</span>  F = F_Schlick(LoH, f0);</span>
 <span class="line">    <span class="hljs-type">float</span> V = V_SmithGGXCorrelated(NoV, NoL, roughness);</span>
 <span class="line"></span>
--- a/docs/Materials.html
+++ b/docs/Materials.html
--- a/docs/Materials.md.html
+++ b/docs/Materials.md.html
@@ -1308,12 +1308,7 @@ Description
      declare a variable called `eyeDirection` you can access it in the fragment shader using
      `variable_eyeDirection`. In the vertex shader, the interpolant name is simply a member of
      the `MaterialVertexInputs` structure (`material.eyeDirection` in your example). Each
-      interpolant is of type `float4` (`vec4`) in the shaders. By default the precision of the
-      interpolant is `highp` in *both* the vertex and fragment shaders.
-      An alternate syntax can be used to specify both the name and precision of the interpolant.
-      In this case the specified precision is used as-is in both fragment and vertex stages, in
-      particular if `default` is specified the default precision is used is the fragment shader
-      (`mediump`) and in the vertex shader (`highp`).
+      interpolant is of type `float4` (`vec4`) in the shaders.

 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ JSON
 material {
@@ -1325,11 +1320,7 @@ material {
        }
    ],
    variables : [
-         eyeDirection,
-         {
-            name : eyeColor,
-            precision : medium
-         }
+         eyeDirection
    ],
    vertexDomain : device,
    depthWrite : false,
@@ -1406,7 +1397,7 @@ Type
 :    `string`

 Value
-:     Any of `opaque`, `transparent`, `fade`, `add`, `masked`, `multiply`, `screen`, `custom`. Defaults to `opaque`.
+:     Any of `opaque`, `transparent`, `fade`, `add`, `masked`, `multiply`, `screen`. Defaults to `opaque`.

 Description
 :     Defines how/if the rendered object is blended with the content of the render target.
@@ -1429,7 +1420,6 @@ Description
      of the material's output defines whether a fragment is discarded or not. Additionally,
      ALPHA_TO_COVERAGE is enabled for non-translucent views. See the maskThreshold section for more
      information.
-    - **Custom**: blending is enabled. But the blending function is user specified. See `blendFunction`.

 !!! Note
    When `blending` is set to `masked`, alpha to coverage is automatically enabled for the material.
@@ -1442,36 +1432,6 @@ material {
 }
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

-### Blending and transparency: blendFunction
-
-Type
-:    `object`
-
-Fields
-:     `srcRGB`, `srcA`, `dstRGB`, `dstA`
-
-Description
-:       - *srcRGB*: source function applied to the RGB channels
-        - *srcA*: source function applied to the alpha channel
-        - *srcRGB*: destination function applied to the RGB channels
-        - *srcRGB*: destination function applied to the alpha channel
-        The values possible for each functions are one of `zero`, `one`, `srcColor`, `oneMinusSrcColor`,
-               `dstColor`, `oneMinusDstColor`, `srcAlpha`, `oneMinusSrcAlpha`, `dstAlpha`,
-               `oneMinusDstAlpha`, `srcAlphaSaturate`
-
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ JSON
-material {
-    blending : custom,
-    blendFunction :
-    {
-        srcRGB: one,
-        srcA: one,
-        dstRGB: oneMinusSrcColor,
-        dstA: oneMinusSrcAlpha
-    }
- }
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
 ### Blending and transparency: postLightingBlending

 Type
@@ -2434,7 +2394,6 @@ The following APIs are only available from the vertex block:
 **getWorldFromModelMatrix()**        | float4x4 |  Matrix that converts from model (object) space to world space
 **getWorldFromModelNormalMatrix()**  | float3x3 |  Matrix that converts normals from model (object) space to world space
 **getVertexIndex()**                 | int      |  Index of the current vertex
-**getEyeIndex()**                    | int      |  Index of the eye being rendered, starting at 0

 ### Fragment only

--- a/docs/remote/filament.js
+++ b/docs/remote/filament.js
--- a/docs/remote/filament.wasm
+++ b/docs/remote/filament.wasm
--- a/docs/viewer/filament-viewer.js
+++ b/docs/viewer/filament-viewer.js
@@ -15,7 +15,7 @@
 */

 // If you are bundling this with rollup, webpack, or esbuild, the following URL should be trimmed.
-import { LitElement, html, css } from "https://unpkg.com/lit@2.8.0?module";
+import { LitElement, html, css } from "https://unpkg.com/lit?module";

 // This little utility checks if the Filament module is ready for action.
 // If so, it immediately calls the given function. If not, it asks the Filament
@@ -287,12 +287,12 @@ class FilamentViewer extends LitElement {
        // Dropping a glb file is simple because there are no external resources.
        if (this.srcBlob && this.srcBlob.name.endsWith(".glb")) {
            this.srcBlob.arrayBuffer().then(buffer => {
-                this.asset = this.loader.createAsset(new Uint8Array(buffer));
+                this.asset = this.loader.createAssetFromBinary(new Uint8Array(buffer));
                const aabb = this.asset.getBoundingBox();
                this.assetRoot = this.asset.getRoot();
                this.unitCubeTransform = Filament.fitIntoUnitCube(aabb, zoffset);
                this.asset.loadResources();
-                this.animator = this.asset.getInstance().getAnimator();
+                this.animator = this.asset.getAnimator();
                this.animationStartTime = Date.now();
                this._updateOverlay();
            });
@@ -304,6 +304,8 @@ class FilamentViewer extends LitElement {

            const config = {
                normalizeSkinningWeights: true,
+                recomputeBoundingBoxes: false,
+                ignoreBindTransform: false,
                asyncInterval: 30
            };

@@ -318,20 +320,22 @@ class FilamentViewer extends LitElement {
                        resourceLoader.delete();
                        stbProvider.delete();
                        ktx2Provider.delete();
-                        this.animator = this.asset.getInstance().getAnimator();
+                        this.animator = this.asset.getAnimator();
                        this.animationStartTime = Date.now();
                    }
                }, config.asyncInterval);
            };

            this.srcBlob.arrayBuffer().then(buffer => {
-                this.asset = this.loader.createAsset(new Uint8Array(buffer));
+                this.asset = this.loader.createAssetFromJson(new Uint8Array(buffer));
                const aabb = this.asset.getBoundingBox();
                this.assetRoot = this.asset.getRoot();
                this.unitCubeTransform = Filament.fitIntoUnitCube(aabb, zoffset);

                const resourceLoader = new Filament.gltfio$ResourceLoader(this.engine,
-                    config.normalizeSkinningWeights);
+                    config.normalizeSkinningWeights,
+                    config.recomputeBoundingBoxes,
+                    config.ignoreBindTransform);

                const stbProvider = new Filament.gltfio$StbProvider(this.engine);
                const ktx2Provider = new Filament.gltfio$Ktx2Provider(this.engine);
@@ -363,7 +367,12 @@ class FilamentViewer extends LitElement {
            return response.arrayBuffer();
        }).then(arrayBuffer => {
            const modelData = new Uint8Array(arrayBuffer);
-            this.asset = this.loader.createAsset(modelData);
+            if (this.src.endsWith(".glb")) {
+                this.asset = this.loader.createAssetFromBinary(modelData);
+            } else {
+                this.asset = this.loader.createAssetFromJson(modelData);
+            }
+
            const aabb = this.asset.getBoundingBox();
            this.assetRoot = this.asset.getRoot();
            this.unitCubeTransform = Filament.fitIntoUnitCube(aabb, zoffset);
@@ -371,7 +380,7 @@ class FilamentViewer extends LitElement {
            const basePath = '' + new URL(this.src, document.location);

            this.asset.loadResources(() => {
-                this.animator = this.asset.getInstance().getAnimator();
+                this.animator = this.asset.getAnimator();
                this.animationStartTime = Date.now();
                this._applyMaterialVariant();
            }, null, basePath);
@@ -432,15 +441,14 @@ class FilamentViewer extends LitElement {
        if (!this.hasAttribute("materialVariant")) {
            return;
        }
-        const instance = this.asset.getInstance();
-        const names = instance.getMaterialVariantNames();
+        const names = this.asset.getMaterialVariantNames();
        const index = this.materialVariant;
        if (index < 0 || index >= names.length) {
            console.error(`Material variant ${index} does not exist in this asset.`);
            return;
        }
        console.info(this.src, `Applying material variant: ${names[index]}`);
-        instance.applyMaterialVariant(index);
+        this.asset.applyMaterialVariant(index);
    }
 }

--- a/docs/viewer/index.html
+++ b/docs/viewer/index.html
@@ -43,7 +43,7 @@ filament-viewer::part(canvas) {
 </p>

 </main>
-<script src="https://unpkg.com/filament@1.51.6/filament.js"></script>
+<script src="https://unpkg.com/filament@1.25.3/filament.js"></script>
 <script src="https://unpkg.com/gltumble"></script>
 <script src="filament-viewer.js" type="module"></script>
 </body>
--- a/docs/webgl/filament.js
+++ b/docs/webgl/filament.js
--- a/docs/webgl/filament.wasm
+++ b/docs/webgl/filament.wasm
--- a/docs/webgl/parquet.filamat
+++ b/docs/webgl/parquet.filamat
--- a/docs/webgl/plastic.filamat
+++ b/docs/webgl/plastic.filamat
--- a/docs/webgl/reference.html
+++ b/docs/webgl/reference.html
@@ -587,7 +587,6 @@
 <li><em>overrides</em> Dictionary with one or more of the following properties: mapSize, shadowCascades, constantBias, normalBias, shadowFar, shadowNearHint, shadowFarHint, stable, polygonOffsetConstant, polygonOffsetSlope, \</li>
 </ul>
 </li>
-<li><strong>engine.setStereoscopicOptions()</strong></li>
 <li><strong>engine.setTemporalAntiAliasingOptions()</strong></li>
 <li><strong>engine.setVignetteOptions()</strong></li>
 </ul>
@@ -1463,8 +1462,6 @@ This defines the following functions:</p>
 <li>STENCIL_ATTACHMENT</li>
 <li>UPLOADABLE</li>
 <li>SAMPLEABLE</li>
-<li>BLIT_SRC</li>
-<li>BLIT_DST</li>
 <li>SUBPASS_INPUT</li>
 </ul>
 </div>
--- a/docs/webgl/textured.filamat
+++ b/docs/webgl/textured.filamat
--- a/docs/webgl/triangle.filamat
+++ b/docs/webgl/triangle.filamat
--- a/docs/webgl/tutorial_suzanne.html
+++ b/docs/webgl/tutorial_suzanne.html
@@ -22,26 +22,27 @@ converting <a href="https://github.com/google/filament/blob/main/assets/models/m
 <p>Next, let&#x27;s create mipmapped KTX files using filament&#x27;s <code>mipgen</code> tool. We&#x27;ll create compressed and
 non-compressed variants for each texture, since not all platforms support the same compression
 formats. First copy over the PNG files from the <a href="https://github.com/google/filament/blob/main/assets/models/monkey">monkey folder</a>, then do:</p>
-<div class="highlight" style="background: #f8f8f8"><pre style="line-height: 125%;"><span></span><span style="color: #3D7B7B; font-style: italic"># Create mipmaps for base color</span>
-mipgen albedo.png albedo.ktx2
-mipgen --compression<span style="color: #666666">=</span>uastc albedo.png albedo.ktx2
+<div class="highlight" style="background: #f8f8f8"><pre style="line-height: 125%;"><span></span><span style="color: #3D7B7B; font-style: italic"># Create mipmaps for base color and two compressed variants.</span>
+mipgen albedo.png albedo.ktx
+mipgen --compression<span style="color: #666666">=</span>astc_fast_ldr_4x4 albedo.png albedo_astc.ktx
+mipgen --compression<span style="color: #666666">=</span>s3tc_rgb_dxt1 albedo.png albedo_s3tc_srgb.ktx

 <span style="color: #3D7B7B; font-style: italic"># Create mipmaps for the normal map and a compressed variant.</span>
 mipgen --strip-alpha --kernel<span style="color: #666666">=</span>NORMALS --linear normal.png normal.ktx
-mipgen --strip-alpha --kernel<span style="color: #666666">=</span>NORMALS --linear --compression<span style="color: #666666">=</span>uastc_normals <span style="color: #AA5D1F; font-weight: bold">\</span>
-    normal.png normal.ktx2
+mipgen --strip-alpha --kernel<span style="color: #666666">=</span>NORMALS --linear --compression<span style="color: #666666">=</span>etc_rgb8_normalxyz_40 <span style="color: #AA5D1F; font-weight: bold">\</span>
+    normal.png normal_etc.ktx

 <span style="color: #3D7B7B; font-style: italic"># Create mipmaps for the single-component roughness map and a compressed variant.</span>
 mipgen --grayscale roughness.png roughness.ktx
-mipgen --grayscale --compression<span style="color: #666666">=</span>uastc roughness.png roughness.ktx2
+mipgen --grayscale --compression<span style="color: #666666">=</span>etc_r11_numeric_40 roughness.png roughness_etc.ktx

 <span style="color: #3D7B7B; font-style: italic"># Create mipmaps for the single-component metallic map and a compressed variant.</span>
 mipgen --grayscale metallic.png metallic.ktx
-mipgen --grayscale --compression<span style="color: #666666">=</span>uastc metallic.png metallic.ktx2
+mipgen --grayscale --compression<span style="color: #666666">=</span>etc_r11_numeric_40 metallic.png metallic_etc.ktx

 <span style="color: #3D7B7B; font-style: italic"># Create mipmaps for the single-component occlusion map and a compressed variant.</span>
 mipgen --grayscale ao.png ao.ktx
-mipgen --grayscale --compression<span style="color: #666666">=</span>uastc ao.png ao.ktx2
+mipgen --grayscale --compression<span style="color: #666666">=</span>etc_r11_numeric_40 ao.png ao_etc.ktx
 </pre></div>

 <p>For more information on mipgen&#x27;s arguments and supported formats, do <code>mipgen --help</code>.</p>
@@ -206,11 +207,11 @@ when the assets have finished downloading.</p>
 recreate the skybox using a higher-resolution texture. As a last step we unhide the renderable that
 was created in the app constructor.</p>
 <div class="highlight" style="background: #f8f8f8"><pre style="line-height: 125%;"><span></span>Filament.fetch([sky_large_url,<span style="color: #bbbbbb"> </span>albedo_url,<span style="color: #bbbbbb"> </span>roughness_url,<span style="color: #bbbbbb"> </span>metallic_url,<span style="color: #bbbbbb"> </span>normal_url,<span style="color: #bbbbbb"> </span>ao_url],<span style="color: #bbbbbb"> </span>()<span style="color: #bbbbbb"> </span>=&gt;<span style="color: #bbbbbb"> </span>{<span style="color: #bbbbbb"></span>
-<span style="color: #bbbbbb">    </span><span style="color: #008000; font-weight: bold">const</span><span style="color: #bbbbbb"> </span>albedo<span style="color: #bbbbbb"> </span><span style="color: #666666">=</span><span style="color: #bbbbbb"> </span><span style="color: #008000; font-weight: bold">this</span>.engine.createTextureFromKtx2(albedo_url,<span style="color: #bbbbbb"> </span>{srgb<span style="color: #666666">:</span><span style="color: #bbbbbb"> </span><span style="color: #008000; font-weight: bold">true</span>});<span style="color: #bbbbbb"></span>
-<span style="color: #bbbbbb">    </span><span style="color: #008000; font-weight: bold">const</span><span style="color: #bbbbbb"> </span>roughness<span style="color: #bbbbbb"> </span><span style="color: #666666">=</span><span style="color: #bbbbbb"> </span><span style="color: #008000; font-weight: bold">this</span>.engine.createTextureFromKtx2(roughness_url);<span style="color: #bbbbbb"></span>
-<span style="color: #bbbbbb">    </span><span style="color: #008000; font-weight: bold">const</span><span style="color: #bbbbbb"> </span>metallic<span style="color: #bbbbbb"> </span><span style="color: #666666">=</span><span style="color: #bbbbbb"> </span><span style="color: #008000; font-weight: bold">this</span>.engine.createTextureFromKtx2(metallic_url);<span style="color: #bbbbbb"></span>
-<span style="color: #bbbbbb">    </span><span style="color: #008000; font-weight: bold">const</span><span style="color: #bbbbbb"> </span>normal<span style="color: #bbbbbb"> </span><span style="color: #666666">=</span><span style="color: #bbbbbb"> </span><span style="color: #008000; font-weight: bold">this</span>.engine.createTextureFromKtx2(normal_url);<span style="color: #bbbbbb"></span>
-<span style="color: #bbbbbb">    </span><span style="color: #008000; font-weight: bold">const</span><span style="color: #bbbbbb"> </span>ao<span style="color: #bbbbbb"> </span><span style="color: #666666">=</span><span style="color: #bbbbbb"> </span><span style="color: #008000; font-weight: bold">this</span>.engine.createTextureFromKtx2(ao_url);<span style="color: #bbbbbb"></span>
+<span style="color: #bbbbbb">    </span><span style="color: #008000; font-weight: bold">const</span><span style="color: #bbbbbb"> </span>albedo<span style="color: #bbbbbb"> </span><span style="color: #666666">=</span><span style="color: #bbbbbb"> </span><span style="color: #008000; font-weight: bold">this</span>.engine.createTextureFromKtx1(albedo_url,<span style="color: #bbbbbb"> </span>{srgb<span style="color: #666666">:</span><span style="color: #bbbbbb"> </span><span style="color: #008000; font-weight: bold">true</span>});<span style="color: #bbbbbb"></span>
+<span style="color: #bbbbbb">    </span><span style="color: #008000; font-weight: bold">const</span><span style="color: #bbbbbb"> </span>roughness<span style="color: #bbbbbb"> </span><span style="color: #666666">=</span><span style="color: #bbbbbb"> </span><span style="color: #008000; font-weight: bold">this</span>.engine.createTextureFromKtx1(roughness_url);<span style="color: #bbbbbb"></span>
+<span style="color: #bbbbbb">    </span><span style="color: #008000; font-weight: bold">const</span><span style="color: #bbbbbb"> </span>metallic<span style="color: #bbbbbb"> </span><span style="color: #666666">=</span><span style="color: #bbbbbb"> </span><span style="color: #008000; font-weight: bold">this</span>.engine.createTextureFromKtx1(metallic_url);<span style="color: #bbbbbb"></span>
+<span style="color: #bbbbbb">    </span><span style="color: #008000; font-weight: bold">const</span><span style="color: #bbbbbb"> </span>normal<span style="color: #bbbbbb"> </span><span style="color: #666666">=</span><span style="color: #bbbbbb"> </span><span style="color: #008000; font-weight: bold">this</span>.engine.createTextureFromKtx1(normal_url);<span style="color: #bbbbbb"></span>
+<span style="color: #bbbbbb">    </span><span style="color: #008000; font-weight: bold">const</span><span style="color: #bbbbbb"> </span>ao<span style="color: #bbbbbb"> </span><span style="color: #666666">=</span><span style="color: #bbbbbb"> </span><span style="color: #008000; font-weight: bold">this</span>.engine.createTextureFromKtx1(ao_url);<span style="color: #bbbbbb"></span>

 <span style="color: #bbbbbb">    </span><span style="color: #008000; font-weight: bold">const</span><span style="color: #bbbbbb"> </span>sampler<span style="color: #bbbbbb"> </span><span style="color: #666666">=</span><span style="color: #bbbbbb"> </span><span style="color: #AA22FF; font-weight: bold">new</span><span style="color: #bbbbbb"> </span>Filament.TextureSampler(<span style="color: #bbbbbb"></span>
 <span style="color: #bbbbbb">        </span>Filament.MinFilter.LINEAR_MIPMAP_LINEAR,<span style="color: #bbbbbb"></span>
--- a/docs/webgl/tutorial_suzanne.js
+++ b/docs/webgl/tutorial_suzanne.js
@@ -33,13 +33,13 @@ class App {
    });
    Filament.fetch([sky_large_url, albedo_url, roughness_url, metallic_url, normal_url, ao_url],
    () => {
-      const albedo = this.engine.createTextureFromKtx2(albedo_url, {
+      const albedo = this.engine.createTextureFromKtx1(albedo_url, {
        srgb: true
      });
-      const roughness = this.engine.createTextureFromKtx2(roughness_url);
-      const metallic = this.engine.createTextureFromKtx2(metallic_url);
-      const normal = this.engine.createTextureFromKtx2(normal_url);
-      const ao = this.engine.createTextureFromKtx2(ao_url);
+      const roughness = this.engine.createTextureFromKtx1(roughness_url);
+      const metallic = this.engine.createTextureFromKtx1(metallic_url);
+      const normal = this.engine.createTextureFromKtx1(normal_url);
+      const ao = this.engine.createTextureFromKtx1(ao_url);
      const sampler = new Filament.TextureSampler(Filament.MinFilter.LINEAR_MIPMAP_LINEAR,
        Filament.MagFilter.LINEAR, Filament.WrapMode.CLAMP_TO_EDGE);
      this.matinstance.setTextureParameter('albedo', albedo, sampler);
--- a/filament/CMakeLists.txt
+++ b/filament/CMakeLists.txt
@@ -61,14 +61,11 @@ set(SRCS
        src/Engine.cpp
        src/Exposure.cpp
        src/Fence.cpp
-        src/FilamentBuilder.cpp
        src/FrameInfo.cpp
        src/FrameSkipper.cpp
        src/Froxelizer.cpp
        src/Frustum.cpp
-        src/HwDescriptorSetLayoutFactory.cpp
        src/HwRenderPrimitiveFactory.cpp
-        src/HwVertexBufferInfoFactory.cpp
        src/IndexBuffer.cpp
        src/IndirectLight.cpp
        src/InstanceBuffer.cpp
@@ -77,6 +74,8 @@ set(SRCS
        src/MaterialInstance.cpp
        src/MaterialParser.cpp
        src/MorphTargetBuffer.cpp
+        src/PerViewUniforms.cpp
+        src/PerShadowMapUniforms.cpp
        src/PostProcessManager.cpp
        src/RenderPass.cpp
        src/RenderPrimitive.cpp
@@ -125,12 +124,6 @@ set(SRCS
        src/details/Texture.cpp
        src/details/VertexBuffer.cpp
        src/details/View.cpp
-        src/ds/ColorPassDescriptorSet.cpp
-        src/ds/DescriptorSet.cpp
-        src/ds/DescriptorSetLayout.cpp
-        src/ds/PostProcessDescriptorSet.cpp
-        src/ds/ShadowMapDescriptorSet.cpp
-        src/ds/SsrPassDescriptorSet.cpp
        src/fg/Blackboard.cpp
        src/fg/DependencyGraph.cpp
        src/fg/FrameGraph.cpp
@@ -144,7 +137,6 @@ set(SRCS

 set(PRIVATE_HDRS
        src/Allocators.h
-        src/Bimap.h
        src/BufferPoolAllocator.h
        src/ColorSpaceUtils.h
        src/Culler.h
@@ -154,21 +146,21 @@ set(PRIVATE_HDRS
        src/FrameInfo.h
        src/FrameSkipper.h
        src/Froxelizer.h
-        src/HwDescriptorSetLayoutFactory.h
        src/HwRenderPrimitiveFactory.h
-        src/HwVertexBufferInfoFactory.h
        src/Intersections.h
        src/MaterialParser.h
+        src/PerViewUniforms.h
+        src/PerShadowMapUniforms.h
        src/PIDController.h
        src/PostProcessManager.h
+        src/RendererUtils.h
        src/RenderPass.h
        src/RenderPrimitive.h
-        src/RendererUtils.h
        src/ResourceAllocator.h
        src/ResourceList.h
        src/ShadowMap.h
        src/ShadowMapManager.h
-        src/SharedHandle.h
+        src/TypedUniformBuffer.h
        src/UniformBuffer.h
        src/components/CameraManager.h
        src/components/LightManager.h
@@ -196,14 +188,6 @@ set(PRIVATE_HDRS
        src/details/Texture.h
        src/details/VertexBuffer.h
        src/details/View.h
-        src/downcast.h
-        src/ds/ColorPassDescriptorSet.h
-        src/ds/DescriptorSetLayout.h
-        src/ds/PostProcessDescriptorSet.h
-        src/ds/ShadowMapDescriptorSet.h
-        src/ds/SsrPassDescriptorSet.h
-        src/ds/TypedBuffer.h
-        src/ds/TypedUniformBuffer.h
        src/fg/Blackboard.h
        src/fg/FrameGraph.h
        src/fg/FrameGraphId.h
@@ -221,18 +205,14 @@ set(PRIVATE_HDRS
        src/materials/fsr/ffx_a.h
        src/materials/fsr/ffx_fsr1.h
        src/materials/fsr/ffx_fsr1_mobile.fs
+        src/downcast.h
 )

 set(MATERIAL_SRCS
-        src/materials/antiAliasing/fxaa.mat
-        src/materials/antiAliasing/taa.mat
-        src/materials/blitDepth.mat
-        src/materials/blitLow.mat
-        src/materials/blitArray.mat
-        src/materials/bloom/bloomDownsample.mat
-        src/materials/bloom/bloomDownsample2x.mat
-        src/materials/bloom/bloomDownsample9.mat
-        src/materials/bloom/bloomUpsample.mat
+        src/materials/fsr/fsr_easu.mat
+        src/materials/fsr/fsr_easu_mobile.mat
+        src/materials/fsr/fsr_easu_mobileF.mat
+        src/materials/fsr/fsr_rcas.mat
        src/materials/colorGrading/colorGrading.mat
        src/materials/colorGrading/colorGradingAsSubpass.mat
        src/materials/colorGrading/customResolveAsSubpass.mat
@@ -240,38 +220,32 @@ set(MATERIAL_SRCS
        src/materials/defaultMaterial.mat
        src/materials/dof/dof.mat
        src/materials/dof/dofCoc.mat
-        src/materials/dof/dofCombine.mat
-        src/materials/dof/dofDilate.mat
        src/materials/dof/dofDownsample.mat
-        src/materials/dof/dofMedian.mat
-        src/materials/dof/dofMipmap.mat
+        src/materials/dof/dofCombine.mat
        src/materials/dof/dofTiles.mat
        src/materials/dof/dofTilesSwizzle.mat
+        src/materials/dof/dofDilate.mat
+        src/materials/dof/dofMipmap.mat
+        src/materials/dof/dofMedian.mat
        src/materials/flare/flare.mat
-        src/materials/fsr/fsr_easu.mat
-        src/materials/fsr/fsr_easu_mobile.mat
-        src/materials/fsr/fsr_easu_mobileF.mat
-        src/materials/fsr/fsr_rcas.mat
-        src/materials/resolveDepth.mat
-        src/materials/separableGaussianBlur.mat
-        src/materials/skybox.mat
-        src/materials/shadowmap.mat
+        src/materials/blitLow.mat
+        src/materials/bloom/bloomDownsample.mat
+        src/materials/bloom/bloomUpsample.mat
        src/materials/ssao/bilateralBlur.mat
        src/materials/ssao/bilateralBlurBentNormals.mat
        src/materials/ssao/mipmapDepth.mat
+        src/materials/skybox.mat
        src/materials/ssao/sao.mat
        src/materials/ssao/saoBentNormals.mat
+        src/materials/separableGaussianBlur.mat
+        src/materials/antiAliasing/fxaa.mat
+        src/materials/antiAliasing/taa.mat
        src/materials/vsmMipmap.mat
 )

-set(MATERIAL_FL0_SRCS
-        src/materials/defaultMaterial.mat
-        src/materials/skybox.mat
-)
-
-set(MATERIAL_MULTIVIEW_SRCS
-        src/materials/defaultMaterial.mat
-        src/materials/skybox.mat
+set(MATERIAL_ES2_SRCS
+        src/materials/defaultMaterial0.mat
+        src/materials/skybox0.mat
 )

 # Embed the binary resource blob for materials.
@@ -298,16 +272,6 @@ if (NOT DFG_LUT_SIZE)
 endif()
 message(STATUS "DFG LUT size set to ${DFG_LUT_SIZE}x${DFG_LUT_SIZE}")

-# Whether to include FL0 materials.
-if (FILAMENT_ENABLE_FEATURE_LEVEL_0)
-    add_definitions(-DFILAMENT_ENABLE_FEATURE_LEVEL_0)
-endif()
-
-# Whether to include MULTIVIEW materials.
-if (FILAMENT_ENABLE_MULTIVIEW)
-    add_definitions(-DFILAMENT_ENABLE_MULTIVIEW)
-endif()
-
 # ==================================================================================================
 # Definitions
 # ==================================================================================================
@@ -338,43 +302,34 @@ foreach (mat_src ${MATERIAL_SRCS})
    get_filename_component(localname "${mat_src}" NAME_WE)
    get_filename_component(fullname "${mat_src}" ABSOLUTE)
    set(output_path "${MATERIAL_DIR}/${localname}.filamat")
+
    add_custom_command(
            OUTPUT ${output_path}
            COMMAND matc ${MATC_BASE_FLAGS} -o ${output_path} ${fullname}
            MAIN_DEPENDENCY ${fullname}
            DEPENDS matc
-            COMMENT "Compiling material ${fullname} to ${output_path}"
+            COMMENT "Compiling material ${mat_src} to ${output_path}"
    )
    list(APPEND MATERIAL_BINS ${output_path})
-
-    list(FIND MATERIAL_FL0_SRCS ${mat_src} index)
-    if (${index} GREATER -1 AND FILAMENT_ENABLE_FEATURE_LEVEL_0)
-        string(REGEX REPLACE "[.]filamat$" "_fl0.filamat" output_path_fl0 ${output_path})
-        add_custom_command(
-                OUTPUT ${output_path_fl0}
-                COMMAND matc ${MATC_BASE_FLAGS} -PfeatureLevel=0 -o ${output_path_fl0} ${fullname}
-                MAIN_DEPENDENCY ${fullname}
-                DEPENDS matc
-                COMMENT "Compiling material ${fullname} to ${output_path_fl0}"
-        )
-        list(APPEND MATERIAL_BINS ${output_path_fl0})
-    endif ()
-
-    list(FIND MATERIAL_MULTIVIEW_SRCS ${mat_src} index)
-    if (${index} GREATER -1 AND FILAMENT_ENABLE_MULTIVIEW)
-        string(REGEX REPLACE "[.]filamat$" "_multiview.filamat" output_path_multiview ${output_path})
-        add_custom_command(
-                OUTPUT ${output_path_multiview}
-                COMMAND matc ${MATC_BASE_FLAGS} -PstereoscopicType=multiview -o ${output_path_multiview} ${fullname}
-                MAIN_DEPENDENCY ${fullname}
-                DEPENDS matc
-                COMMENT "Compiling material ${fullname} to ${output_path_multiview}"
-        )
-        list(APPEND MATERIAL_BINS ${output_path_multiview})
-    endif ()
-
 endforeach()

+if (IS_MOBILE_TARGET AND FILAMENT_SUPPORTS_OPENGL)
+    foreach (mat_src ${MATERIAL_ES2_SRCS})
+        get_filename_component(localname "${mat_src}" NAME_WE)
+        get_filename_component(fullname "${mat_src}" ABSOLUTE)
+        set(output_path "${MATERIAL_DIR}/${localname}.filamat")
+
+        add_custom_command(
+                OUTPUT ${output_path}
+                COMMAND matc -a opengl -p ${MATC_TARGET} ${MATC_OPT_FLAGS} -o ${output_path} ${fullname}
+                MAIN_DEPENDENCY ${fullname}
+                DEPENDS matc
+                COMMENT "Compiling material ${mat_src} to ${output_path}"
+        )
+        list(APPEND MATERIAL_BINS ${output_path})
+    endforeach ()
+endif ()
+
 # Additional dependencies on included files for materials

 add_custom_command(
@@ -600,20 +555,13 @@ if (MSVC)
    set(FILAMENT_WARNINGS /W3)
 else()
    set(FILAMENT_WARNINGS
-            -Wall -Wextra -Wno-unused-parameter -Wno-missing-field-initializers
+            -Wall -Wextra -Wno-unused-parameter
            -Wextra-semi -Wnewline-eof -Wdeprecated -Wundef
            -Wgnu-conditional-omitted-operand
            -Wweak-vtables -Wnon-virtual-dtor -Wclass-varargs -Wimplicit-fallthrough
            -Wover-aligned
            -Werror
    )
-    if (CMAKE_CXX_STANDARD EQUAL 20)
-        # The lambdas for passes in PostProcessManager.cpp capture this
-        # implicitly in a way that's deprecated in c++20, but can't easily be
-        # fixed in a way that's backwards compatible with c++17:
-        # https://www.nextptr.com/tutorial/ta1430524603/capture-this-in-lambda-expression-timeline-of-change
-        list(APPEND FILAMENT_WARNINGS -Wno-deprecated-this-capture)
-    endif()
 endif()

 target_compile_options(${TARGET} PRIVATE
--- a/filament/README.md
+++ b/filament/README.md
@@ -61,7 +61,7 @@ with the platform name, for example, `filament-20181009-linux.tgz`.

 Create a file, `main.cpp`, in the same directory with the following contents:

-```c++
+```
 #include <filament/FilamentAPI.h>
 #include <filament/Engine.h>

@@ -91,7 +91,7 @@ Copy your platform's Makefile below into a `Makefile` inside the same directory.

 ### Linux

-```make
+```
 FILAMENT_LIBS=-lfilament -lbackend -lbluegl -lbluevk -lfilabridge -lfilaflat -lutils -lgeometry -lsmol-v -lvkshaders -libl
 CC=clang++

@@ -109,7 +109,7 @@ clean:

 ### macOS

-```make
+```
 FILAMENT_LIBS=-lfilament -lbackend -lbluegl -lbluevk -lfilabridge -lfilaflat -lutils -lgeometry -lsmol-v -lvkshaders -libl
 FRAMEWORKS=-framework Cocoa -framework Metal -framework CoreVideo
 CC=clang++
@@ -137,7 +137,7 @@ be sure to also include `matdbg.lib` in `FILAMENT_LIBS`.
 When building Filament from source, the `USE_STATIC_CRT` CMake option can be
 used to change the run-time library version.

-```make
+```
 FILAMENT_LIBS=filament.lib backend.lib bluegl.lib bluevk.lib filabridge.lib filaflat.lib \
              utils.lib geometry.lib smol-v.lib ibl.lib vkshaders.lib
 CC=cl.exe
@@ -171,12 +171,12 @@ and invoke `nmake` instead of `make`.

 ### Generating C++ documentation

-To generate the documentation you must first install `doxygen` and `graphviz`, then run the
+To generate the documentation you must first install `doxygen` and `graphviz`, then run the 
 following commands:

-```shell
-cd filament/filament
-doxygen docs/doxygen/filament.doxygen
+```
+$ cd filament/filament
+$ doxygen docs/doxygen/filament.doxygen
 ```

 Finally simply open `docs/html/index.html` in your web browser.
--- a/Show More
+++ b/Show More