Add FILAMENT_DEBUG_COMMANDS_HISTOGRAM compile flag

.github/actions/get-commit-msg/action.yml

@@ -27,24 +27,17 @@ runs:
         echo "$HASH" > /tmp/commit_hash.txt
     - name: Find commit message (PR)
       shell: bash
+      id: checkout_code
       if: github.event_name == 'pull_request'
       run: |
-        PR_NUMBER="${{ github.event.pull_request.number }}"
-        # Fetch the head of the PR explicitly to handle forks. Depth 50 ensures we can traverse past recent merge commits.
-        git fetch --depth=50 origin "pull/$PR_NUMBER/head:pr-head"
-
-        COMMIT_HASH=$(git log -1 --no-merges pr-head --format=%H)
-        AUTHOR_NAME=$(git log -1 --no-merges pr-head --format=%an)
-        AUTHOR_EMAIL=$(git log -1 --no-merges pr-head --format=%ae)
-        TSTAMP=$(git log -1 --no-merges pr-head --format=%aI)
-        COMMIT_MESSAGE=$(git log -1 --no-merges pr-head --format=%B)
-
-        echo "commit $COMMIT_HASH" > /tmp/commit_msg.txt
-        echo "Author: ${AUTHOR_NAME}<${AUTHOR_EMAIL}>" >> /tmp/commit_msg.txt
-        echo "Date: ${TSTAMP}" >> /tmp/commit_msg.txt
-        echo "" >> /tmp/commit_msg.txt
-        echo "$COMMIT_MESSAGE" >> /tmp/commit_msg.txt
-        echo "$COMMIT_HASH" > /tmp/commit_hash.txt
+        BEFORE_HASH=$(git rev-parse HEAD)
+        echo "hash=$BEFORE_HASH" >> "$GITHUB_OUTPUT"
+        # Next we will checkout the actual head (not the merge commits) of the PR
+        AFTER_HASH="${{ github.event.pull_request.head.sha }}"
+        git checkout $AFTER_HASH
+        COMMIT_MESSAGE=$(git log -1 --no-merges)
+        echo "$COMMIT_MESSAGE" > /tmp/commit_msg.txt
+        echo "$AFTER_HASH" > /tmp/commit_hash.txt
     - shell: bash
       id: action_output
       run: |
@@ -54,4 +47,9 @@ runs:
         cat /tmp/commit_msg.txt >> "$GITHUB_OUTPUT"
         echo "$DELIMITER" >> "$GITHUB_OUTPUT"
         # Get the commit hash
-        echo "hash=$(cat /tmp/commit_hash.txt)" >> "$GITHUB_OUTPUT"
+        echo "hash=$(cat /tmp/commit_hash.txt)" >> "$GITHUB_OUTPUT"
+    - name: Cleanup Find commit message (PR)
+      shell: bash
+      if: github.event_name == 'pull_request'
+      run: |
+        git checkout ${{ steps.checkout_code.outputs.hash }}

.github/actions/renderdiff-generate/action.yml

@@ -1,26 +0,0 @@
-name: 'Renderdiff Generate'
-description: 'Sets up prerequisites and runs the generate script for renderdiff'
-runs:
-  using: "composite"
-  steps:
-    - uses: ./.github/actions/mac-prereq
-    - uses: ./.github/actions/get-gltf-assets
-    - uses: ./.github/actions/get-mesa
-    - uses: ./.github/actions/get-vulkan-sdk
-    - name: Prerequisites
-      run: |
-        # Must have at least clang-16 for a webgpu/dawn build.
-        sudo xcode-select -s /Applications/Xcode_16.2.app/Contents/Developer
-      shell: bash
-    - name: Generate images
-      run: |
-        TEST_DIR=test/renderdiff
-        source ${TEST_DIR}/src/preamble.sh
-        set -eux
-        bash ${TEST_DIR}/generate.sh
-        set +eux
-      shell: bash
-    - name: Build diffimg tool
-      run: |
-        ./build.sh release diffimg
-      shell: bash

.github/actions/verify-release-notes/Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.12.13
+FROM python:3.10.4
 
 RUN pip3 install pygithub==1.55
 

.github/workflows/postsubmit-main.yml

@@ -10,27 +10,16 @@ jobs:
   # a branch on filament-assets.
   update-renderdiff-goldens:
     name: update-renderdiff-goldens
-    runs-on: 'macos-14'
+    runs-on: 'ubuntu-24.04-4core'
     steps:
       - uses: actions/checkout@v4.1.6
         with:
           fetch-depth: 0
+      - uses: ./.github/actions/linux-prereq
       - id: get_commit_msg
         uses: ./.github/actions/get-commit-msg
-      - name: Check if accepting new goldens
-        id: check_accept
-        env:
-          COMMIT_MESSAGE: ${{ steps.get_commit_msg.outputs.msg }}
-        run: |
-          if echo "${COMMIT_MESSAGE}" | python3 test/renderdiff/src/commit_msg.py --mode=accept_new_goldens; then
-            echo "accept=true" >> "$GITHUB_OUTPUT"
-          else
-            echo "accept=false" >> "$GITHUB_OUTPUT"
-          fi
-        shell: bash
-      - name: Renderdiff Generate for new goldens
-        if: steps.check_accept.outputs.accept == 'true'
-        uses: ./.github/actions/renderdiff-generate
+      - name: Build diffimg
+        run: ./build.sh release diffimg
       - name: Run update script
         env:
           GH_TOKEN: ${{ secrets.FILAMENTBOT_TOKEN }}
@@ -38,24 +27,10 @@ jobs:
         run: |
           GOLDEN_BRANCH=$(echo "${COMMIT_MESSAGE}" | python3 test/renderdiff/src/commit_msg.py)
           COMMIT_HASH="${{ steps.get_commit_msg.outputs.hash }}"
-
-          git config --global user.email "filament.bot@gmail.com"
-          git config --global user.name "Filament Bot"
-          git config --global credential.helper cache
-
-          if [[ "${{ steps.check_accept.outputs.accept }}" == "true" ]]; then
-              SHORT_HASH="${COMMIT_HASH:0:8}"
-              GOLDEN_BRANCH="accept-goldens-${SHORT_HASH}"
-              echo "Generating new goldens for branch ${GOLDEN_BRANCH}"
-              python3 test/renderdiff/src/update_golden.py \
-                  --branch=${GOLDEN_BRANCH} \
-                  --source=$(pwd)/out/renderdiff/renders \
-                  --commit-msg="Auto-update goldens from ${COMMIT_HASH}" \
-                  --push-to-remote \
-                  --golden-repo-token=${GH_TOKEN}
-          fi
-
           if [[ "${GOLDEN_BRANCH}" != "main" ]]; then
+              git config --global user.email "filament.bot@gmail.com"
+              git config --global user.name "Filament Bot"
+              git config --global credential.helper cache
               echo "branch==${GOLDEN_BRANCH}"
               echo "hash==${COMMIT_HASH}"
               python3 test/renderdiff/src/update_golden.py --branch=${GOLDEN_BRANCH} \
@@ -90,7 +65,7 @@ jobs:
   # filament-assets
   update-sizeguard:
     name: update-sizeguard
-    runs-on: 'ubuntu-24.04-4core'
+    runs-on: 'ubuntu-24.04-16core'
     steps:
       - uses: actions/checkout@v4.1.6
         with:

.github/workflows/postsubmit.yml

@@ -12,7 +12,7 @@ jobs:
     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-24.04-4core'
+    runs-on: 'ubuntu-24.04-16core'
 
     steps:
       - uses: actions/checkout@v4.1.6
@@ -26,7 +26,7 @@ jobs:
 
   build-ios:
     name: build-ios
-    runs-on: 'macos-14'
+    runs-on: macos-14-xlarge
 
     steps:
       - uses: actions/checkout@v4.1.6
@@ -46,7 +46,7 @@ jobs:
 
   build-linux:
     name: build-linux
-    runs-on: 'ubuntu-24.04-4core'
+    runs-on: 'ubuntu-24.04-16core'
 
     steps:
       - uses: actions/checkout@v4.1.6
@@ -63,7 +63,7 @@ jobs:
 
   build-mac:
     name: build-mac
-    runs-on: 'macos-14'
+    runs-on: macos-14-xlarge
 
     steps:
       - uses: actions/checkout@v4.1.6
@@ -77,10 +77,13 @@ jobs:
         with:
           name: filament-mac
           path: out/filament-release-darwin.tgz
+      - name: Check public headers
+        run: |
+          test/check-headers/test.sh out/release/filament/include
 
   build-web:
     name: build-web
-    runs-on: 'ubuntu-24.04'
+    runs-on: 'ubuntu-24.04-16core'
 
     steps:
       - uses: actions/checkout@v4.1.6
@@ -98,7 +101,7 @@ jobs:
 
   build-windows:
     name: build-windows
-    runs-on: 'windows-2022'
+    runs-on: windows-2022-32core
 
     steps:
       - uses: actions/checkout@v4.1.6

.github/workflows/presubmit.yml

@@ -8,54 +8,10 @@ on:
     branches:
       - main
 
-# This will cancel in-flight runs when there is an update to a PR
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
-# The conditional 'if' on each job is meant to skip presubmit jobs when a commit is pushed to main
-# and that commit is cryptographically "verified". Typically, a verified commit (like a GitHub UI
-# squash-and-merge) has already passed through presubmit during the Pull Request phase.
-# The conditional explicitly checks:
-# 1. always() && !cancelled(): Ensures the job runs even if 'check-verification' is skipped, but
-#    aborts if the workflow was manually cancelled.
-# 2. github.event_name == 'pull_request': Presubmits should always run normally on PRs.
-# 3. github.event_name == 'push' && ...: If it's a push to main, it only runs if the
-#    'check-verification' job confirmed the commit is NOT verified.
-
 jobs:
-  check-verification:
-    if: github.event_name == 'push'
-    runs-on: ubuntu-latest
-    outputs:
-      verified: ${{ steps.check.outputs.verified }}
-    steps:
-      - name: Check commit verification
-        id: check
-        uses: actions/github-script@v7
-        with:
-          script: |
-            const { data } = await github.rest.repos.getCommit({
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              ref: context.sha
-            });
-            core.setOutput('verified', data.commit.verification.verified);
-
   build-desktop-mac:
     name: build-mac
-    runs-on: 'macos-14-xlarge'
-    needs: [check-verification]
-    if: >
-      always() && !cancelled() &&
-      (
-        github.event_name == 'pull_request' ||
-        (
-          github.event_name == 'push' &&
-          needs.check-verification.result == 'success' &&
-          needs.check-verification.outputs.verified == 'false'
-        )
-      )
+    runs-on: macos-14-xlarge
     steps:
       - uses: actions/checkout@v4.1.6
         with:
@@ -64,30 +20,13 @@ jobs:
       - name: Run build script
         run: |
           cd build/mac && printf "y" | ./build.sh presubmit-with-test
-      - name: Test - material parser
+      - name: Test material parser
         run: |
           out/cmake-release/filament/test/test_material_parser
-      - name: Test - public headers
-        run: |
-          # out/cmake-release should have the artifacts ready for installation. Here we install it
-          #   to test the public headers
-          ninja -C out/cmake-release install
-          test/check-headers/test.sh out/release/filament/include
 
   build-desktop-linux:
     name: build-linux
-    runs-on: 'ubuntu-24.04-4core'
-    needs: [check-verification]
-    if: >
-      always() && !cancelled() &&
-      (
-        github.event_name == 'pull_request' ||
-        (
-          github.event_name == 'push' &&
-          needs.check-verification.result == 'success' &&
-          needs.check-verification.outputs.verified == 'false'
-        )
-      )
+    runs-on: 'ubuntu-24.04-16core'
     steps:
       - uses: actions/checkout@v4.1.6
         with:
@@ -102,18 +41,7 @@ jobs:
 
   build-windows:
     name: build-windows
-    runs-on: 'windows-2022'
-    needs: [check-verification]
-    if: >
-      always() && !cancelled() &&
-      (
-        github.event_name == 'pull_request' ||
-        (
-          github.event_name == 'push' &&
-          needs.check-verification.result == 'success' &&
-          needs.check-verification.outputs.verified == 'false'
-        )
-      )
+    runs-on: windows-2022-32core
     steps:
       - uses: actions/checkout@v4.1.6
         with:
@@ -125,18 +53,7 @@ jobs:
 
   build-android:
     name: build-android
-    runs-on: 'ubuntu-24.04-4core'
-    needs: [check-verification]
-    if: >
-      always() && !cancelled() &&
-      (
-        github.event_name == 'pull_request' ||
-        (
-          github.event_name == 'push' &&
-          needs.check-verification.result == 'success' &&
-          needs.check-verification.outputs.verified == 'false'
-        )
-      )
+    runs-on: 'ubuntu-24.04-16core'
     steps:
       - uses: actions/checkout@v4.1.6
         with:
@@ -163,18 +80,7 @@ jobs:
 
   build-ios:
     name: build-iOS
-    runs-on: 'macos-14-xlarge'
-    needs: [check-verification]
-    if: >
-      always() && !cancelled() &&
-      (
-        github.event_name == 'pull_request' ||
-        (
-          github.event_name == 'push' &&
-          needs.check-verification.result == 'success' &&
-          needs.check-verification.outputs.verified == 'false'
-        )
-      )
+    runs-on: macos-14-xlarge
     steps:
       - uses: actions/checkout@v4.1.6
         with:
@@ -189,18 +95,7 @@ jobs:
 
   build-web:
     name: build-web
-    runs-on: 'ubuntu-24.04-4core'
-    needs: [check-verification]
-    if: >
-      always() && !cancelled() &&
-      (
-        github.event_name == 'pull_request' ||
-        (
-          github.event_name == 'push' &&
-          needs.check-verification.result == 'success' &&
-          needs.check-verification.outputs.verified == 'false'
-        )
-      )
+    runs-on: 'ubuntu-24.04-16core'
     steps:
       - uses: actions/checkout@v4.1.6
         with:
@@ -213,18 +108,7 @@ jobs:
 
   validate-docs:
     name: validate-docs
-    runs-on: 'ubuntu-24.04'
-    needs: [check-verification]
-    if: >
-      always() && !cancelled() &&
-      (
-        github.event_name == 'pull_request' ||
-        (
-          github.event_name == 'push' &&
-          needs.check-verification.result == 'success' &&
-          needs.check-verification.outputs.verified == 'false'
-        )
-      )
+    runs-on: 'ubuntu-24.04-4core'
     steps:
       - uses: actions/checkout@v4.1.6
         with:
@@ -237,40 +121,23 @@ jobs:
 
   test-renderdiff:
     name: test-renderdiff
-    runs-on: 'macos-14-xlarge'
-    needs: [check-verification]
-    if: >
-      always() && !cancelled() &&
-      (
-        github.event_name == 'pull_request' ||
-        (
-          github.event_name == 'push' &&
-          needs.check-verification.result == 'success' &&
-          needs.check-verification.outputs.verified == 'false'
-        )
-      )
+    runs-on: macos-14-xlarge
     steps:
       - uses: actions/checkout@v4.1.6
         with:
           fetch-depth: 0
+      - uses: ./.github/actions/mac-prereq
+      - uses: ./.github/actions/get-gltf-assets
+      - uses: ./.github/actions/get-mesa
+      - uses: ./.github/actions/get-vulkan-sdk
       - id: get_commit_msg
         uses: ./.github/actions/get-commit-msg
-      - name: Check if accepting new goldens
-        id: check_accept
-        env:
-          COMMIT_MESSAGE: ${{ steps.get_commit_msg.outputs.msg }}
+      - name: Prerequisites
         run: |
-          if echo "${COMMIT_MESSAGE}" | python3 test/renderdiff/src/commit_msg.py --mode=accept_new_goldens; then
-            echo "accept=true" >> "$GITHUB_OUTPUT"
-          else
-            echo "accept=false" >> "$GITHUB_OUTPUT"
-          fi
+          # Must have at least clang-16 for a webgpu/dawn build.
+          sudo xcode-select -s /Applications/Xcode_16.2.app/Contents/Developer
         shell: bash
-      - name: Renderdiff Generate
-        if: steps.check_accept.outputs.accept != 'true'
-        uses: ./.github/actions/renderdiff-generate
       - name: Render and compare
-        if: steps.check_accept.outputs.accept != 'true'
         id: render_compare
         env:
           COMMIT_MESSAGE: ${{ steps.get_commit_msg.outputs.msg }}
@@ -279,6 +146,9 @@ jobs:
           source ${TEST_DIR}/src/preamble.sh
           set -eux
           GOLDEN_BRANCH=$(echo "${COMMIT_MESSAGE}" | python3 ${TEST_DIR}/src/commit_msg.py)
+          bash ${TEST_DIR}/generate.sh
+          # Build diffimg tool
+          ./build.sh release diffimg
 
           python3 ${TEST_DIR}/src/golden_manager.py \
                   --branch=${GOLDEN_BRANCH} \
@@ -302,12 +172,10 @@ jobs:
           fi
         shell: bash
       - uses: actions/upload-artifact@v4
-        if: steps.check_accept.outputs.accept != 'true'
         with:
           name: presubmit-renderdiff-result
           path: ./out/renderdiff
       - name: Compare result
-        if: steps.check_accept.outputs.accept != 'true'
         run: |
           ERROR_STR="${{ steps.render_compare.outputs.err }}"
           if [ -n "${ERROR_STR}" ]; then
@@ -317,18 +185,7 @@ jobs:
 
   validate-wgsl-webgpu:
     name: validate-wgsl-webgpu
-    runs-on: 'ubuntu-24.04-4core'
-    needs: [check-verification]
-    if: >
-      always() && !cancelled() &&
-      (
-        github.event_name == 'pull_request' ||
-        (
-          github.event_name == 'push' &&
-          needs.check-verification.result == 'success' &&
-          needs.check-verification.outputs.verified == 'false'
-        )
-      )
+    runs-on: 'ubuntu-24.04-16core'
     steps:
       - uses: actions/checkout@v4.1.6
         with:
@@ -342,17 +199,6 @@ jobs:
   test-code-correctness:
     name: test-code-correctness
     runs-on: 'macos-14-xlarge'
-    needs: [check-verification]
-    if: >
-      always() && !cancelled() &&
-      (
-        github.event_name == 'pull_request' ||
-        (
-          github.event_name == 'push' &&
-          needs.check-verification.result == 'success' &&
-          needs.check-verification.outputs.verified == 'false'
-        )
-      )
     steps:
       - uses: actions/checkout@v4.1.6
         with:
@@ -373,18 +219,7 @@ jobs:
 
   test-backend:
     name: test-backend
-    runs-on: 'macos-14-xlarge'
-    needs: [check-verification]
-    if: >
-      always() && !cancelled() &&
-      (
-        github.event_name == 'pull_request' ||
-        (
-          github.event_name == 'push' &&
-          needs.check-verification.result == 'success' &&
-          needs.check-verification.outputs.verified == 'false'
-        )
-      )
+    runs-on: macos-14-xlarge
     steps:
       - uses: actions/checkout@v4.1.6
         with:

.github/workflows/release.yml

@@ -188,54 +188,6 @@ jobs:
             const globber = await glob.create(['out/*.aar', 'out/*.apk', 'out/*.tgz'].join('\n'));
             await upload({ github, context }, await globber.glob(), TAG);
 
-  sonatype-publish:
-    name: sonatype-publish
-    runs-on: 'ubuntu-24.04-16core'
-    # Depends on the the Android build for the Android binaries.
-    # Depends on the Mac, Linux, and Windows builds for host tools.
-    needs: [build-mac, build-linux, build-windows, build-android]
-    if: github.event_name == 'release' || github.event.inputs.platform == 'android'
-
-    steps:
-      - name: Decide Git ref
-        id: git_ref
-        run: |
-          REF=${RELEASE_TAG:-${GITHUB_REF}}
-          TAG=${REF##*/}
-          echo "ref=${REF}" >> $GITHUB_OUTPUT
-          echo "tag=${TAG}" >> $GITHUB_OUTPUT
-      - uses: actions/checkout@v4.1.6
-        with:
-          ref: ${{ steps.git_ref.outputs.ref }}
-      - uses: actions/setup-java@v3
-        with:
-          distribution: 'temurin'
-          java-version: '17'
-      - uses: ./.github/actions/linux-prereq
-      - name: Download Android Release
-        run: |
-          gh release download ${TAG} \
-            --repo ${{ github.repository }} \
-            --pattern 'filament-*-android-native.tgz'
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          TAG: ${{ steps.git_ref.outputs.tag }}
-      - name: Unzip Android Release
-        run: |
-          mkdir -p out/android-release
-          tar -xzvf filament-${TAG}-android-native.tgz -C out/android-release/
-        env:
-          TAG: ${{ steps.git_ref.outputs.tag }}
-      - name: Publish To Sonatype
-        run: |
-          cd android
-          ./gradlew publishToSonatype closeSonatypeStagingRepository
-        env:
-          ORG_GRADLE_PROJECT_sonatypeUsername: ${{ secrets.SONATYPE_USERNAME }}
-          ORG_GRADLE_PROJECT_sonatypePassword: ${{ secrets.SONATYPE_PASSWORD }}
-          ORG_GRADLE_PROJECT_signingKey: ${{ secrets.MAVEN_SIGNING_KEY }}
-          ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.MAVEN_SIGNING_PASSWORD }}
-
   build-ios:
     name: build-ios
     runs-on: macos-14-xlarge

.github/workflows/verify-release-notes.yml

@@ -11,11 +11,14 @@ jobs:
     name: Verify Release Notes
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v6
+      # We *only* need to check out the .github/ directory.
+      # The verify RELEASE_NOTES script uses the GitHub API to verify that RELEASE_NOTES was
+      # modified.
+      - name: Check out action
+        uses: Bhacaz/checkout-files@73e17cfbe8d7e0c6b2672b20cb05a718e20d18d4
         with:
-          fetch-depth: 0
-          sparse-checkout: |
-            .github
+          files: .github
+          token: ${{ secrets.GITHUB_TOKEN }}
       - name: Verify release notes
         uses: ./.github/actions/verify-release-notes
         with:

CMakeLists.txt

@@ -326,13 +326,11 @@ endif()
 if (FILAMENT_ENABLE_LTO)
     include(CheckIPOSupported)
 
-    check_ipo_supported(RESULT IPO_SUPPORT OUTPUT IPO_ERROR)
+    check_ipo_supported(RESULT IPO_SUPPORT)
 
     if (IPO_SUPPORT)
-        message(STATUS "IPO / LTO is enabled")
+        message(STATUS "LTO support is enabled")
         set(CMAKE_INTERPROCEDURAL_OPTIMIZATION TRUE)
-    else()
-        message(WARNING "IPO / LTO is not supported by this architecture: ${IPO_ERROR}")
     endif()
 endif()
 
@@ -869,12 +867,6 @@ endfunction()
 # Sub-projects
 # ==================================================================================================
 
-include(CheckSymbolExists)
-check_symbol_exists(getopt_long "getopt.h" HAS_SYSTEM_GETOPT)
-if (NOT HAS_SYSTEM_GETOPT)
-    add_subdirectory(${EXTERNAL}/getopt)
-endif()
-
 # Common to all platforms
 add_subdirectory(${EXTERNAL}/libgtest/tnt)
 add_subdirectory(${LIBRARIES}/camutils)
@@ -910,6 +902,7 @@ add_subdirectory(${EXTERNAL}/cgltf/tnt)
 add_subdirectory(${EXTERNAL}/draco/tnt)
 add_subdirectory(${EXTERNAL}/jsmn/tnt)
 add_subdirectory(${EXTERNAL}/stb/tnt)
+add_subdirectory(${EXTERNAL}/getopt)
 add_subdirectory(${EXTERNAL}/perfetto/tnt)
 add_subdirectory(${EXTERNAL}/basisu/tnt)
 

NEW_RELEASE_NOTES.md

@@ -6,3 +6,5 @@
 appropriate header in [RELEASE_NOTES.md](./RELEASE_NOTES.md).
 
 ## Release notes for next branch cut
+
+- engine: fix crash when using variance shadow maps

README.md

@@ -31,7 +31,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'com.google.android.filament:filament-android:1.70.0'
+    implementation 'com.google.android.filament:filament-android:1.69.3'
 }
 ```
 
@@ -50,7 +50,7 @@ Here are all the libraries available in the group `com.google.android.filament`:
 iOS projects can use CocoaPods to install the latest release:
 
 ```shell
-pod 'Filament', '~> 1.70.0'
+pod 'Filament', '~> 1.69.3'
 ```
 
 ## Documentation

RELEASE_NOTES.md

@@ -7,18 +7,6 @@ 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.70.1
-
-
-## v1.70.0
-
-- engine: fix crash when using variance shadow maps
-- materials: better shadow normal-bias calculations [⚠️ **New Material Version**]
-
-## v1.69.5
-
-- engine: fix crash when using variance shadow maps
-
 ## v1.69.4
 
 

android/build.gradle

@@ -40,21 +40,15 @@
 //   - Build and upload artifacts with ./gradlew publish
 //   - Close and release staging repo on Nexus with ./gradlew closeAndReleaseStagingRepository
 //
-// The following properties need to be set (either in ~/gradle/gradle.properties, on the command
-// line, or as environment variables, e.g.: ORG_GRADLE_PROJECT_property=value):
+// The following is needed in ~/gradle/gradle.properties:
 //
 //     sonatypeUsername=nexus_user
 //     sonatypePassword=nexus_password
 //
-//     To sign with a key ring file:
 //     signing.keyId=pgp_key_id
 //     signing.password=pgp_key_password
 //     signing.secretKeyRingFile=/Users/user/.gnupg/maven_signing.key
 //
-//     To sign with in-memory keys (useful for CI):,
-//     signingKey=ASCII armored key (begins with -----BEGIN PGP PRIVATE KEY BLOCK-----)
-//     signingPassword=key password
-//
 
 buildscript {
     def path = providers
@@ -200,7 +194,7 @@ subprojects {
         google()
     }
 
-    if (!name.startsWith("sample") && name != "filament-tools" && name != "gradle-plugin") {
+    if (!name.startsWith("sample") && name != "filament-tools") {
         apply plugin: 'com.android.library'
 
         android {

android/buildSrc/README.md

@@ -25,7 +25,7 @@ configured, the corresponding task will be disabled.
 
 ```groovy
 plugins {
-    id 'com.google.android.filament-tools'
+    id 'filament-plugin'
 }
 
 filament {

android/buildSrc/build.gradle

@@ -0,0 +1,21 @@
+plugins {
+    id 'groovy-gradle-plugin'
+}
+
+gradlePlugin {
+    plugins {
+        create("filament-plugin") {
+            id = "filament-plugin"
+            implementationClass = "com.google.android.filament.gradle.FilamentPlugin"
+        }
+    }
+}
+
+repositories {
+    mavenCentral()
+    gradlePluginPortal()
+}
+
+dependencies {
+    implementation "com.google.gradle:osdetector-gradle-plugin:1.7.3"
+}

android/buildSrc/src/main/groovy/com/google/android/filament/gradle/ToolsLocator.groovy

@@ -60,10 +60,9 @@ class ToolsLocator {
         def classifier =
                 project.extensions.getByType(com.google.gradle.osdetector.OsDetector).classifier
 
-        // If com.google.android.filament.tools-dir is set to a non-empty string, we'll use it as
-        // the tool's base path.
+        // If com.google.android.filament.tools-dir is set, we'll use it as the tool's base path.
         def toolsDirProp = project.providers.gradleProperty("com.google.android.filament.tools-dir")
-        if (toolsDirProp.isPresent() && !toolsDirProp.get().trim().isEmpty()) {
+        if (toolsDirProp.isPresent()) {
             def toolsDir = toolsDirProp.get()
             def path = OperatingSystem.current().isWindows() ?
                 "${toolsDir}/bin/${name}.exe" :

android/filament-android/src/main/java/com/google/android/filament/View.java

@@ -2121,7 +2121,7 @@ public class View {
          */
         public boolean highPrecision = false;
         /**
-         * @deprecated has no effect.
+         * VSM minimum variance scale, must be positive.
          */
         public float minVarianceScale = 0.5f;
         /**

android/filament-utils-android/src/main/cpp/ImageDiff.cpp

@@ -20,6 +20,8 @@
 #include <imagediff/ImageDiff.h>
 #include <utils/Log.h>
 
+#include <vector>
+
 using namespace imagediff;
 using namespace utils;
 
@@ -100,48 +102,30 @@ jobject createResult(JNIEnv* env, ImageDiffResult const& result, bool generateDi
 
     if (generateDiff && result.diffImage.getWidth() > 0) {
         jclass bitmapClass = env->FindClass("android/graphics/Bitmap");
-        jmethodID createBitmap = env->GetStaticMethodID(bitmapClass, "createBitmap",
+        jmethodID createBitmap = env->GetStaticMethodID(bitmapClass, "createBitmap", 
             "(IILandroid/graphics/Bitmap$Config;)Landroid/graphics/Bitmap;");
-
+        
         jclass configClass = env->FindClass("android/graphics/Bitmap$Config");
         jfieldID argb8888 = env->GetStaticFieldID(configClass, "ARGB_8888", "Landroid/graphics/Bitmap$Config;");
         jobject configObj = env->GetStaticObjectField(configClass, argb8888);
 
         uint32_t width = result.diffImage.getWidth();
         uint32_t height = result.diffImage.getHeight();
-        jobject diffBitmap = env->CallStaticObjectMethod(bitmapClass, createBitmap, (jint) width,
-                (jint) height, configObj);
-
+        jobject diffBitmap = env->CallStaticObjectMethod(bitmapClass, createBitmap, (jint)width, (jint)height, configObj);
+        
         if (diffBitmap) {
-            // We need to transport the bit differences accurately to the java side, so set
-            // premultiplied to false.  From the java-side, if the bitmap is used to draw to a
-            // canvas, then client needs to set premultiplied to true again.
-            jmethodID setPremultiplied = env->GetMethodID(bitmapClass, "setPremultiplied", "(Z)V");
-            if (setPremultiplied) {
-                env->CallVoidMethod(diffBitmap, setPremultiplied, JNI_FALSE);
-            }
-
             void* diffPixels;
             if (AndroidBitmap_lockPixels(env, diffBitmap, &diffPixels) == 0) {
-                AndroidBitmapInfo info;
-                AndroidBitmap_getInfo(env, diffBitmap, &info);
-
                 float const* src = result.diffImage.getPixelRef();
                 uint8_t* dst = (uint8_t*) diffPixels;
-                uint32_t const channels = result.diffImage.getChannels(); // usually 4
-
-                for (size_t y = 0; y < height; ++y) {
-                    uint8_t* row = dst + y * info.stride;
-                    for (size_t x = 0; x < width; ++x) {
-                        size_t srcIdx = (y * width + x) * channels;
-                        for (int c = 0; c < 4; ++c) {
-                            float v = 0.0f;
-                            if (c < channels) v = src[srcIdx + c];
-                            if (c == 3 && channels < 4) v = 1.0f; // Alpha 1.0 if missing
-
-                            row[x * 4 + c] = uint8_t(
-                                    std::min(255.0f, std::max(0.0f, std::round(v * 255.0f))));
-                        }
+                uint32_t channels = result.diffImage.getChannels(); // usually 4
+                
+                for (size_t i = 0; i < width * height; ++i) {
+                    for (int c = 0; c < 4; ++c) {
+                        float v = 0.0f;
+                        if (c < channels) v = src[i * channels + c];
+                        if (c == 3 && channels < 4) v = 1.0f; // Alpha 1.0 if missing
+                        dst[i * 4 + c] = (uint8_t) std::min(255.0f, std::max(0.0f, v * 255.0f));
                     }
                 }
                 AndroidBitmap_unlockPixels(env, diffBitmap);
@@ -149,7 +133,7 @@ jobject createResult(JNIEnv* env, ImageDiffResult const& result, bool generateDi
             }
         }
     }
-
+    
     return resultObj;
 }
 
@@ -163,7 +147,7 @@ Java_com_google_android_filament_utils_ImageDiff_nCompareBasic(JNIEnv* env, jcla
     BitmapLock maskArg(env, maskBitmap);
 
     if (!refArg.isValid() || !candArg.isValid()) {
-         ImageDiffResult emptyResult;
+         ImageDiffResult emptyResult; 
          emptyResult.status = ImageDiffResult::Status::SIZE_MISMATCH; // or ERROR
          return createResult(env, emptyResult, false);
     }
@@ -191,13 +175,13 @@ Java_com_google_android_filament_utils_ImageDiff_nCompareBasic(JNIEnv* env, jcla
 extern "C" JNIEXPORT jobject JNICALL
 Java_com_google_android_filament_utils_ImageDiff_nCompareJson(JNIEnv* env, jclass,
         jobject refBitmap, jobject candBitmap, jstring jsonConfig, jobject maskBitmap) {
-
+        
     BitmapLock refArg(env, refBitmap);
     BitmapLock candArg(env, candBitmap);
     BitmapLock maskArg(env, maskBitmap);
 
     if (!refArg.isValid() || !candArg.isValid()) {
-         ImageDiffResult emptyResult;
+         ImageDiffResult emptyResult; 
          emptyResult.status = ImageDiffResult::Status::SIZE_MISMATCH; // or ERROR
          return createResult(env, emptyResult, false);
     }
@@ -205,7 +189,7 @@ Java_com_google_android_filament_utils_ImageDiff_nCompareJson(JNIEnv* env, jclas
     ImageDiffConfig config;
     const char* nativeJson = env->GetStringUTFChars(jsonConfig, 0);
     size_t length = env->GetStringUTFLength(jsonConfig);
-
+    
     bool parsed = parseConfig(nativeJson, length, &config);
     env->ReleaseStringUTFChars(jsonConfig, nativeJson);
 
@@ -230,3 +214,4 @@ Java_com_google_android_filament_utils_ImageDiff_nCompareJson(JNIEnv* env, jclas
 
     return createResult(env, result, generateDiff);
 }
+

android/filament-utils-android/src/main/java/com/google/android/filament/utils/ModelViewer.kt

@@ -106,8 +106,8 @@ class ModelViewer(
     var skyboxCubemap: Texture? = null
 
     private lateinit var displayHelper: DisplayHelper
-    private var cameraManipulator: Manipulator? = null
-    private var gestureDetector: GestureDetector? = null
+    private lateinit var cameraManipulator: Manipulator
+    private lateinit var gestureDetector: GestureDetector
     private var surfaceView: SurfaceView? = null
     private var textureView: TextureView? = null
 
@@ -157,13 +157,15 @@ class ModelViewer(
             surfaceView: SurfaceView,
             engine: Engine = Engine.create(),
             uiHelper: UiHelper = UiHelper(UiHelper.ContextErrorPolicy.DONT_CHECK),
-            manipulator: Manipulator? = defaultCameraManipulator(surfaceView.width, surfaceView.height)
+            manipulator: Manipulator? = null
     ) : this(engine, uiHelper) {
+        cameraManipulator = manipulator ?: Manipulator.Builder()
+                .targetPosition(kDefaultObjectPosition.x, kDefaultObjectPosition.y, kDefaultObjectPosition.z)
+                .viewport(surfaceView.width, surfaceView.height)
+                .build(Manipulator.Mode.ORBIT)
+
         this.surfaceView = surfaceView
-        cameraManipulator = manipulator
-        cameraManipulator?.let { c ->
-            gestureDetector = GestureDetector(surfaceView, c)
-        }
+        gestureDetector = GestureDetector(surfaceView, cameraManipulator)
         displayHelper = DisplayHelper(surfaceView.context)
         uiHelper.renderCallback = SurfaceCallback()
         uiHelper.attachTo(surfaceView)
@@ -175,14 +177,15 @@ class ModelViewer(
             textureView: TextureView,
             engine: Engine = Engine.create(),
             uiHelper: UiHelper = UiHelper(UiHelper.ContextErrorPolicy.DONT_CHECK),
-            manipulator: Manipulator? = defaultCameraManipulator(textureView.width, textureView.height)
+            manipulator: Manipulator? = null
     ) : this(engine, uiHelper) {
-        cameraManipulator = manipulator
+        cameraManipulator = manipulator ?: Manipulator.Builder()
+                .targetPosition(kDefaultObjectPosition.x, kDefaultObjectPosition.y, kDefaultObjectPosition.z)
+                .viewport(textureView.width, textureView.height)
+                .build(Manipulator.Mode.ORBIT)
+
         this.textureView = textureView
-        cameraManipulator = manipulator
-        cameraManipulator?.let { c ->
-            gestureDetector = GestureDetector(textureView, c)
-        }
+        gestureDetector = GestureDetector(textureView, cameraManipulator)
         displayHelper = DisplayHelper(textureView.context)
         uiHelper.renderCallback = SurfaceCallback()
         uiHelper.attachTo(textureView)
@@ -299,13 +302,11 @@ class ModelViewer(
         asset?.let { populateScene(it) }
 
         // Extract the camera basis from the helper and push it to the Filament camera.
-        cameraManipulator?.let { cm ->
-            cm.getLookAt(eyePos, target, upward)
-            camera.lookAt(
+        cameraManipulator.getLookAt(eyePos, target, upward)
+        camera.lookAt(
                 eyePos[0], eyePos[1], eyePos[2],
                 target[0], target[1], target[2],
                 upward[0], upward[1], upward[2])
-        }
 
         // Render the scene, unless the renderer wants to skip the frame.
         if (renderer.beginFrame(swapChain!!, frameTimeNanos)) {
@@ -397,7 +398,7 @@ class ModelViewer(
      * Handles a [MotionEvent] to enable one-finger orbit, two-finger pan, and pinch-to-zoom.
      */
     fun onTouchEvent(event: MotionEvent) {
-        gestureDetector?.onTouchEvent(event)
+        gestureDetector.onTouchEvent(event)
     }
 
     @SuppressWarnings("ClickableViewAccessibility")
@@ -450,7 +451,7 @@ class ModelViewer(
 
         override fun onResized(width: Int, height: Int) {
             view.viewport = Viewport(0, 0, width, height)
-            cameraManipulator?.setViewport(width, height)
+            cameraManipulator.setViewport(width, height)
             updateCameraProjection()
             synchronizePendingFrames(engine)
         }
@@ -467,11 +468,5 @@ class ModelViewer(
 
     companion object {
         private val kDefaultObjectPosition = Float3(0.0f, 0.0f, -4.0f)
-        private fun defaultCameraManipulator(width: Int, height: Int) : Manipulator {
-            return Manipulator.Builder()
-                .targetPosition(kDefaultObjectPosition.x, kDefaultObjectPosition.y, kDefaultObjectPosition.z)
-                .viewport(width, height)
-                .build(Manipulator.Mode.ORBIT)
-        }
     }
 }

android/gradle-plugin/build.gradle

@@ -1,31 +0,0 @@
-plugins {
-    id 'groovy-gradle-plugin'
-    id 'com.gradle.plugin-publish' version '2.1.0'
-}
-
-group = "com.google.android.filament"
-version = "0.1.0"
-
-gradlePlugin {
-    website = "https://github.com/google/filament/tree/main/android/gradle-plugin"
-    vcsUrl = "https://github.com/google/filament/tree/main/android/gradle-plugin"
-
-    plugins {
-        create("filament-tools") {
-            id = "com.google.android.filament-tools"
-            displayName = "Filament Tools Gradle Plugin"
-            description = "A plugin that helps integrate Filament into Android projects"
-            tags.addAll('android', 'graphics', 'rendering', 'filament', '3d', 'gltf', 'native')
-            implementationClass = "com.google.android.filament.gradle.FilamentPlugin"
-        }
-    }
-}
-
-repositories {
-    mavenCentral()
-    gradlePluginPortal()
-}
-
-dependencies {
-    implementation "com.google.gradle:osdetector-gradle-plugin:1.7.3"
-}

android/gradle.properties

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

android/gradle/gradle-mvn-push.gradle

@@ -94,13 +94,6 @@ afterEvaluate { project ->
     }
 
     signing {
-        def signingKey = findProperty("signingKey")
-        def signingPassword = findProperty("signingPassword")
-        if (signingKey && signingPassword) {
-            println("Signing with in-memory keys")
-            useInMemoryPgpKeys(signingKey, signingPassword)
-        }
-
         publishing.publications.all { publication ->
             sign publication
         }

android/samples/sample-gltf-viewer/build.gradle

@@ -1,7 +1,7 @@
 plugins {
     id 'com.android.application'
     id 'kotlin-android'
-    id 'com.google.android.filament-tools'
+    id 'filament-plugin'
 }
 
 project.ext.isSample = true

android/samples/sample-hello-camera/build.gradle

@@ -1,7 +1,7 @@
 plugins {
     id 'com.android.application'
     id 'kotlin-android'
-    id 'com.google.android.filament-tools'
+    id 'filament-plugin'
 }
 
 project.ext.isSample = true

android/samples/sample-hello-triangle/build.gradle

@@ -1,7 +1,7 @@
 plugins {
     id 'com.android.application'
     id 'kotlin-android'
-    id 'com.google.android.filament-tools'
+    id 'filament-plugin'
 }
 
 project.ext.isSample = true

android/samples/sample-image-based-lighting/build.gradle

@@ -1,7 +1,7 @@
 plugins {
     id 'com.android.application'
     id 'kotlin-android'
-    id 'com.google.android.filament-tools'
+    id 'filament-plugin'
 }
 
 project.ext.isSample = true

android/samples/sample-lit-cube/build.gradle

@@ -1,7 +1,7 @@
 plugins {
     id 'com.android.application'
     id 'kotlin-android'
-    id 'com.google.android.filament-tools'
+    id 'filament-plugin'
 }
 
 project.ext.isSample = true

android/samples/sample-material-builder/build.gradle

@@ -1,7 +1,7 @@
 plugins {
     id 'com.android.application'
     id 'kotlin-android'
-    id 'com.google.android.filament-tools'
+    id 'filament-plugin'
 }
 
 project.ext.isSample = true

android/samples/sample-material-instance-stress/build.gradle

@@ -1,7 +1,7 @@
 plugins {
     id 'com.android.application'
     id 'kotlin-android'
-    id 'com.google.android.filament-tools'
+    id 'filament-plugin'
 }
 
 project.ext.isSample = true

android/samples/sample-multi-view/build.gradle

@@ -1,7 +1,7 @@
 plugins {
     id 'com.android.application'
     id 'kotlin-android'
-    id 'com.google.android.filament-tools'
+    id 'filament-plugin'
 }
 
 project.ext.isSample = true

android/samples/sample-page-curl/build.gradle

@@ -1,7 +1,7 @@
 plugins {
     id 'com.android.application'
     id 'kotlin-android'
-    id 'com.google.android.filament-tools'
+    id 'filament-plugin'
 }
 
 project.ext.isSample = true

android/samples/sample-render-validation/build.gradle

@@ -1,7 +1,7 @@
 plugins {
     id 'com.android.application'
     id 'kotlin-android'
-    id 'com.google.android.filament-tools'
+    id 'filament-plugin'
 }
 
 project.ext.isSample = true
@@ -26,8 +26,7 @@ tasks.register('copyDamagedHelmetGltf', Copy) {
 preBuild.dependsOn copyDamagedHelmetGltf
 
 clean.doFirst {
-    delete "src/main/assets/envs"
-    delete "src/main/assets/models"
+    delete "src/main/assets"
 }
 
 android {
@@ -49,7 +48,6 @@ android {
 dependencies {
     implementation deps.kotlin
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
-    implementation 'com.google.android.material:material:1.10.0'
     implementation deps.coroutines.core
     implementation project(':filament-android')
     implementation project(':gltfio-android')

android/samples/sample-render-validation/src/main/AndroidManifest.xml

@@ -12,11 +12,10 @@
         android:supportsRtl="true"
         android:largeHeap="true"
         android:requestLegacyExternalStorage="true"
-        android:theme="@style/Theme.Material3.DayNight.NoActionBar">
+        android:theme="@android:style/Theme.NoTitleBar">
         <activity
             android:name=".MainActivity"
             android:exported="true"
-            android:launchMode="singleTop"
             android:configChanges="orientation|screenSize|screenLayout|keyboardHidden"
             android:screenOrientation="fullSensor">
             <intent-filter>

android/samples/sample-render-validation/src/main/assets/default_test.json

@@ -1,899 +0,0 @@
-{
-  "name": "Default Test",
-  "backends": [
-    "opengl"
-  ],
-  "models": {
-    "DamagedHelmet": "helmet.glb"
-  },
-  "presets": [
-    {
-      "name": "base",
-      "models": [
-        "DamagedHelmet"
-      ],
-      "rendering": {
-        "camera": {
-          "enabled": true,
-          "horizontalFov": 45.0,
-          "center": [
-            0,
-            0,
-            0
-          ],
-          "lookAt": [
-            0,
-            0,
-            -1
-          ]
-        },
-        "view": {
-          "postProcessingEnabled": true,
-          "dithering": "NONE"
-        },
-        "tolerance": {
-          "maxAbsDiff": 0.1,
-          "maxFailingPixelsFraction": 0.0
-        }
-      }
-    },
-    {
-      "name": "tilted",
-      "rendering": {
-        "camera": {
-          "enabled": true,
-          "horizontalFov": 45.0,
-          "center": [
-            -4,
-            -2,
-            -3
-          ],
-          "lookAt": [
-            0,
-            0,
-            -4
-          ]
-        }
-      }
-    }
-  ],
-  "tests": [
-    {
-      "name": "basic",
-      "apply_presets": [
-        "base"
-      ]
-    },
-    {
-      "name": "rotated",
-      "apply_presets": [
-        "base",
-        "tilted"
-      ]
-    },
-    {
-      "name": "ssao",
-      "apply_presets": [
-        "base"
-      ],
-      "rendering": {
-        "view.ssao.enabled": true
-      }
-    },
-    {
-      "name": "msaa",
-      "apply_presets": [
-        "base"
-      ],
-      "rendering": {
-        "view.msaa.enabled": true
-      }
-    },
-    {
-      "name": "bloom",
-      "apply_presets": [
-        "base",
-        "tilted"
-      ],
-      "rendering": {
-        "view.bloom.enabled": true
-      }
-    },
-    {
-      "name": "aa_none",
-      "apply_presets": [
-        "base"
-      ],
-      "rendering": {
-        "view.antiAliasing": "NONE"
-      }
-    },
-    {
-      "name": "aa_fxaa",
-      "apply_presets": [
-        "base"
-      ],
-      "rendering": {
-        "view.antiAliasing": "FXAA"
-      }
-    },
-    {
-      "name": "dithering_none",
-      "apply_presets": [
-        "base"
-      ],
-      "rendering": {
-        "view.dithering": "NONE"
-      }
-    },
-    {
-      "name": "msaa_8",
-      "apply_presets": [
-        "base"
-      ],
-      "rendering": {
-        "view.msaa.enabled": true,
-        "view.msaa.sampleCount": 8
-      }
-    },
-    {
-      "name": "taa_custom",
-      "apply_presets": [
-        "base"
-      ],
-      "rendering": {
-        "view.taa.enabled": true,
-        "view.taa.feedback": 0.2,
-        "view.taa.jitterPattern": "HALTON_23_X16"
-      }
-    },
-    {
-      "name": "ssao_gtao",
-      "apply_presets": [
-        "base"
-      ],
-      "rendering": {
-        "view.ssao.enabled": true,
-        "view.ssao.aoType": "GTAO"
-      }
-    },
-    {
-      "name": "ssao_sao",
-      "apply_presets": [
-        "base"
-      ],
-      "rendering": {
-        "view.ssao.enabled": true,
-        "view.ssao.aoType": "SAO"
-      }
-    },
-    {
-      "name": "ssao_radius_high",
-      "apply_presets": [
-        "base"
-      ],
-      "rendering": {
-        "view.ssao.enabled": true,
-        "view.ssao.radius": 1.0
-      }
-    },
-    {
-      "name": "ssao_radius_low",
-      "apply_presets": [
-        "base"
-      ],
-      "rendering": {
-        "view.ssao.enabled": true,
-        "view.ssao.radius": 0.1
-      }
-    },
-    {
-      "name": "ssao_power_high",
-      "apply_presets": [
-        "base"
-      ],
-      "rendering": {
-        "view.ssao.enabled": true,
-        "view.ssao.power": 2.0
-      }
-    },
-    {
-      "name": "ssao_power_low",
-      "apply_presets": [
-        "base"
-      ],
-      "rendering": {
-        "view.ssao.enabled": true,
-        "view.ssao.power": 0.5
-      }
-    },
-    {
-      "name": "ssao_bias_high",
-      "apply_presets": [
-        "base"
-      ],
-      "rendering": {
-        "view.ssao.enabled": true,
-        "view.ssao.bias": 0.05
-      }
-    },
-    {
-      "name": "ssao_resolution_half",
-      "apply_presets": [
-        "base"
-      ],
-      "rendering": {
-        "view.ssao.enabled": true,
-        "view.ssao.resolution": 0.5
-      }
-    },
-    {
-      "name": "ssao_resolution_full",
-      "apply_presets": [
-        "base"
-      ],
-      "rendering": {
-        "view.ssao.enabled": true,
-        "view.ssao.resolution": 1.0
-      }
-    },
-    {
-      "name": "ssao_intensity_high",
-      "apply_presets": [
-        "base"
-      ],
-      "rendering": {
-        "view.ssao.enabled": true,
-        "view.ssao.intensity": 2.0
-      }
-    },
-    {
-      "name": "ssao_bent_normals",
-      "apply_presets": [
-        "base"
-      ],
-      "rendering": {
-        "view.ssao.enabled": true,
-        "view.ssao.bentNormals": true
-      }
-    },
-    {
-      "name": "ssao_quality_ultra",
-      "apply_presets": [
-        "base"
-      ],
-      "rendering": {
-        "view.ssao.enabled": true,
-        "view.ssao.quality": "ULTRA"
-      }
-    },
-    {
-      "name": "ssao_quality_low",
-      "apply_presets": [
-        "base"
-      ],
-      "rendering": {
-        "view.ssao.enabled": true,
-        "view.ssao.quality": "LOW"
-      }
-    },
-    {
-      "name": "ssao_lowPassFilter_ultra",
-      "apply_presets": [
-        "base"
-      ],
-      "rendering": {
-        "view.ssao.enabled": true,
-        "view.ssao.lowPassFilter": "ULTRA"
-      }
-    },
-    {
-      "name": "ssao_upsampling_ultra",
-      "apply_presets": [
-        "base"
-      ],
-      "rendering": {
-        "view.ssao.enabled": true,
-        "view.ssao.upsampling": "ULTRA"
-      }
-    },
-    {
-      "name": "ssr_basic",
-      "apply_presets": [
-        "base"
-      ],
-      "rendering": {
-        "view.screenSpaceReflections.enabled": true
-      }
-    },
-    {
-      "name": "ssr_thickness_high",
-      "apply_presets": [
-        "base"
-      ],
-      "rendering": {
-        "view.screenSpaceReflections.enabled": true,
-        "view.screenSpaceReflections.thickness": 0.5
-      }
-    },
-    {
-      "name": "ssr_bias_high",
-      "apply_presets": [
-        "base"
-      ],
-      "rendering": {
-        "view.screenSpaceReflections.enabled": true,
-        "view.screenSpaceReflections.bias": 0.1
-      }
-    },
-    {
-      "name": "ssr_maxDistance_high",
-      "apply_presets": [
-        "base"
-      ],
-      "rendering": {
-        "view.screenSpaceReflections.enabled": true,
-        "view.screenSpaceReflections.maxDistance": 5.0
-      }
-    },
-    {
-      "name": "ssr_stride_high",
-      "apply_presets": [
-        "base"
-      ],
-      "rendering": {
-        "view.screenSpaceReflections.enabled": true,
-        "view.screenSpaceReflections.stride": 4.0
-      }
-    },
-    {
-      "name": "ssr_stride_low",
-      "apply_presets": [
-        "base"
-      ],
-      "rendering": {
-        "view.screenSpaceReflections.enabled": true,
-        "view.screenSpaceReflections.stride": 1.0
-      }
-    },
-    {
-      "name": "ssr_thickness_low",
-      "apply_presets": [
-        "base"
-      ],
-      "rendering": {
-        "view.screenSpaceReflections.enabled": true,
-        "view.screenSpaceReflections.thickness": 0.01
-      }
-    },
-    {
-      "name": "ssr_maxDistance_low",
-      "apply_presets": [
-        "base"
-      ],
-      "rendering": {
-        "view.screenSpaceReflections.enabled": true,
-        "view.screenSpaceReflections.maxDistance": 1.0
-      }
-    },
-    {
-      "name": "ssr_bias_low",
-      "apply_presets": [
-        "base"
-      ],
-      "rendering": {
-        "view.screenSpaceReflections.enabled": true,
-        "view.screenSpaceReflections.bias": 0.001
-      }
-    },
-    {
-      "name": "ssr_quality_combo",
-      "apply_presets": [
-        "base"
-      ],
-      "rendering": {
-        "view.screenSpaceReflections.enabled": true,
-        "view.screenSpaceReflections.thickness": 0.2,
-        "view.screenSpaceReflections.stride": 2.0
-      }
-    },
-    {
-      "name": "bloom_levels_high",
-      "apply_presets": [
-        "base"
-      ],
-      "rendering": {
-        "view.bloom.enabled": true,
-        "view.bloom.levels": 8
-      }
-    },
-    {
-      "name": "bloom_levels_low",
-      "apply_presets": [
-        "base"
-      ],
-      "rendering": {
-        "view.bloom.enabled": true,
-        "view.bloom.levels": 4
-      }
-    },
-    {
-      "name": "bloom_resolution_high",
-      "apply_presets": [
-        "base"
-      ],
-      "rendering": {
-        "view.bloom.enabled": true,
-        "view.bloom.resolution": 1024
-      }
-    },
-    {
-      "name": "bloom_strength_high",
-      "apply_presets": [
-        "base"
-      ],
-      "rendering": {
-        "view.bloom.enabled": true,
-        "view.bloom.strength": 0.5
-      }
-    },
-    {
-      "name": "bloom_strength_low",
-      "apply_presets": [
-        "base"
-      ],
-      "rendering": {
-        "view.bloom.enabled": true,
-        "view.bloom.strength": 0.01
-      }
-    },
-    {
-      "name": "bloom_blendMode_interpolate",
-      "apply_presets": [
-        "base"
-      ],
-      "rendering": {
-        "view.bloom.enabled": true,
-        "view.bloom.blendMode": "INTERPOLATE"
-      }
-    },
-    {
-      "name": "bloom_no_threshold",
-      "apply_presets": [
-        "base"
-      ],
-      "rendering": {
-        "view.bloom.enabled": true,
-        "view.bloom.threshold": false
-      }
-    },
-    {
-      "name": "bloom_quality_high",
-      "apply_presets": [
-        "base"
-      ],
-      "rendering": {
-        "view.bloom.enabled": true,
-        "view.bloom.quality": "HIGH"
-      }
-    },
-    {
-      "name": "bloom_lensflare",
-      "apply_presets": [
-        "base"
-      ],
-      "rendering": {
-        "view.bloom.enabled": true,
-        "view.bloom.lensFlare": true
-      }
-    },
-    {
-      "name": "bloom_lensflare_no_starburst",
-      "apply_presets": [
-        "base"
-      ],
-      "rendering": {
-        "view.bloom.enabled": true,
-        "view.bloom.lensFlare": true,
-        "view.bloom.starburst": false
-      }
-    },
-    {
-      "name": "bloom_lensflare_chromatic",
-      "apply_presets": [
-        "base"
-      ],
-      "rendering": {
-        "view.bloom.enabled": true,
-        "view.bloom.lensFlare": true,
-        "view.bloom.chromaticAberration": 0.05
-      }
-    },
-    {
-      "name": "bloom_lensflare_ghosts",
-      "apply_presets": [
-        "base"
-      ],
-      "rendering": {
-        "view.bloom.enabled": true,
-        "view.bloom.lensFlare": true,
-        "view.bloom.ghostCount": 8
-      }
-    },
-    {
-      "name": "bloom_lensflare_ghostSpacing",
-      "apply_presets": [
-        "base"
-      ],
-      "rendering": {
-        "view.bloom.enabled": true,
-        "view.bloom.lensFlare": true,
-        "view.bloom.ghostSpacing": 0.8
-      }
-    },
-    {
-      "name": "bloom_halo_thick",
-      "apply_presets": [
-        "base"
-      ],
-      "rendering": {
-        "view.bloom.enabled": true,
-        "view.bloom.lensFlare": true,
-        "view.bloom.haloThickness": 0.2
-      }
-    },
-    {
-      "name": "bloom_halo_radius",
-      "apply_presets": [
-        "base"
-      ],
-      "rendering": {
-        "view.bloom.enabled": true,
-        "view.bloom.lensFlare": true,
-        "view.bloom.haloRadius": 0.5
-      }
-    },
-    {
-      "name": "dof_basic",
-      "apply_presets": [
-        "base"
-      ],
-      "rendering": {
-        "view.dof.enabled": true
-      }
-    },
-    {
-      "name": "dof_cocScale_high",
-      "apply_presets": [
-        "base"
-      ],
-      "rendering": {
-        "view.dof.enabled": true,
-        "view.dof.cocScale": 2.0
-      }
-    },
-    {
-      "name": "dof_cocScale_low",
-      "apply_presets": [
-        "base"
-      ],
-      "rendering": {
-        "view.dof.enabled": true,
-        "view.dof.cocScale": 0.5
-      }
-    },
-    {
-      "name": "dof_cocAspectRatio",
-      "apply_presets": [
-        "base"
-      ],
-      "rendering": {
-        "view.dof.enabled": true,
-        "view.dof.cocAspectRatio": 2.0
-      }
-    },
-    {
-      "name": "dof_maxApertureDiameter",
-      "apply_presets": [
-        "base"
-      ],
-      "rendering": {
-        "view.dof.enabled": true,
-        "view.dof.maxApertureDiameter": 0.05
-      }
-    },
-    {
-      "name": "dof_filter_none",
-      "apply_presets": [
-        "base"
-      ],
-      "rendering": {
-        "view.dof.enabled": true,
-        "view.dof.filter": "NONE"
-      }
-    },
-    {
-      "name": "dof_nativeResolution",
-      "apply_presets": [
-        "base"
-      ],
-      "rendering": {
-        "view.dof.enabled": true,
-        "view.dof.nativeResolution": true
-      }
-    },
-    {
-      "name": "dof_rings_high",
-      "apply_presets": [
-        "base"
-      ],
-      "rendering": {
-        "view.dof.enabled": true,
-        "view.dof.foregroundRingCount": 5,
-        "view.dof.backgroundRingCount": 5
-      }
-    },
-    {
-      "name": "dof_rings_low",
-      "apply_presets": [
-        "base"
-      ],
-      "rendering": {
-        "view.dof.enabled": true,
-        "view.dof.foregroundRingCount": 3,
-        "view.dof.backgroundRingCount": 3
-      }
-    },
-    {
-      "name": "dof_max_coc",
-      "apply_presets": [
-        "base"
-      ],
-      "rendering": {
-        "view.dof.enabled": true,
-        "view.dof.maxForegroundCOC": 16,
-        "view.dof.maxBackgroundCOC": 16
-      }
-    },
-    {
-      "name": "fog_basic",
-      "apply_presets": [
-        "base"
-      ],
-      "rendering": {
-        "view.fog.enabled": true
-      }
-    },
-    {
-      "name": "fog_distance",
-      "apply_presets": [
-        "base"
-      ],
-      "rendering": {
-        "view.fog.enabled": true,
-        "view.fog.distance": 10.0
-      }
-    },
-    {
-      "name": "fog_cutOffDistance",
-      "apply_presets": [
-        "base"
-      ],
-      "rendering": {
-        "view.fog.enabled": true,
-        "view.fog.cutOffDistance": 100.0
-      }
-    },
-    {
-      "name": "fog_maximumOpacity",
-      "apply_presets": [
-        "base"
-      ],
-      "rendering": {
-        "view.fog.enabled": true,
-        "view.fog.maximumOpacity": 0.5
-      }
-    },
-    {
-      "name": "fog_height",
-      "apply_presets": [
-        "base"
-      ],
-      "rendering": {
-        "view.fog.enabled": true,
-        "view.fog.height": 5.0
-      }
-    },
-    {
-      "name": "fog_heightFalloff",
-      "apply_presets": [
-        "base"
-      ],
-      "rendering": {
-        "view.fog.enabled": true,
-        "view.fog.heightFalloff": 0.5
-      }
-    },
-    {
-      "name": "fog_density_high",
-      "apply_presets": [
-        "base"
-      ],
-      "rendering": {
-        "view.fog.enabled": true,
-        "view.fog.density": 0.5
-      }
-    },
-    {
-      "name": "fog_inScatteringStart",
-      "apply_presets": [
-        "base"
-      ],
-      "rendering": {
-        "view.fog.enabled": true,
-        "view.fog.inScatteringStart": 5.0
-      }
-    },
-    {
-      "name": "fog_inScatteringSize",
-      "apply_presets": [
-        "base"
-      ],
-      "rendering": {
-        "view.fog.enabled": true,
-        "view.fog.inScatteringSize": 10.0
-      }
-    },
-    {
-      "name": "fog_fogColorFromIbl",
-      "apply_presets": [
-        "base"
-      ],
-      "rendering": {
-        "view.fog.enabled": true,
-        "view.fog.fogColorFromIbl": true
-      }
-    },
-    {
-      "name": "vignette_basic",
-      "apply_presets": [
-        "base"
-      ],
-      "rendering": {
-        "view.vignette.enabled": true
-      }
-    },
-    {
-      "name": "vignette_midPoint",
-      "apply_presets": [
-        "base"
-      ],
-      "rendering": {
-        "view.vignette.enabled": true,
-        "view.vignette.midPoint": 0.8
-      }
-    },
-    {
-      "name": "vignette_roundness_circle",
-      "apply_presets": [
-        "base"
-      ],
-      "rendering": {
-        "view.vignette.enabled": true,
-        "view.vignette.roundness": 1.0
-      }
-    },
-    {
-      "name": "vignette_roundness_rect",
-      "apply_presets": [
-        "base"
-      ],
-      "rendering": {
-        "view.vignette.enabled": true,
-        "view.vignette.roundness": 0.0
-      }
-    },
-    {
-      "name": "vignette_feather_sharp",
-      "apply_presets": [
-        "base"
-      ],
-      "rendering": {
-        "view.vignette.enabled": true,
-        "view.vignette.feather": 0.1
-      }
-    },
-    {
-      "name": "cg_filmic",
-      "apply_presets": [
-        "base"
-      ],
-      "rendering": {
-        "view.colorGrading.toneMapping": "FILMIC"
-      }
-    },
-    {
-      "name": "cg_aces",
-      "apply_presets": [
-        "base"
-      ],
-      "rendering": {
-        "view.colorGrading.toneMapping": "ACES"
-      }
-    },
-    {
-      "name": "cg_agx",
-      "apply_presets": [
-        "base"
-      ],
-      "rendering": {
-        "view.colorGrading.toneMapping": "AGX"
-      }
-    },
-    {
-      "name": "cg_pbr_neutral",
-      "apply_presets": [
-        "base"
-      ],
-      "rendering": {
-        "view.colorGrading.toneMapping": "PBR_NEUTRAL"
-      }
-    },
-    {
-      "name": "cg_contrast_high",
-      "apply_presets": [
-        "base"
-      ],
-      "rendering": {
-        "view.colorGrading.contrast": 1.5
-      }
-    },
-    {
-      "name": "cg_saturation_high",
-      "apply_presets": [
-        "base"
-      ],
-      "rendering": {
-        "view.colorGrading.saturation": 1.5
-      }
-    },
-    {
-      "name": "cg_exposure_high",
-      "apply_presets": [
-        "base"
-      ],
-      "rendering": {
-        "view.colorGrading.exposure": 1.0
-      }
-    },
-    {
-      "name": "shadow_vsm",
-      "apply_presets": [
-        "base"
-      ],
-      "rendering": {
-        "view.shadowType": "VSM"
-      }
-    },
-    {
-      "name": "shadow_vsm_anisotropy",
-      "apply_presets": [
-        "base"
-      ],
-      "rendering": {
-        "view.shadowType": "VSM",
-        "view.vsmShadowOptions.anisotropy": 2
-      }
-    },
-    {
-      "name": "shadow_vsm_highPrecision",
-      "apply_presets": [
-        "base"
-      ],
-      "rendering": {
-        "view.shadowType": "VSM",
-        "view.vsmShadowOptions.highPrecision": true
-      }
-    }
-  ]
-}

android/samples/sample-render-validation/src/main/java/com/google/android/filament/validation/MainActivity.kt

@@ -17,35 +17,36 @@
 package com.google.android.filament.validation
 
 import android.app.Activity
-import android.app.AlertDialog
-import android.content.Intent
 import android.graphics.Bitmap
-import android.graphics.Color
 import android.os.Bundle
-import android.text.Html
 import android.util.Log
 import android.view.Choreographer
 import android.view.SurfaceView
 import android.view.View
 import android.view.WindowManager
-import android.widget.ArrayAdapter
-import android.widget.Button
 import android.widget.ImageView
 import android.widget.LinearLayout
-import android.widget.Spinner
+import android.widget.ScrollView
 import android.widget.TextView
-import com.google.android.filament.utils.KTX1Loader
 import com.google.android.filament.utils.ModelViewer
 import com.google.android.filament.utils.Utils
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
+import com.google.android.filament.utils.KTX1Loader
+import com.google.android.filament.IndirectLight
+import com.google.android.filament.Skybox
+import android.graphics.Color
 import java.io.File
+import java.io.FileOutputStream
+import java.net.HttpURLConnection
+import java.net.URL
 import java.nio.ByteBuffer
-import java.text.SimpleDateFormat
-import java.util.Date
-import java.util.Locale
+import android.widget.ArrayAdapter
+import android.widget.Button
+import android.widget.Spinner
+import android.widget.AdapterView
 
 class MainActivity : Activity(), ValidationRunner.Callback {
 
@@ -61,33 +62,13 @@ class MainActivity : Activity(), ValidationRunner.Callback {
     private lateinit var choreographer: Choreographer
     private lateinit var modelViewer: ModelViewer
     private lateinit var statusTextView: TextView
-    private lateinit var testResultsHeader: TextView
     private lateinit var resultsContainer: LinearLayout
     private lateinit var inputManager: ValidationInputManager
     private var currentInput: ValidationInputManager.ValidationInput? = null
-
-    private var currentAlphaDiffBitmap: Bitmap? = null
-    private var globalEnhancementFactor: Float = 1.0f
-
-    private data class TestImages(
-        val testName: String,
-        val golden: Bitmap?,
-        val rendered: Bitmap?,
-        val diff: Bitmap?,
-        val alphaDiff: Bitmap?
-    )
-
-    private val diffImageViews = mutableListOf<ImageView>()
-
-    // UI Elements
+    private lateinit var modeSpinner: Spinner
     private lateinit var runButton: Button
-    private lateinit var loadButton: Button
-    private lateinit var optionsButton: Button
-    private lateinit var enhancementContainer: LinearLayout
-    private lateinit var enhancementLabel: TextView
-    private lateinit var enhancementSlider: android.widget.SeekBar
-
     private var resultManager: ValidationResultManager? = null
+
     private var validationRunner: ValidationRunner? = null
 
     // Frame callback
@@ -108,70 +89,25 @@ class MainActivity : Activity(), ValidationRunner.Callback {
         surfaceView.holder.setFixedSize(512, 512)
 
         statusTextView = findViewById(R.id.status_text)
-        testResultsHeader = findViewById(R.id.test_results_header)
+        modeSpinner = findViewById(R.id.mode_spinner)
+        runButton = findViewById(R.id.run_button)
         resultsContainer = findViewById(R.id.results_container)
 
-        runButton = findViewById(R.id.run_button)
-        loadButton = findViewById(R.id.load_button)
-        optionsButton = findViewById(R.id.options_button)
-        enhancementContainer = findViewById(R.id.enhancement_container)
-        enhancementLabel = findViewById(R.id.enhancement_label)
-        enhancementSlider = findViewById(R.id.enhancement_slider)
-
-        enhancementSlider.setOnSeekBarChangeListener(object : android.widget.SeekBar.OnSeekBarChangeListener {
-            override fun onProgressChanged(seekBar: android.widget.SeekBar?, progress: Int, fromUser: Boolean) {
-                globalEnhancementFactor = 1.0f + (progress / 100f) * 49.0f
-                enhancementLabel.text = String.format(Locale.US, "Enhancement: %.1fx", globalEnhancementFactor)
-                applyGlobalEnhancement()
-            }
-            override fun onStartTrackingTouch(seekBar: android.widget.SeekBar?) {}
-            override fun onStopTrackingTouch(seekBar: android.widget.SeekBar?) {}
-        })
+        // Setup Spinner
+        val modes = arrayOf("Run Validation", "Generate Goldens")
+        val adapter = ArrayAdapter(this, android.R.layout.simple_spinner_item, modes)
+        adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
+        modeSpinner.adapter = adapter
 
         // Setup Run Button
         runButton.setOnClickListener {
             currentInput?.let { input ->
-                // Always use the generateGoldens flag from the intent/input
-                startValidation(input)
+                val generateGoldens = modeSpinner.selectedItemPosition == 1
+                val newInput = input.copy(generateGoldens = generateGoldens)
+                startValidation(newInput)
             }
         }
 
-        // Setup Load Button
-        loadButton.setOnClickListener {
-            showLoadDialog()
-        }
-
-        // Setup Options Menu Button
-        optionsButton.setOnClickListener { view ->
-            val popup = android.widget.PopupMenu(this, view)
-            popup.menu.add(0, 1, 0, "Generate Golden")
-            popup.menu.add(0, 2, 0, "Export Test")
-            popup.menu.add(0, 3, 0, "Export Result")
-            popup.menu.add(0, 4, 0, "Test ADB Info")
-            popup.menu.add(0, 5, 0, "Result ADB Info")
-            popup.menu.add(0, 6, 0, "Toggle Enhancement Slider")
-
-            popup.setOnMenuItemClickListener { item ->
-                when (item.itemId) {
-                    1 -> {
-                        currentInput?.let { input ->
-                            val goldenInput = input.copy(generateGoldens = true)
-                            startValidation(goldenInput)
-                        }
-                    }
-                    2 -> exportTestBundleAction()
-                    3 -> exportTestResultsAction()
-                    4 -> showTestAdbInfo()
-                    5 -> showResultAdbInfo()
-                    6 -> {
-                        enhancementContainer.visibility = if (enhancementContainer.visibility == View.VISIBLE) View.GONE else View.VISIBLE
-                    }
-                }
-                true
-            }
-            popup.show()
-        }
-
         window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
 
         choreographer = Choreographer.getInstance()
@@ -184,135 +120,6 @@ class MainActivity : Activity(), ValidationRunner.Callback {
         handleIntent()
     }
 
-    private fun showLoadDialog() {
-        val exportDir = getExternalFilesDir(null) ?: filesDir
-        // Filter out result zips (starting with "results_") to only show test bundles
-        val zips = exportDir.listFiles { _, name ->
-            name.endsWith(".zip") && !name.startsWith("results_")
-        }?.sortedByDescending { it.lastModified() } ?: emptyList()
-
-        if (zips.isEmpty()) {
-            AlertDialog.Builder(this)
-                .setTitle("Load Test")
-                .setMessage("No test bundles found.")
-                .setPositiveButton("OK", null)
-                .show()
-            return
-        }
-
-        val builder = AlertDialog.Builder(this)
-        builder.setTitle("Select Test Bundle")
-
-        val items = zips.map { it.name }.toTypedArray()
-
-        builder.setItems(items) { dialog, which ->
-            val selectedFile = zips[which]
-            loadZipBundle(selectedFile)
-            dialog.dismiss()
-        }
-
-        builder.setNegativeButton("Cancel", null)
-        builder.show()
-    }
-
-    private fun showTestAdbInfo() {
-        val exportDir = getExternalFilesDir(null) ?: filesDir
-        val path = exportDir.absolutePath
-        val isInternal = path.startsWith(filesDir.absolutePath)
-        val message = StringBuilder()
-
-        message.append("Storage Path: $path<br><br>")
-
-        message.append("<b>--- PULL FROM DEVICE ---</b><br>")
-        if (isInternal) {
-            message.append("<tt>adb shell \"run-as $packageName cat files/&lt;filename&gt;\" &gt; &lt;filename&gt;</tt><br><br>")
-        } else {
-            message.append("<tt>adb pull $path/&lt;filename&gt; .</tt><br><br>")
-        }
-
-        message.append("<b>--- PUSH TO DEVICE ---</b><br>")
-        if (isInternal) {
-            message.append("1. <tt>adb push &lt;filename&gt; /sdcard/Download/</tt><br>")
-            message.append("2. <tt>adb shell \"run-as $packageName cp /sdcard/Download/&lt;filename&gt; files/\"</tt><br>")
-        } else {
-            message.append("<tt>adb push &lt;filename&gt; $path/</tt><br>")
-        }
-        message.append("<br>Note: Use underscores instead of spaces in &lt;filename&gt;.")
-
-        AlertDialog.Builder(this)
-            .setTitle("Test Bundle ADB Info")
-            .setMessage(Html.fromHtml(message.toString(), Html.FROM_HTML_MODE_LEGACY))
-            .setPositiveButton("OK", null)
-            .show()
-    }
-
-    private fun showResultAdbInfo() {
-        val exportDir = getExternalFilesDir(null) ?: filesDir
-        val path = exportDir.absolutePath
-        val isInternal = path.startsWith(filesDir.absolutePath)
-        val message = StringBuilder()
-
-        message.append("<b>--- PULL RESULTS ---</b><br>")
-        if (isInternal) {
-            message.append("<tt>adb shell \"run-as $packageName cat files/&lt;filename&gt;\" &gt; &lt;filename&gt;</tt><br><br>")
-        } else {
-            message.append("<tt>adb pull $path/&lt;filename&gt; .</tt><br><br>")
-        }
-
-        message.append("<b>--- AVAILABLE RESULTS ---</b><br>")
-        val zips = exportDir.listFiles { _, name ->
-            name.endsWith(".zip") && name.startsWith("results_")
-        }?.sortedByDescending { it.lastModified() } ?: emptyList()
-
-        if (zips.isEmpty()) {
-            message.append("No result zips found.<br>")
-        } else {
-            zips.forEach { file ->
-                message.append("${file.name}<br>")
-            }
-        }
-
-        AlertDialog.Builder(this)
-            .setTitle("Result ADB Info")
-            .setMessage(Html.fromHtml(message.toString(), Html.FROM_HTML_MODE_LEGACY))
-            .setPositiveButton("OK", null)
-            .show()
-    }
-
-    private fun loadZipBundle(file: File) {
-         statusTextView.text = "Loading ${file.name}..."
-         CoroutineScope(Dispatchers.Main).launch {
-             try {
-                 val config = inputManager.loadFromZip(file)
-                 val baseDir = getExternalFilesDir(null) ?: filesDir
-                 val outputDir = File(baseDir, "validation_results").apply { mkdirs() }
-
-                 // Clear existing results UI and state
-                 resultsContainer.removeAllViews()
-                 diffImageViews.clear()
-                 resultManager = null
-
-                 val newInput = ValidationInputManager.ValidationInput(
-                     config = config,
-                     outputDir = outputDir,
-                     generateGoldens = false,
-                     autoRun = false,
-                     autoExport = false,
-                     autoExportResults = false,
-                     sourceZip = file
-                 )
-
-                 currentInput = newInput
-                 statusTextView.text = "Loaded ${config.name}"
-                 Log.i(TAG, "Setting header to: Test Results: ${config.name}")
-                 testResultsHeader.text = "${config.name}"
-             } catch (e: Exception) {
-                 Log.e(TAG, "Failed to load zip", e)
-                 statusTextView.text = "Error: ${e.message}"
-             }
-         }
-    }
-
     private fun createIndirectLight() {
         try {
             val engine = modelViewer.engine
@@ -349,18 +156,12 @@ class MainActivity : Activity(), ValidationRunner.Callback {
         CoroutineScope(Dispatchers.Main).launch {
             try {
                 val input = inputManager.resolveConfig(intent)
-
-                // Update header
-                Log.i(TAG, "handleIntent: Setting header to: Test Results: ${input.config.name}")
-                testResultsHeader.text = "${input.config.name}"
                 currentInput = input
 
-                if (input.autoRun) {
-                    startValidation(input)
-                } else {
-                    // Just show status
-                    statusTextView.text = "Ready: ${input.config.name}"
-                }
+                // Sync spinner with intent
+                modeSpinner.setSelection(if (input.generateGoldens) 1 else 0)
+
+                startValidation(input)
             } catch (e: Exception) {
                 Log.e(TAG, "Failed to resolve config", e)
                 statusTextView.text = "Error: ${e.message}"
@@ -371,13 +172,9 @@ class MainActivity : Activity(), ValidationRunner.Callback {
     private fun startValidation(input: ValidationInputManager.ValidationInput) {
         try {
             resultsContainer.removeAllViews()
-            diffImageViews.clear()
-            enhancementSlider.isEnabled = false
             Log.i(TAG, "Starting validation with config: ${input.config.name}")
             Log.i(TAG, "Output dir: ${input.outputDir.absolutePath}")
 
-            testResultsHeader.text = "${input.config.name}"
-
             resultManager = ValidationResultManager(input.outputDir)
 
             validationRunner = ValidationRunner(this, modelViewer, input.config, resultManager!!)
@@ -385,6 +182,9 @@ class MainActivity : Activity(), ValidationRunner.Callback {
             validationRunner?.generateGoldens = input.generateGoldens
             validationRunner?.start()
 
+            // Sync spinner in case it was called programmatically or changed implicitly
+            modeSpinner.setSelection(if (input.generateGoldens) 1 else 0)
+
         } catch (e: Exception) {
             Log.e(TAG, "Failed to start validation", e)
             statusTextView.text = "Error: ${e.message}"
@@ -396,12 +196,6 @@ class MainActivity : Activity(), ValidationRunner.Callback {
         choreographer.postFrameCallback(frameScheduler)
     }
 
-    override fun onNewIntent(intent: Intent) {
-        super.onNewIntent(intent)
-        setIntent(intent)
-        handleIntent()
-    }
-
     override fun onPause() {
         super.onPause()
         choreographer.removeFrameCallback(frameScheduler)
@@ -427,44 +221,19 @@ class MainActivity : Activity(), ValidationRunner.Callback {
             resultContainer.orientation = LinearLayout.VERTICAL
             resultContainer.setPadding(0, 10, 0, 20)
 
-            // Header Layout
-            val headerRow = LinearLayout(this)
-            headerRow.orientation = LinearLayout.HORIZONTAL
-            headerRow.gravity = android.view.Gravity.CENTER_VERTICAL
-
-            // Status Icon + Name
-            val statusView = TextView(this)
-            val icon = if (result.passed) "✔" else "✖"
-
-            statusView.text = "$icon ${result.testName}"
-            statusView.setTextColor(
-                if (result.passed) Color.parseColor("#4CAF50") else Color.parseColor("#F44336")
-            )
-            statusView.textSize = 12f
-            statusView.setTypeface(null, android.graphics.Typeface.BOLD)
-            headerRow.addView(statusView)
-
-            // Diff Metric (only show if it's relevant/there's a diff or we just always show it like before)
-            val diffView = TextView(this)
-            diffView.text = "  (Diff: ${result.diffMetric})"
-            diffView.textSize = 12f
-            diffView.setTextColor(Color.GRAY)
-            headerRow.addView(diffView)
-            resultContainer.addView(headerRow)
+            // Header
+            val resultView = TextView(this)
+            resultView.text = "${result.testName}: ${if(result.passed) "PASS" else "FAIL"} (Diff: ${result.diffMetric})"
+            resultView.setTextColor(if(result.passed) Color.GREEN else Color.RED)
+            resultView.textSize = 16f
+            resultView.setTypeface(null, android.graphics.Typeface.BOLD)
+            resultContainer.addView(resultView)
 
             // Images Row
             val imagesRow = LinearLayout(this)
             imagesRow.orientation = LinearLayout.HORIZONTAL
 
-            val testImages = TestImages(
-                testName = result.testName,
-                golden = currentGoldenBitmap,
-                rendered = currentRenderedBitmap,
-                diff = currentDiffBitmap,
-                alphaDiff = currentAlphaDiffBitmap
-            )
-
-            fun addImage(label: String, bitmap: Bitmap?, isDiff: Boolean) {
+            fun addImage(label: String, bitmap: Bitmap?) {
                 if (bitmap != null) {
                     val container = LinearLayout(this)
                     container.orientation = LinearLayout.VERTICAL
@@ -472,7 +241,7 @@ class MainActivity : Activity(), ValidationRunner.Callback {
 
                     val labelView = TextView(this)
                     labelView.text = label
-                    labelView.textSize = 9f
+                    labelView.textSize = 12f
                     container.addView(labelView)
 
                     val iv = ImageView(this)
@@ -480,29 +249,16 @@ class MainActivity : Activity(), ValidationRunner.Callback {
                     iv.layoutParams = LinearLayout.LayoutParams(250, 250) // Smaller thumbnails
                     iv.scaleType = ImageView.ScaleType.FIT_CENTER
                     iv.setBackgroundColor(0xFF404040.toInt())
-
-                    if (isDiff) {
-                        diffImageViews.add(iv)
-                        applyEnhancementToView(iv, globalEnhancementFactor)
-                    }
-
-                    iv.setOnClickListener {
-                        showImageDialog(testImages, label)
-                    }
-
                     container.addView(iv)
 
                     imagesRow.addView(container)
                 }
             }
 
-            addImage("Rendered", currentRenderedBitmap, false)
-            addImage("Golden", currentGoldenBitmap, false)
+            addImage("Rendered", currentRenderedBitmap)
+            addImage("Golden", currentGoldenBitmap)
             if (!result.passed) {
-                addImage("Diff", currentDiffBitmap, true)
-            }
-            if (currentAlphaDiffBitmap != null) {
-                addImage("Alpha Diff", currentAlphaDiffBitmap, true)
+                addImage("Diff", currentDiffBitmap)
             }
 
             resultContainer.addView(imagesRow)
@@ -512,54 +268,13 @@ class MainActivity : Activity(), ValidationRunner.Callback {
             currentRenderedBitmap = null
             currentGoldenBitmap = null
             currentDiffBitmap = null
-            currentAlphaDiffBitmap = null
         }
     }
 
     override fun onAllTestsFinished() {
         runOnUiThread {
             statusTextView.text = "All tests finished!"
-            enhancementSlider.isEnabled = true
-            Log.i(TAG, "All tests finished " + if (currentInput?.autoExport == true) "Exporting bundle" else "x")
-
-            if (currentInput?.autoExport == true) {
-                exportTestBundleAction()
-            }
-            if (currentInput?.autoExportResults == true) {
-                exportTestResultsAction()
-            }
-        }
-    }
-
-    private fun exportTestBundleAction() {
-        currentInput?.let { input ->
-            val timestamp = SimpleDateFormat("yyyyMMdd_HHmmss", Locale.US).format(Date())
-            val rm = resultManager ?: ValidationResultManager(input.outputDir)
-            val zip = rm.exportTestBundle(input.config, timestamp)
-            if (zip != null) {
-                val msg = "Exported Bundle: ${zip.name}"
-                statusTextView.text = msg
-                Log.i(TAG, "Exported test bundle to ${zip.absolutePath}")
-            } else {
-                statusTextView.text = "Export Bundle failed"
-                Log.e(TAG, "Export Bundle failed")
-            }
-        }
-    }
-
-    private fun exportTestResultsAction() {
-        currentInput?.let { input ->
-            val timestamp = SimpleDateFormat("yyyyMMdd_HHmmss", Locale.US).format(Date())
-            val rm = resultManager ?: ValidationResultManager(input.outputDir)
-            val zip = rm.exportTestResults(input.sourceZip, timestamp)
-            if (zip != null) {
-                val msg = "Exported Results: ${zip.name}"
-                statusTextView.text = msg
-                Log.i(TAG, "Exported results to ${zip.absolutePath}")
-            } else {
-                statusTextView.text = "Export Results failed"
-                Log.e(TAG, "Export Results failed")
-            }
+            Log.i(TAG, "All tests finished")
         }
     }
 
@@ -582,165 +297,54 @@ class MainActivity : Activity(), ValidationRunner.Callback {
                 "Diff" -> {
                     currentDiffBitmap = bitmap
                 }
-                "Alpha Diff" -> {
-                    currentAlphaDiffBitmap = bitmap
-                }
             }
         }
     }
-
-    private fun applyEnhancementToView(iv: ImageView, factor: Float) {
-        val cm = android.graphics.ColorMatrix()
-        cm.setScale(factor, factor, factor, 1.0f)
-        iv.colorFilter = android.graphics.ColorMatrixColorFilter(cm)
-    }
-
-    private fun applyGlobalEnhancement() {
-        for (iv in diffImageViews) {
-            applyEnhancementToView(iv, globalEnhancementFactor)
-        }
-    }
-
-    private fun showImageDialog(images: TestImages, initialLabel: String) {
-        val dialogView = layoutInflater.inflate(R.layout.dialog_image_viewer, null)
-        val dialog = AlertDialog.Builder(this)
-            .setView(dialogView)
-            .create()
-
-        val titleView = dialogView.findViewById<TextView>(R.id.dialog_title)
-        val typeView = dialogView.findViewById<TextView>(R.id.dialog_image_type)
-        val imageView = dialogView.findViewById<ImageView>(R.id.dialog_image)
-        val btnClose = dialogView.findViewById<View>(R.id.btn_close)
-        val btnReset = dialogView.findViewById<View>(R.id.btn_reset)
-        val btnPrev = dialogView.findViewById<View>(R.id.btn_prev)
-        val btnNext = dialogView.findViewById<View>(R.id.btn_next)
-
-        val enhancementContainer = dialogView.findViewById<View>(R.id.dialog_enhancement_container)
-        val enhancementLabel = dialogView.findViewById<TextView>(R.id.dialog_enhancement_label)
-        val enhancementSlider = dialogView.findViewById<android.widget.SeekBar>(R.id.dialog_enhancement_slider)
-
-        titleView.text = images.testName
-
-        val availableImages = mutableListOf<Pair<String, Bitmap>>()
-        images.rendered?.let { availableImages.add(Pair("Rendered", it)) }
-        images.golden?.let { availableImages.add(Pair("Golden", it)) }
-        images.diff?.let { availableImages.add(Pair("Diff", it)) }
-        images.alphaDiff?.let { availableImages.add(Pair("Alpha Diff", it)) }
-
-        if (availableImages.isEmpty()) return
-
-        var currentIndex = availableImages.indexOfFirst { it.first == initialLabel }
-        if (currentIndex == -1) currentIndex = 0
-
-        var currentDialogEnhancement = globalEnhancementFactor
-
-        val matrix = android.graphics.Matrix()
-        // Save initial values for translation tracking
-        var lastTouchX = 0f
-        var lastTouchY = 0f
-        var isDragging = false
-
-        val scaleDetector = android.view.ScaleGestureDetector(this, object : android.view.ScaleGestureDetector.SimpleOnScaleGestureListener() {
-            override fun onScale(detector: android.view.ScaleGestureDetector): Boolean {
-                matrix.postScale(detector.scaleFactor, detector.scaleFactor, detector.focusX, detector.focusY)
-                imageView.imageMatrix = matrix
-                return true
-            }
-        })
-
-        imageView.setOnTouchListener { _, event ->
-            scaleDetector.onTouchEvent(event)
-            when (event.actionMasked) {
-                android.view.MotionEvent.ACTION_DOWN -> {
-                    lastTouchX = event.x
-                    lastTouchY = event.y
-                    isDragging = true
-                }
-                android.view.MotionEvent.ACTION_MOVE -> {
-                    if (isDragging && !scaleDetector.isInProgress) {
-                        val dx = event.x - lastTouchX
-                        val dy = event.y - lastTouchY
-                        matrix.postTranslate(dx, dy)
-                        imageView.imageMatrix = matrix
-                    }
-                    lastTouchX = event.x
-                    lastTouchY = event.y
-                }
-                android.view.MotionEvent.ACTION_UP, android.view.MotionEvent.ACTION_CANCEL -> {
-                    isDragging = false
-                }
-            }
-            true
-        }
-
-        fun updateView() {
-            val (label, bitmap) = availableImages[currentIndex]
-            typeView.text = label
-            imageView.setImageBitmap(bitmap)
-            (imageView.drawable as? android.graphics.drawable.BitmapDrawable)?.setAntiAlias(false)
-            (imageView.drawable as? android.graphics.drawable.BitmapDrawable)?.setFilterBitmap(false)
-            imageView.imageMatrix = matrix
-
-            if (label == "Diff" || label == "Alpha Diff") {
-                enhancementContainer.visibility = View.VISIBLE
-                applyEnhancementToView(imageView, currentDialogEnhancement)
-            } else {
-                enhancementContainer.visibility = View.GONE
-                imageView.colorFilter = null
-            }
-        }
-
-        fun resetMatrix() {
-            val drawable = imageView.drawable ?: return
-            val width = imageView.width.toFloat()
-            val height = imageView.height.toFloat()
-            val dw = drawable.intrinsicWidth.toFloat()
-            val dh = drawable.intrinsicHeight.toFloat()
-
-            val scaleX = width / dw
-            val scaleY = height / dh
-            val scale = Math.min(scaleX, scaleY)
-
-            val dx = (width - dw * scale) / 2f
-            val dy = (height - dh * scale) / 2f
-
-            matrix.reset()
-            matrix.postScale(scale, scale)
-            matrix.postTranslate(dx, dy)
-            imageView.imageMatrix = matrix
-        }
-
-        btnClose.setOnClickListener { dialog.dismiss() }
-        btnReset.setOnClickListener { resetMatrix() }
-        btnPrev.setOnClickListener {
-            currentIndex = (currentIndex - 1 + availableImages.size) % availableImages.size
-            updateView()
-        }
-        btnNext.setOnClickListener {
-            currentIndex = (currentIndex + 1) % availableImages.size
-            updateView()
-        }
-
-        val defaultProgress = ((currentDialogEnhancement - 1.0f) / 49.0f * 100).toInt()
-        val safeProgress = Math.max(0, Math.min(100, defaultProgress))
-        enhancementSlider.progress = safeProgress
-        enhancementLabel.text = String.format(Locale.US, "Enhance: %.1fx", currentDialogEnhancement)
-
-        enhancementSlider.setOnSeekBarChangeListener(object : android.widget.SeekBar.OnSeekBarChangeListener {
-            override fun onProgressChanged(seekBar: android.widget.SeekBar?, progress: Int, fromUser: Boolean) {
-                currentDialogEnhancement = 1.0f + (progress / 100f) * 49.0f
-                enhancementLabel.text = String.format(Locale.US, "Enhance: %.1fx", currentDialogEnhancement)
-                updateView()
-            }
-            override fun onStartTrackingTouch(seekBar: android.widget.SeekBar?) {}
-            override fun onStopTrackingTouch(seekBar: android.widget.SeekBar?) {}
-        })
-
-        imageView.post {
-            resetMatrix()
-        }
-
-        updateView()
-        dialog.show()
-    }
 }
+
+/*
+ * Scripts for reference:
+ *
+ * generate_goldens.sh:
+ * --------------------
+ * #!/bin/bash
+ * set -e
+ *
+ * # Config path (on device)
+ * CONFIG_PATH=$1
+ * if [ -z "$CONFIG_PATH" ]; then
+ *     echo "Usage: $0 <device_config_path>"
+ *     echo "Example: $0 /sdcard/Android/data/com.google.android.filament.validation/files/default_test.json"
+ *     exit 1
+ * fi
+ *
+ * echo "Starting Golden Generation for $CONFIG_PATH..."
+ * adb shell am force-stop com.google.android.filament.validation
+ * adb shell am start -n com.google.android.filament.validation/.MainActivity \
+ *     -e test_config "$CONFIG_PATH" \
+ *     --ez generate_goldens true
+ *
+ * echo "Check device or logcat for progress."
+ * echo "adb logcat -s FilamentValidation:I ValidationRunner:I"
+ * echo "To pull results: ./samples/sample-render-validation/pull_goldens.sh"
+ *
+ * pull_goldens.sh:
+ * ----------------
+ * #!/bin/bash
+ * set -e
+ *
+ * # Default destination is local golden directory relative to script
+ * SCRIPT_DIR=$(cd $(dirname $0); pwd)
+ * DEST_DIR=${1:-"$SCRIPT_DIR/golden"}
+ *
+ * echo "Pulling goldens to $DEST_DIR..."
+ * mkdir -p "$DEST_DIR"
+ *
+ * # Path on device
+ * DEVICE_GOLDEN_DIR="/storage/emulated/0/Android/data/com.google.android.filament.validation/files/golden/."
+ *
+ * adb pull "$DEVICE_GOLDEN_DIR" "$DEST_DIR"
+ *
+ * echo "Done."
+ * ls -l "$DEST_DIR"
+ */

android/samples/sample-render-validation/src/main/java/com/google/android/filament/validation/ValidationInputManager.kt

@@ -26,7 +26,6 @@ import java.io.File
 import java.io.FileOutputStream
 import java.net.HttpURLConnection
 import java.net.URL
-import java.util.zip.ZipFile
 
 /**
  * Handles the retrieval and preparation of test configuration and assets.
@@ -43,11 +42,7 @@ class ValidationInputManager(private val context: Context) {
     data class ValidationInput(
         val config: RenderTestConfig,
         val outputDir: File,
-        val generateGoldens: Boolean,
-        val autoRun: Boolean = false,
-        val autoExport: Boolean = false,
-        val autoExportResults: Boolean = false,
-        val sourceZip: File? = null
+        val generateGoldens: Boolean
     )
 
     /**
@@ -58,111 +53,22 @@ class ValidationInputManager(private val context: Context) {
         val testConfigPath = intent.getStringExtra("test_config")
         val urlConfig = intent.getStringExtra("url_config")
         val urlModelsBase = intent.getStringExtra("url_models_base")
-        val zipPath = intent.getStringExtra("zip_path")
         val generateGoldens = intent.getBooleanExtra("generate_goldens", false)
-        val autoRun = intent.getBooleanExtra("auto_run", false)
-        val autoExport = intent.getBooleanExtra("auto_export", false)
-        val autoExportResults = intent.getBooleanExtra("auto_export_results", false)
         val outputPath = intent.getStringExtra("output_path")
 
-        Log.i(TAG, "Resolving config with outputPath: $outputPath")
-
-        val baseDir = context.getExternalFilesDir(null) ?: context.filesDir
-        Log.i(TAG, "Base directory for resolution: ${baseDir.absolutePath}")
-        
-        val outputDir = if (!outputPath.isNullOrBlank()) {
-            val file = File(outputPath)
-            val resolved = if (file.isAbsolute) {
-                file
-            } else {
-                File(baseDir, outputPath)
-            }
-            
-            // Critical check: if resolved is root or very short, it's likely wrong
-            if (resolved.absolutePath == "/" || resolved.parent == null) {
-                Log.w(TAG, "Resolved outputDir is root ($resolved), defaulting to app-specific dir")
-                File(baseDir, "validation_results")
-            } else {
-                resolved
-            }
+        val outputDir = if (outputPath != null) {
+            File(outputPath).apply { mkdirs() }
         } else {
-            File(baseDir, "validation_results")
-        }
-        
-        if (!outputDir.exists() && !outputDir.mkdirs()) {
-            Log.e(TAG, "Failed to create outputDir: ${outputDir.absolutePath}")
-        }
-        Log.i(TAG, "Final outputDir: ${outputDir.absolutePath}")
-
-        val sourceZipFile = if (zipPath != null) {
-            val file = File(zipPath)
-            if (file.isAbsolute) {
-                file
-            } else {
-                File(baseDir, zipPath)
-            }
-        } else {
-            null
+            File(context.getExternalFilesDir(null), "validation_results").apply { mkdirs() }
         }
 
         val config = when {
-            sourceZipFile != null && sourceZipFile.exists() -> loadFromZip(sourceZipFile)
             urlConfig != null -> downloadConfig(urlConfig, urlModelsBase)
             testConfigPath != null -> ConfigParser.parseFromPath(testConfigPath)
             else -> extractDefaultAssets()
         }
 
-        return@withContext ValidationInput(config, outputDir, generateGoldens, autoRun, autoExport, autoExportResults, sourceZipFile)
-    }
-
-    suspend fun loadFromZip(zipFile: File): RenderTestConfig {
-        Log.i(TAG, "Unzipping validation bundle: ${zipFile.absolutePath}")
-        // Use a unique cache dir based on timestamp or just overwrite a common one
-        // Overwriting is safer to avoid filling up disk, but we must ensure we don't conflict with current run
-        val baseCacheDir = context.externalCacheDir ?: context.cacheDir
-        val cacheDir = File(baseCacheDir, "unzipped_validation")
-        if (cacheDir.exists()) cacheDir.deleteRecursively()
-        cacheDir.mkdirs()
-
-        Log.i(TAG, "Using cacheDir: ${cacheDir.absolutePath}")
-
-        ZipFile(zipFile).use { zip ->
-            val entries = zip.entries()
-            while (entries.hasMoreElements()) {
-                val entry = entries.nextElement()
-                val entryFile = File(cacheDir, entry.name)
-                // specific check to avoid zip slip vulnerability (though low risk here)
-                if (!entryFile.canonicalPath.startsWith(cacheDir.canonicalPath)) {
-                    throw SecurityException("Zip entry is outside of the target dir: ${entry.name}")
-                }
-                
-                if (entry.isDirectory) {
-                    entryFile.mkdirs()
-                } else {
-                    entryFile.parentFile?.mkdirs()
-                    zip.getInputStream(entry).use { input ->
-                         FileOutputStream(entryFile).use { output ->
-                             input.copyTo(output)
-                         }
-                    }
-                }
-            }
-        }
-        
-        // Find config.json
-        // We look for a file ending in .json within the unzipped structure
-        // Exclude results.json if it happened to be there
-        val jsonFiles = cacheDir.walkTopDown()
-            .filter { it.isFile && it.extension == "json" && it.name != "results.json" }
-            .toList()
-            
-        if (jsonFiles.isEmpty()) throw IllegalStateException("No config.json found in zip")
-        
-        // Prefer one named config.json or take the first one
-        val configFile = jsonFiles.find { it.name == "config.json" } ?: jsonFiles.first()
-
-        Log.i(TAG, "Parsed config from ${configFile.absolutePath}")
-        return ConfigParser.parseFromPath(configFile.absolutePath)
+        return@withContext ValidationInput(config, outputDir, generateGoldens)
     }
 
     private suspend fun extractDefaultAssets(): RenderTestConfig {
@@ -184,9 +90,9 @@ class ValidationInputManager(private val context: Context) {
         // Copy DamagedHelmet.glb
         val modelsDir = File(filesDir, "models")
         modelsDir.mkdirs()
-        val modelOut = File(modelsDir, "helmet.glb")
+        val modelOut = File(modelsDir, "DamagedHelmet.glb")
 
-        assetManager.open("models/helmet.glb").use { input ->
+        assetManager.open("DamagedHelmet.glb").use { input ->
             FileOutputStream(modelOut).use { output ->
                 input.copyTo(output)
             }

android/samples/sample-render-validation/src/main/java/com/google/android/filament/validation/ValidationResultManager.kt

@@ -67,201 +67,22 @@ class ValidationResultManager(private val outputDir: File) {
     fun finalizeResults(): File? {
         // Write results JSON
         writeResultsJson()
-        return null
-    }
-
-    /**
-     * Exports a zip containing:
-     * - results.json
-     * - input test bundle (as nested zip), if provided
-     * - diff images (if any failure)
-     */
-    fun exportTestResults(sourceZip: File?, timestamp: String): File? {
-        // Safe parent dir resolution
-        val parentDir = outputDir.canonicalFile.parentFile ?: outputDir.parentFile
-        if (parentDir == null) return null
-
-        val resultZipName = "results_$timestamp"
-        val zipFile = File(parentDir, "$resultZipName.zip")
-
-        Log.i(TAG, "Exporting results to ${zipFile.absolutePath}")
 
+        // Zip results
+        val zipFile = File(outputDir, "results.zip")
         try {
             ZipOutputStream(FileOutputStream(zipFile)).use { zos ->
-                // 1. Add results.json
-                val resultsJson = File(outputDir, "results.json")
-                if (resultsJson.exists()) {
-                    zos.putNextEntry(ZipEntry("results.json"))
-                    resultsJson.inputStream().use { it.copyTo(zos) }
-                    zos.closeEntry()
-                }
-
-                // 2. Add source zip if exists
-                if (sourceZip != null && sourceZip.exists()) {
-                    zos.putNextEntry(ZipEntry(sourceZip.name))
-                    sourceZip.inputStream().use { it.copyTo(zos) }
-                    zos.closeEntry()
-                }
-
-                // 3. Add diff images (any file ending in _diff.png in outputDir)
-                outputDir.listFiles { _, name -> name.endsWith("_diff.png") }?.forEach { diffFile ->
-                    zos.putNextEntry(ZipEntry(diffFile.name))
-                    diffFile.inputStream().use { it.copyTo(zos) }
+                outputDir.walkTopDown().filter { it.isFile && it.name != "results.zip" }.forEach { file ->
+                    val entryName = file.relativeTo(outputDir).path
+                    zos.putNextEntry(ZipEntry(entryName))
+                    file.inputStream().use { it.copyTo(zos) }
                     zos.closeEntry()
                 }
             }
-            Log.i(TAG, "Exported results to ${zipFile.absolutePath}")
+            Log.i(TAG, "Zipped results to ${zipFile.absolutePath}")
             return zipFile
         } catch (e: Exception) {
-            Log.e(TAG, "Failed to export results", e)
-            return null
-        }
-    }
-
-    /**
-     * Exports a zip bundle containing:
-     * - Modified config.json (with updated name and relative paths)
-     * - Models (in models/ subdirectory)
-     * - Golden images (in goldens/ subdirectory)
-     *
-     * Structure:
-     *   test_name_TIMESTAMP/
-     *     config.json
-     *     models/
-     *       model.glb
-     *     goldens/
-     *       test_result.png
-     */
-    fun exportTestBundle(config: RenderTestConfig, timestamp: String): File? {
-        Log.i(TAG, "Starting exportTestBundle for ${config.name} at $timestamp")
-        Log.i(TAG, "OutputDir: ${outputDir.absolutePath}")
-
-        val parentDir = outputDir.canonicalFile.parentFile ?: outputDir.parentFile
-        if (parentDir == null) {
-            Log.e(TAG, "OutputDir parent is null: ${outputDir.absolutePath}")
-            return null
-        }
-        Log.i(TAG, "Using parentDir for export: ${parentDir.absolutePath}")
-
-        val testNameWithTimestamp = "${config.name}_$timestamp"
-        val exportNameNoSpaces = testNameWithTimestamp.replace(" ", "_")
-
-        val exportDir = File(parentDir, "export_temp_$timestamp")
-
-        Log.i(TAG, "Creating export temp dir: ${exportDir.absolutePath}")
-        if (exportDir.exists()) exportDir.deleteRecursively()
-        if (!exportDir.mkdirs()) {
-             Log.e(TAG, "Failed to create export dir: ${exportDir.absolutePath}")
-             return null
-        }
-
-        val rootDir = File(exportDir, exportNameNoSpaces)
-        rootDir.mkdirs()
-
-        val modelsDir = File(rootDir, "models")
-        modelsDir.mkdirs()
-
-        val goldensDir = File(rootDir, "goldens")
-        goldensDir.mkdirs()
-
-        try {
-            // 1. Copy Models and update config map
-            val newModelsMap = mutableMapOf<String, String>()
-            Log.i(TAG, "Copying models...")
-            for ((modelName, modelPath) in config.models) {
-                val sourceFile = File(modelPath)
-                if (sourceFile.exists()) {
-                    val destFile = File(modelsDir, sourceFile.name)
-                    Log.d(TAG, "Copying model $modelName: $modelPath -> ${destFile.name}")
-                    sourceFile.copyTo(destFile, overwrite = true)
-                    // Use relative path for the new config
-                    newModelsMap[modelName] = "models/${sourceFile.name}"
-                } else {
-                    Log.w(TAG, "Model file not found: $modelPath")
-                }
-            }
-
-            // 2. Copy Golden Images
-            // We assume goldens are in outputDir with .png extension
-            Log.i(TAG, "Copying goldens from ${outputDir.absolutePath}...")
-            outputDir.listFiles { _, name -> name.endsWith(".png") }?.forEach { file ->
-                Log.d(TAG, "Copying golden: ${file.name}")
-                file.copyTo(File(goldensDir, file.name), overwrite = true)
-            }
-
-            // 3. Create modified config JSON
-            Log.i(TAG, "Creating config.json...")
-            val newConfigJson = JSONObject()
-            newConfigJson.put("name", testNameWithTimestamp) // Keep spaces in JSON name
-
-            // Reconstruct backends
-            val backendsArray = JSONArray()
-            config.backends.forEach { backendsArray.put(it) }
-            newConfigJson.put("backends", backendsArray)
-
-            // Reconstruct models
-            val modelsJson = JSONObject()
-            for ((k, v) in newModelsMap) {
-                modelsJson.put(k, v)
-            }
-            newConfigJson.put("models", modelsJson)
-
-            // Reconstruct tests
-            val testsArray = JSONArray()
-            for (test in config.tests) {
-                val testJson = JSONObject()
-                testJson.put("name", test.name)
-                if (test.description != null) testJson.put("description", test.description)
-
-                // Models for this test (set of strings)
-                val testModelsArray = JSONArray()
-                test.models.forEach { testModelsArray.put(it) }
-                testJson.put("models", testModelsArray)
-
-                // Rendering settings
-                testJson.put("rendering", test.rendering)
-
-                // Tolerance
-                if (test.tolerance != null) {
-                    testJson.put("tolerance", test.tolerance)
-                }
-
-                // Backends (optional override)
-                 val testBackends = JSONArray()
-                 test.backends.forEach { testBackends.put(it) }
-                 testJson.put("backends", testBackends)
-
-                testsArray.put(testJson)
-            }
-            newConfigJson.put("tests", testsArray)
-
-            // Write config.json
-            File(rootDir, "config.json").writeText(newConfigJson.toString(4))
-
-            // 4. Zip it
-            val zipFile = File(parentDir, "$exportNameNoSpaces.zip")
-            Log.i(TAG, "Zipping to ${zipFile.absolutePath}...")
-
-            ZipOutputStream(FileOutputStream(zipFile)).use { zos ->
-                rootDir.walkTopDown().forEach { file ->
-                    if (file.isFile) {
-                        val entryName = file.relativeTo(exportDir).path
-                        zos.putNextEntry(ZipEntry(entryName))
-                        file.inputStream().use { it.copyTo(zos) }
-                        zos.closeEntry()
-                    }
-                }
-            }
-
-            // Cleanup temp dir
-            exportDir.deleteRecursively()
-
-            Log.i(TAG, "Exported test bundle to ${zipFile.absolutePath}")
-            return zipFile
-
-        } catch (e: Exception) {
-            Log.e(TAG, "Failed to export test bundle", e)
-            exportDir.deleteRecursively()
+            Log.e(TAG, "Failed to zip results", e)
             return null
         }
     }

android/samples/sample-render-validation/src/main/java/com/google/android/filament/validation/ValidationRunner.kt

@@ -41,13 +41,18 @@ class ValidationRunner(
     private var currentTestConfig: TestConfig? = null
     private var currentModelName: String? = null
 
+    private var loadStartFence: com.google.android.filament.Fence? = null
+    private var loadStartTime = 0L
     private var frameCounter = 0
 
     enum class State {
         IDLE,
+        LOADING_MODEL,
+        WAITING_FOR_FENCE,
         WAITING_FOR_RESOURCES,
         WARMUP,
-        RUNNING_TEST
+        RUNNING_TEST,
+        COMPARING
     }
 
     interface Callback {
@@ -88,6 +93,8 @@ class ValidationRunner(
             nextModel()
             return
         }
+
+        currentState = State.LOADING_MODEL
         callback?.onStatusChanged("Loading $modelName for ${currentTestConfig?.name}")
 
         // Load model on main thread (required by ModelViewer)
@@ -103,20 +110,51 @@ class ValidationRunner(
             Log.i("ValidationRunner", "Loading GLB buffer... (${bytes.size} bytes)")
             val buffer = ByteBuffer.wrap(bytes)
             modelViewer.loadModelGlb(buffer)
-            Log.i("ValidationRunner", "Model loaded.")
+            Log.i("ValidationRunner", "Model loaded. initializing fence.")
             modelViewer.transformToUnitCube()
-            currentState = State.WAITING_FOR_RESOURCES
-            frameCounter = 0
-            Log.i("ValidationRunner", "State set to WAITING_FOR_RESOURCES")
+            loadStartFence = modelViewer.engine.createFence()
+            loadStartTime = System.nanoTime()
+            currentState = State.WAITING_FOR_FENCE
+            frameCounter = 0 // Reset for fence timeout tracking
+            Log.i("ValidationRunner", "State set to WAITING_FOR_FENCE")
         } catch (e: Exception) {
-            Log.e("ValidationRunner", "Failed to load $path", e)
-            nextModel()
+             Log.e("ValidationRunner", "Failed to load $path", e)
+             nextModel()
         }
     }
 
     fun onFrame(frameTimeNanos: Long) {
+        if (frameCounter % 60 == 0) {
+             Log.i("ValidationRunner", "onFrame: $currentState (frame: $frameCounter)")
+        }
+
         when (currentState) {
             State.IDLE -> {}
+            State.WAITING_FOR_FENCE -> {
+                frameCounter++
+                if (frameCounter > 600) {
+                     Log.w("ValidationRunner", "Fence timed out after 600 frames! Forcing proceed.")
+                     modelViewer.engine.destroyFence(loadStartFence!!)
+                     loadStartFence = null
+                     currentState = State.WAITING_FOR_RESOURCES
+                     return
+                }
+
+                loadStartFence?.let { fence ->
+                     if (fence.wait(com.google.android.filament.Fence.Mode.FLUSH, 0) ==
+                            com.google.android.filament.Fence.FenceStatus.CONDITION_SATISFIED) {
+                         modelViewer.engine.destroyFence(fence)
+                         loadStartFence = null
+
+                         // Compile materials (simplified)
+                         modelViewer.scene.forEach { entity ->
+                             // ... existing material compilation logic ...
+                         }
+
+                         currentState = State.WAITING_FOR_RESOURCES
+                     }
+                }
+            }
             State.WAITING_FOR_RESOURCES -> {
                  val progress = modelViewer.progress
                  if (progress >= 1.0f) {
@@ -128,11 +166,12 @@ class ValidationRunner(
             State.WARMUP -> {
                 frameCounter++
                 if (frameCounter > 5) { // 5 frames warmup
-                    startAutomation()
+                     startAutomation()
                 }
             }
             State.RUNNING_TEST -> {
-                currentEngine?.let { engine ->
+                 // Log.i("ValidationRunner", "Running test...")
+                 currentEngine?.let { engine ->
                     val content = AutomationEngine.ViewerContent()
                     content.view = modelViewer.view
                     content.renderer = modelViewer.renderer
@@ -147,11 +186,13 @@ class ValidationRunner(
                     if (engine.shouldClose()) {
                         Log.i("ValidationRunner", "Finishing test (frames: $frameCounter)")
                         // Test finished (for this spec)
-                        currentState = State.IDLE
+                        currentState = State.COMPARING
                         captureAndCompare()
                     }
                 }
             }
+            State.COMPARING -> {} // Busy
+            State.LOADING_MODEL -> {}
         }
     }
 
@@ -192,36 +233,7 @@ class ValidationRunner(
 
          // Golden path
          val modelFile = File(config.models.get(modelName)!!)
-         val modelParent = modelFile.parentFile!!
-
-         // Search for golden in:
-         // 1. ../golden/ (standard structure)
-         // 2. ../goldens/ (exported structure, sibling of models)
-         // 3. ./goldens/ (backup)
-
-         val searchPaths = mutableListOf<File>()
-         modelParent.parentFile?.let {
-             searchPaths.add(it.resolve("golden"))
-             searchPaths.add(it.resolve("goldens"))
-         }
-         searchPaths.add(modelParent.resolve("goldens"))
-
-         var goldenFile: File? = null
-         for (path in searchPaths) {
-             val f = path.resolve("${testFullName}.png")
-             if (f.exists()) {
-                 goldenFile = f
-                 break
-             }
-         }
-
-         if (goldenFile != null) {
-             Log.i("ValidationRunner", "Found golden at ${goldenFile.absolutePath}")
-         } else {
-             Log.w("ValidationRunner", "Golden not found for $testFullName. Searched in: ${searchPaths.joinToString { it.absolutePath }}")
-             // Fallback to old behavior for reference if everything else fails
-             goldenFile = modelParent.parentFile?.resolve("golden/${testFullName}.png") ?: File("nonexistent")
-         }
+         val goldenFile = modelFile.parentFile!!.parentFile!!.resolve("golden/${testFullName}.png")
 
          Thread {
              try {
@@ -233,15 +245,14 @@ class ValidationRunner(
                 var diffMetric = 0f
 
                 if (generateGoldens) {
-                    val targetGolden = goldenFile ?: modelParent.parentFile?.resolve("golden/${testFullName}.png") ?: File(modelParent, "golden/${testFullName}.png")
-                    targetGolden.parentFile?.mkdirs()
-                    FileOutputStream(targetGolden).use { out ->
+                    goldenFile.parentFile?.mkdirs()
+                    FileOutputStream(goldenFile).use { out ->
                         flipped.compress(Bitmap.CompressFormat.PNG, 100, out)
                     }
                     passed = true // Generating goldens always passes if successful
                     callback?.onStatusChanged("Golden generated")
                 } else {
-                    if (goldenFile != null && goldenFile.exists()) {
+                    if (goldenFile.exists()) {
                         val golden = android.graphics.BitmapFactory.decodeFile(goldenFile.absolutePath)
                         if (golden != null) {
                             callback?.onImageResult("Golden", golden)
@@ -252,61 +263,17 @@ class ValidationRunner(
                             passed = (result.status == ImageDiff.Result.Status.PASSED)
                             diffMetric = result.failingPixelCount.toFloat()
 
-                            if (!passed) {
+                             if (!passed) {
                                 if (result.diffImage != null) {
-                                    val diffImg = result.diffImage!!
-                                    val width = diffImg.width
-                                    val height = diffImg.height
-                                    val pixels = IntArray(width * height)
-                                    diffImg.getPixels(pixels, 0, width, 0, 0, width, height)
-
-                                    var hasAlphaDiff = false
-                                    val alphaPixels = IntArray(width * height)
-
-                                    for (i in pixels.indices) {
-                                        val color = pixels[i]
-
-                                        val a = android.graphics.Color.alpha(color)
-                                        val r = android.graphics.Color.red(color)
-                                        val g = android.graphics.Color.green(color)
-                                        val b = android.graphics.Color.blue(color)
-
-                                        if (a > 0) {
-                                            hasAlphaDiff = true
-                                        }
-
-                                        // Map alpha diff to grayscale RGB
-                                        alphaPixels[i] = android.graphics.Color.argb(255, a, a, a)
-
-                                        // Force main diff image alpha to 255
-                                        pixels[i] = android.graphics.Color.argb(255, r, g, b)
-                                    }
-
-                                    // Apply updated pixels to diff image
-                                    diffImg.setPixels(pixels, 0, width, 0, 0, width, height)
-
-                                    // The C++ ImageDiff code sets isPremultiplied to false so Android
-                                    // doesn't erase RGB diff values when Alpha diff is 0. However, Android's
-                                    // Canvas will crash if we try to draw a non-premultiplied bitmap.
-                                    // Since we just forced all alpha values to 255 (fully opaque) in the
-                                    // loop above, we can safely mark it as premultiplied again here.
-                                    diffImg.isPremultiplied = true
-                                    callback?.onImageResult("Diff", diffImg)
-                                    resultManager.saveImage("${testFullName}_diff", diffImg)
-
-                                    if (hasAlphaDiff) {
-                                        val alphaDiffImg = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888)
-                                        alphaDiffImg.setPixels(alphaPixels, 0, width, 0, 0, width, height)
-                                        callback?.onImageResult("Alpha Diff", alphaDiffImg)
-                                        resultManager.saveImage("${testFullName}_alpha_diff", alphaDiffImg)
-                                    }
+                                    callback?.onImageResult("Diff", result.diffImage!!)
+                                    resultManager.saveImage("${testFullName}_diff", result.diffImage!!)
                                 }
                              }
                         } else {
                             callback?.onStatusChanged("Failed to load golden")
                         }
                     } else {
-                        Log.w("ValidationRunner", "Golden not found: ${goldenFile?.absolutePath}")
+                        Log.w("ValidationRunner", "Golden not found: ${goldenFile.absolutePath}")
                         callback?.onStatusChanged("Golden not found")
                     }
                 }

android/samples/sample-render-validation/src/main/res/layout/activity_main.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
+<androidx.constraintlayout.widget.ConstraintLayout 
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
@@ -10,8 +10,6 @@
         android:layout_width="0dp"
         android:layout_height="0dp"
         app:layout_constraintDimensionRatio="1:1"
-        app:layout_constraintWidth_percent="0.6"
-        android:layout_marginTop="32dp"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent">
@@ -22,110 +20,10 @@
             android:layout_height="match_parent" />
     </FrameLayout>
 
-    <LinearLayout
-        android:id="@+id/controls_container"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:paddingStart="20dp"
-        android:paddingEnd="20dp"
-        android:paddingTop="20dp"
-        android:paddingBottom="0dp"
-        app:layout_constraintTop_toBottomOf="@id/surface_container"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent">
-
-        <TextView
-            android:id="@+id/status_text"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="Initializing..."
-            android:textSize="12sp" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical"
-            android:paddingTop="10dp"
-            android:paddingBottom="10dp">
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal"
-                android:gravity="center_vertical"
-                android:paddingBottom="8dp">
-
-                <com.google.android.material.button.MaterialButton
-                    android:id="@+id/run_button"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    style="@style/Widget.Material3.Button"
-                    android:text="Run Test" />
-
-                <com.google.android.material.button.MaterialButton
-                    android:id="@+id/load_button"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    style="@style/Widget.Material3.Button.TonalButton"
-                    android:text="Load Test"
-                    android:layout_marginStart="8dp"/>
-
-                <com.google.android.material.button.MaterialButton
-                    android:id="@+id/options_button"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    style="@style/Widget.Material3.Button.IconButton.Outlined"
-                    app:icon="@android:drawable/ic_menu_more"
-                    android:contentDescription="More Options"
-                    android:layout_marginStart="8dp"/>
-            </LinearLayout>
-
-            <!-- Global Enhancement Controls (Hidden by default) -->
-            <LinearLayout
-                android:id="@+id/enhancement_container"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal"
-                android:gravity="center_vertical"
-                android:visibility="gone"
-                android:paddingBottom="8dp">
-
-                <TextView
-                    android:id="@+id/enhancement_label"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="Enhancement: 1.0x"
-                    android:textSize="12sp"
-                    android:minWidth="120dp" />
-
-                <SeekBar
-                    android:id="@+id/enhancement_slider"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:max="100"
-                    android:progress="0" />
-            </LinearLayout>
-        </LinearLayout>
-
-        <TextView
-            android:id="@+id/test_results_header"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="Test Results"
-            android:gravity="center"
-            android:textSize="14sp"
-            android:paddingTop="0dp"
-            android:paddingBottom="8dp" />
-
-    </LinearLayout>
-
     <ScrollView
         android:layout_width="0dp"
         android:layout_height="0dp"
-        app:layout_constraintTop_toBottomOf="@id/controls_container"
+        app:layout_constraintTop_toBottomOf="@id/surface_container"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent">
@@ -134,9 +32,41 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical"
-            android:paddingStart="20dp"
-            android:paddingEnd="20dp"
-            android:paddingBottom="20dp">
+            android:padding="20dp">
+
+            <TextView
+                android:id="@+id/status_text"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="Initializing..."
+                android:textSize="14sp" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                android:paddingTop="10dp"
+                android:paddingBottom="10dp">
+
+                <Spinner
+                    android:id="@+id/mode_spinner"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content" />
+
+                <Button
+                    android:id="@+id/run_button"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="Run" />
+            </LinearLayout>
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="Test Results"
+                android:textSize="18sp"
+                android:paddingTop="20dp"
+                android:paddingBottom="10dp" />
 
             <LinearLayout
                 android:id="@+id/results_container"
@@ -144,6 +74,7 @@
                 android:layout_height="wrap_content"
                 android:orientation="vertical" />
 
+
         </LinearLayout>
     </ScrollView>
 

android/samples/sample-render-validation/src/main/res/layout/dialog_image_viewer.xml

@@ -1,130 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    android:background="#FF202020"
-    android:padding="8dp">
-
-    <!-- Header with title and close button -->
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:gravity="center_vertical">
-
-        <TextView
-            android:id="@+id/dialog_title"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:text="Test Result"
-            android:textColor="#FFFFFF"
-            android:textSize="16sp"
-            android:textStyle="bold" />
-        <ImageButton
-            android:id="@+id/btn_close"
-            android:layout_width="48dp"
-            android:layout_height="48dp"
-            android:background="?attr/selectableItemBackgroundBorderless"
-            android:src="@android:drawable/ic_menu_close_clear_cancel" />
-    </LinearLayout>
-
-    <!-- Subtitle for Image Type -->
-    <TextView
-        android:id="@+id/dialog_image_type"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="start"
-        android:text="Rendered"
-        android:textColor="#BBBBBB"
-        android:textSize="14sp"
-        android:paddingBottom="8dp" />
-
-    <!-- Image Area with Arrows -->
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-      <FrameLayout
-          android:layout_width="0dp"
-          android:layout_height="0dp"
-          app:layout_constraintTop_toTopOf="parent"
-          app:layout_constraintBottom_toBottomOf="parent"
-          app:layout_constraintStart_toStartOf="parent"
-          app:layout_constraintEnd_toEndOf="parent"
-          app:layout_constraintDimensionRatio="1:1">
-        <ImageView
-            android:id="@+id/dialog_image"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:scaleType="matrix" />
-      </FrameLayout>
-    </androidx.constraintlayout.widget.ConstraintLayout> 
-
-    <!-- Navigation Arrows -->
-    <LinearLayout
-        android:id="@+id/dialog_arrow_container"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:gravity="center"
-        android:paddingTop="8dp"
-        android:paddingBottom="8dp">
-
-        <ImageButton
-            android:id="@+id/btn_prev"
-            android:layout_width="64dp"
-            android:layout_height="64dp"
-            android:background="?attr/selectableItemBackgroundBorderless"
-            android:src="@android:drawable/ic_media_previous"
-            app:tint="#FFFFFF" />
-
-        <ImageButton
-            android:id="@+id/btn_reset"
-            android:layout_width="48dp"
-            android:layout_height="48dp"
-            android:layout_marginHorizontal="16dp"
-            android:background="?attr/selectableItemBackgroundBorderless"
-            android:src="@android:drawable/ic_menu_revert"
-            app:tint="#FFFFFF" />
-
-        <ImageButton
-            android:id="@+id/btn_next"
-            android:layout_width="64dp"
-            android:layout_height="64dp"
-            android:background="?attr/selectableItemBackgroundBorderless"
-            android:src="@android:drawable/ic_media_next"
-            app:tint="#FFFFFF" />
-    </LinearLayout>
-
-    <!-- Enhancement Controls (only for diff images) -->
-    <LinearLayout
-        android:id="@+id/dialog_enhancement_container"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:gravity="center_vertical"
-        android:paddingTop="12dp"
-        android:paddingBottom="8dp"
-        android:visibility="gone">
-
-        <TextView
-            android:id="@+id/dialog_enhancement_label"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="Enhance: 1.0x"
-            android:textColor="#FFFFFF"
-            android:textSize="12sp"
-            android:minWidth="100dp" />
-
-        <SeekBar
-            android:id="@+id/dialog_enhancement_slider"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:max="100"
-            android:progress="0" />
-    </LinearLayout>
-
-</LinearLayout>

android/samples/sample-stream-test/build.gradle

@@ -1,7 +1,7 @@
 plugins {
     id 'com.android.application'
     id 'kotlin-android'
-    id 'com.google.android.filament-tools'
+    id 'filament-plugin'
 }
 
 project.ext.isSample = true

android/samples/sample-texture-target/build.gradle

@@ -1,7 +1,7 @@
 plugins {
     id 'com.android.application'
     id 'kotlin-android'
-    id 'com.google.android.filament-tools'
+    id 'filament-plugin'
 }
 
 project.ext.isSample = true

android/samples/sample-texture-view/build.gradle

@@ -1,7 +1,7 @@
 plugins {
     id 'com.android.application'
     id 'kotlin-android'
-    id 'com.google.android.filament-tools'
+    id 'filament-plugin'
 }
 
 project.ext.isSample = true

android/samples/sample-textured-object/build.gradle

@@ -1,7 +1,7 @@
 plugins {
     id 'com.android.application'
     id 'kotlin-android'
-    id 'com.google.android.filament-tools'
+    id 'filament-plugin'
 }
 
 project.ext.isSample = true

android/samples/sample-transparent-view/build.gradle

@@ -1,7 +1,7 @@
 plugins {
     id 'com.android.application'
     id 'kotlin-android'
-    id 'com.google.android.filament-tools'
+    id 'filament-plugin'
 }
 
 project.ext.isSample = true

android/settings.gradle

@@ -1,8 +1,3 @@
-// Filament tools plugin
-pluginManagement {
-    includeBuild 'gradle-plugin'
-}
-
 // Libraries
 include ':filament-android'
 include ':filamat-android'

build/common/upload-release-assets/package-lock.json

@@ -235,9 +235,9 @@
       "license": "MIT"
     },
     "node_modules/minimatch": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.3.tgz",
-      "integrity": "sha512-M2GCs7Vk83NxkUyQV1bkABc4yxgz9kILhHImZiBPAZ9ybuvCb0/H7lEl5XvIg3g+9d4eNotkZA5IWwYl0tibaA==",
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
       "dependencies": {
         "brace-expansion": "^1.1.7"
       },
@@ -429,9 +429,9 @@
       "integrity": "sha512-nGqtvLrj5w0naR6tDPfB4cUmYCqouzyQiz6C5y/LtcDllJdrcc6WaWW6iXyIIOErTa/XRybj28aasdn4LkVk6Q=="
     },
     "minimatch": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.3.tgz",
-      "integrity": "sha512-M2GCs7Vk83NxkUyQV1bkABc4yxgz9kILhHImZiBPAZ9ybuvCb0/H7lEl5XvIg3g+9d4eNotkZA5IWwYl0tibaA==",
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
       "requires": {
         "brace-expansion": "^1.1.7"
       }

build/toolchain-aarch64-linux-android.cmake

@@ -46,7 +46,6 @@ list(SORT NDK_VERSIONS)
 list(GET NDK_VERSIONS -1 NDK_VERSION)
 get_filename_component(NDK_VERSION ${NDK_VERSION} NAME)
 set(TOOLCHAIN ${ANDROID_HOME_UNIX}/ndk/${NDK_VERSION}/toolchains/llvm/prebuilt/${HOST_NAME_L}-x86_64)
-set(CMAKE_ANDROID_NDK_VERSION ${NDK_VERSION})
 
 # specify the cross compiler
 set(COMPILER_SUFFIX)

build/toolchain-arm7-linux-android.cmake

@@ -47,7 +47,6 @@ list(SORT NDK_VERSIONS)
 list(GET NDK_VERSIONS -1 NDK_VERSION)
 get_filename_component(NDK_VERSION ${NDK_VERSION} NAME)
 set(TOOLCHAIN ${ANDROID_HOME_UNIX}/ndk/${NDK_VERSION}/toolchains/llvm/prebuilt/${HOST_NAME_L}-x86_64)
-set(CMAKE_ANDROID_NDK_VERSION ${NDK_VERSION})
 
 # specify the cross compiler
 set(COMPILER_SUFFIX)

build/toolchain-x86-linux-android.cmake

@@ -46,7 +46,6 @@ list(SORT NDK_VERSIONS)
 list(GET NDK_VERSIONS -1 NDK_VERSION)
 get_filename_component(NDK_VERSION ${NDK_VERSION} NAME)
 set(TOOLCHAIN ${ANDROID_HOME_UNIX}/ndk/${NDK_VERSION}/toolchains/llvm/prebuilt/${HOST_NAME_L}-x86_64)
-set(CMAKE_ANDROID_NDK_VERSION ${NDK_VERSION})
 
 # specify the cross compiler
 set(COMPILER_SUFFIX)

build/toolchain-x86_64-linux-android.cmake

@@ -46,7 +46,6 @@ list(SORT NDK_VERSIONS)
 list(GET NDK_VERSIONS -1 NDK_VERSION)
 get_filename_component(NDK_VERSION ${NDK_VERSION} NAME)
 set(TOOLCHAIN ${ANDROID_HOME_UNIX}/ndk/${NDK_VERSION}/toolchains/llvm/prebuilt/${HOST_NAME_L}-x86_64)
-set(CMAKE_ANDROID_NDK_VERSION ${NDK_VERSION})
 
 # specify the cross compiler
 set(COMPILER_SUFFIX)

docs/dup/intro.html

@@ -181,7 +181,7 @@ important for <code>matc</code> (material compiler).</p>
 }
 
 dependencies {
-    implementation 'com.google.android.filament:filament-android:1.70.0'
+    implementation 'com.google.android.filament:filament-android:1.69.3'
 }
 </code></pre>
 <p>Here are all the libraries available in the group <code>com.google.android.filament</code>:</p>
@@ -195,7 +195,7 @@ dependencies {
 </div>
 <h3 id="ios"><a class="header" href="#ios">iOS</a></h3>
 <p>iOS projects can use CocoaPods to install the latest release:</p>
-<pre><code class="language-shell">pod 'Filament', '~&gt; 1.70.0'
+<pre><code class="language-shell">pod 'Filament', '~&gt; 1.69.3'
 </code></pre>
 <h2 id="documentation"><a class="header" href="#documentation">Documentation</a></h2>
 <ul>

docs/dup/test_ci_renderdiff.html

@@ -225,10 +225,9 @@ into <strong>branch</strong> of <code>filament-assets</code>. This branch is pai
 <code>filament</code> repo.</p>
 <p>As an example, imagine I am working on a PR, and I've uploaded my change, which is in a
 branch called <code>my-pr-branch</code>, to <code>filament</code>. This PR requires updating the golden. We would do
-it in the following fashion on a macOS machine:</p>
+it in the following fashion</p>
 <h3 id="using-a-script-to-update-the-golden-repo"><a class="header" href="#using-a-script-to-update-the-golden-repo">Using a script to update the golden repo</a></h3>
 <ul>
-<li>Make sure you've completed the steps in 'Setting up python'</li>
 <li>Run interactive mode in the <code>update_golden.py</code> script.
 <pre><code>python3 test/renderdiff/src/update_golden.py
 </code></pre>
@@ -264,27 +263,6 @@ branch of the golden repo (i.e. <code>my-pr-branch-golden</code>).</li>
 <li>If the PR is merged, then there is another workflow that will merge <code>my-pr-branch-golden</code>
 to the <code>main</code> branch of the golden repo.</li>
 </ul>
-<h3 id="automated-update-via-commit-message"><a class="header" href="#automated-update-via-commit-message">Automated update via commit message</a></h3>
-<p>Alternatively, if you are confident in your changes and want the CI to handle the update
-for you, you can use the following tag in your commit message:</p>
-<ul>
-<li>In the commit message of your working branch on <code>filament</code>, add the following line:
-<pre><code>RDIFF_ACCEPT_NEW_GOLDENS
-</code></pre>
-</li>
-</ul>
-<p>This has the following effects:</p>
-<ul>
-<li>The presubmit test <code>test-renderdiff</code> will be bypassed (it will not perform rendering or
-comparison).</li>
-<li>When the PR is merged, the postsubmit CI will automatically:
-<ol>
-<li>Build Filament and generate the new images.</li>
-<li>Upload them to a temporary branch in <code>filament-assets</code>.</li>
-<li>Merge that branch into <code>main</code>.</li>
-</ol>
-</li>
-</ul>
 <h2 id="viewing-test-results"><a class="header" href="#viewing-test-results">Viewing test results</a></h2>
 <p>We provide a viewer for looking at the result of a test run. The viewer is a webapp that can
 be used by pointing your browser to a localhost port. If you input the viewer with a PR or a

filament/CMakeLists.txt

@@ -93,7 +93,6 @@ set(SRCS
         src/MorphTargetBuffer.cpp
         src/PostProcessManager.cpp
         src/ProgramSpecialization.cpp
-        src/LocalProgramCache.cpp
         src/RenderPass.cpp
         src/RenderPrimitive.cpp
         src/RenderTarget.cpp
@@ -187,7 +186,6 @@ set(PRIVATE_HDRS
         src/MaterialCache.h
         src/MaterialDefinition.h
         src/MaterialParser.h
-        src/LocalProgramCache.h
         src/MaterialInstanceManager.h
         src/PIDController.h
         src/PostProcessManager.h

filament/backend/CMakeLists.txt

@@ -564,169 +564,170 @@ endif()
 # ==================================================================================================
 # Test
 # ==================================================================================================
-if (FILAMENT_BUILD_TESTING)
-    option(INSTALL_BACKEND_TEST "Install the backend test library so it can be consumed on iOS" OFF)
+option(INSTALL_BACKEND_TEST "Install the backend test library so it can be consumed on iOS" OFF)
 
-    if (APPLE OR LINUX)
-        set(BACKEND_TEST_SRC
-            test/BackendTest.cpp
-            test/ShaderGenerator.cpp
-            test/TrianglePrimitive.cpp
-            test/Arguments.cpp
-            test/ImageExpectations.cpp
-            test/Lifetimes.cpp
-            test/PlatformRunner.cpp
-            test/Shader.cpp
-            test/SharedShaders.cpp
-            test/Skip.cpp
-            test/test_Autoresolve.cpp
-            test/test_FeedbackLoops.cpp
-            test/test_Blit.cpp
-            test/test_MissingRequiredAttributes.cpp
-            test/test_ReadPixels.cpp
-            test/test_ReadTexture.cpp
-            test/test_BufferUpdates.cpp
-            test/test_Callbacks.cpp
-            test/test_JobQueue.cpp
-            test/test_MemoryMappedBuffer.cpp
-            test/test_MsaaSwapChain.cpp
-            test/test_MRT.cpp
-            test/test_PushConstants.cpp
-            test/test_LoadImage.cpp
-            test/test_StencilBuffer.cpp
-            test/test_Scissor.cpp
-            test/test_MipLevels.cpp
-            test/test_Handles.cpp
-            test/test_CircularBuffer.cpp
-            test/test_CommandBufferQueue.cpp
-            test/test_Template.cpp
-            test/test_Platform.cpp
-        )
-        if (FILAMENT_SUPPORTS_WEBGPU)
-            list(APPEND BACKEND_TEST_SRC
-                    test/test_WebGPUAsyncTaskCounter.cpp
-                    test/test_WebGPUComposeSwizzle.cpp)
-        endif()
-        if (APPLE)
-            # Metal-specific tests
-            list(APPEND BACKEND_TEST_SRC
-                test/test_MetalBlitter.mm
-            )
-        endif()
-        set(BACKEND_TEST_LIBS
-            absl::str_format
-            backend
-            gtest
-            imageio
-            filamat
-            SPIRV
-            spirv-cross-glsl)
-        # Create input/output directories for test result images.
-        file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/images/actual_images)
-        file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/images/diff_images)
-        file(COPY test/expected_images DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/images)
-    endif()
-
-    # TODO: Disabling IOS test due to breakage wrt glslang update
-    if (APPLE AND NOT IOS)
-        # TODO: we should expand this test to Linux and other platforms.
+if (APPLE OR LINUX)
+    set(BACKEND_TEST_SRC
+        test/BackendTest.cpp
+        test/ShaderGenerator.cpp
+        test/TrianglePrimitive.cpp
+        test/Arguments.cpp
+        test/ImageExpectations.cpp
+        test/Lifetimes.cpp
+        test/PlatformRunner.cpp
+        test/Shader.cpp
+        test/SharedShaders.cpp
+        test/Skip.cpp
+        test/test_Autoresolve.cpp
+        test/test_FeedbackLoops.cpp
+        test/test_Blit.cpp
+        test/test_MissingRequiredAttributes.cpp
+        test/test_ReadPixels.cpp
+        test/test_ReadTexture.cpp
+        test/test_BufferUpdates.cpp
+        test/test_Callbacks.cpp
+        test/test_JobQueue.cpp
+        test/test_MemoryMappedBuffer.cpp
+        test/test_MsaaSwapChain.cpp
+        test/test_MRT.cpp
+        test/test_PushConstants.cpp
+        test/test_LoadImage.cpp
+        test/test_StencilBuffer.cpp
+        test/test_Scissor.cpp
+        test/test_MipLevels.cpp
+        test/test_Handles.cpp
+        test/test_CircularBuffer.cpp
+        test/test_CommandBufferQueue.cpp
+        test/test_Template.cpp
+    )
+    if (FILAMENT_SUPPORTS_WEBGPU)
         list(APPEND BACKEND_TEST_SRC
-            test/test_RenderExternalImage.cpp)
-        add_library(backend_test STATIC ${BACKEND_TEST_SRC})
-        target_link_libraries(backend_test PUBLIC ${BACKEND_TEST_LIBS})
-        target_compile_options(backend_test PRIVATE "-fobjc-arc")
+                test/test_WebGPUAsyncTaskCounter.cpp
+                test/test_WebGPUComposeSwizzle.cpp)
+    endif()
+    if (APPLE)
+        # Metal-specific tests
+        list(APPEND BACKEND_TEST_SRC
+            test/test_MetalBlitter.mm
+        )
+    endif()
+    set(BACKEND_TEST_LIBS
+        absl::str_format
+        backend
+        getopt
+        gtest
+        imageio
+        filamat
+        SPIRV
+        spirv-cross-glsl)
+    # Create input/output directories for test result images.
+    file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/images/actual_images)
+    file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/images/diff_images)
+    file(COPY test/expected_images DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/images)
+endif()
 
-        set(BACKEND_TEST_DEPS
-                OSDependent
-                SPIRV
-                SPIRV-Tools
-                SPIRV-Tools-opt
-                backend_test
-                getopt
-                gtest
-                glslang
-                spirv-cross-core
-                spirv-cross-glsl
-                spirv-cross-msl)
+# TODO: Disabling IOS test due to breakage wrt glslang update
+if (APPLE AND NOT IOS)
+    # TODO: we should expand this test to Linux and other platforms.
+    list(APPEND BACKEND_TEST_SRC
+         test/test_RenderExternalImage.cpp)
+    add_library(backend_test STATIC ${BACKEND_TEST_SRC})
+    target_link_libraries(backend_test PUBLIC ${BACKEND_TEST_LIBS})
+    target_compile_options(backend_test PRIVATE "-fobjc-arc")
 
-        if (NOT IOS)
-            target_link_libraries(backend_test PRIVATE image imageio)
-            list(APPEND BACKEND_TEST_DEPS image)
-        endif()
-        if (FILAMENT_SUPPORTS_WEBGPU)
-            target_link_libraries(backend_test PRIVATE webgpu_dawn dawncpp_headers)
-            list(APPEND BACKEND_TEST_DEPS webgpu_dawn dawncpp_headers)
-        endif()
+    set(BACKEND_TEST_DEPS
+            OSDependent
+            SPIRV
+            SPIRV-Tools
+            SPIRV-Tools-opt
+            backend_test
+            getopt
+            gtest
+            glslang
+            spirv-cross-core
+            spirv-cross-glsl
+            spirv-cross-msl)
 
-        set(BACKEND_TEST_COMBINED_OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/libbackendtest_combined.a")
-        combine_static_libs(backend_test "${BACKEND_TEST_COMBINED_OUTPUT}" "${BACKEND_TEST_DEPS}")
-
-        set(BACKEND_TEST_LIB_NAME ${CMAKE_STATIC_LIBRARY_PREFIX}backend_test${CMAKE_STATIC_LIBRARY_SUFFIX})
-
-        if (INSTALL_BACKEND_TEST)
-            install(FILES "${BACKEND_TEST_COMBINED_OUTPUT}" DESTINATION lib/${DIST_DIR} RENAME ${BACKEND_TEST_LIB_NAME})
-            install(FILES test/PlatformRunner.h DESTINATION include/backend_test)
-        endif()
-
-        set_target_properties(backend_test PROPERTIES FOLDER Tests)
-
-        if (APPLE AND NOT IOS)
-            add_executable(backend_test_mac test/mac_runner.mm)
-            target_link_libraries(backend_test_mac PRIVATE "-framework Metal -framework AppKit -framework QuartzCore")
-            # Because each test case is a separate file, the -force_load flag is necessary to prevent the
-            # linker from removing "unused" symbols.
-            target_link_libraries(backend_test_mac PRIVATE -force_load backend_test)
-            set_target_properties(backend_test_mac PROPERTIES FOLDER Tests)
-
-            # This is needed after XCode 15.3
-            set_target_properties(backend_test_mac PROPERTIES BUILD_WITH_INSTALL_RPATH TRUE)
-            set_target_properties(backend_test_mac PROPERTIES INSTALL_RPATH /usr/local/lib)
-        endif()
+    if (NOT IOS)
+        target_link_libraries(backend_test PRIVATE image imageio)
+        list(APPEND BACKEND_TEST_DEPS image)
+    endif()
+    if (FILAMENT_SUPPORTS_WEBGPU)
+        target_link_libraries(backend_test PRIVATE webgpu_dawn dawncpp_headers)
+        list(APPEND BACKEND_TEST_DEPS webgpu_dawn dawncpp_headers)
     endif()
 
-    if (LINUX)
-        add_executable(backend_test_linux test/linux_runner.cpp ${BACKEND_TEST_SRC})
-        target_link_libraries(backend_test_linux PRIVATE ${BACKEND_TEST_LIBS})
-        set_target_properties(backend_test_linux PROPERTIES FOLDER Tests)
-        if (FILAMENT_SUPPORTS_WEBGPU)
-            target_link_libraries(backend_test_linux PRIVATE webgpu_dawn dawncpp_headers)
-        endif()
+    set(BACKEND_TEST_COMBINED_OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/libbackendtest_combined.a")
+    combine_static_libs(backend_test "${BACKEND_TEST_COMBINED_OUTPUT}" "${BACKEND_TEST_DEPS}")
+
+    set(BACKEND_TEST_LIB_NAME ${CMAKE_STATIC_LIBRARY_PREFIX}backend_test${CMAKE_STATIC_LIBRARY_SUFFIX})
+
+    if (INSTALL_BACKEND_TEST)
+        install(FILES "${BACKEND_TEST_COMBINED_OUTPUT}" DESTINATION lib/${DIST_DIR} RENAME ${BACKEND_TEST_LIB_NAME})
+        install(FILES test/PlatformRunner.h DESTINATION include/backend_test)
     endif()
 
-    # ==================================================================================================
-    # Compute tests
-    #
-    #if (NOT IOS AND NOT WEBGL)
-    #
-    #add_executable(compute_test
-    #        test/ComputeTest.cpp
-    #        test/Arguments.cpp
-    #        test/test_ComputeBasic.cpp
-    #        )
-    #
-    #target_link_libraries(compute_test PRIVATE
-    #        backend
-    #        getopt
-    #        gtest
-    #        )
-    #
-    #set_target_properties(compute_test PROPERTIES FOLDER Tests)
-    #
-    #endif()
-
-    # ==================================================================================================
-    # Metal utils tests
+    set_target_properties(backend_test PROPERTIES FOLDER Tests)
 
     if (APPLE AND NOT IOS)
-        add_executable(metal_utils_test test/MetalTest.mm)
+       add_executable(backend_test_mac test/mac_runner.mm)
+       target_link_libraries(backend_test_mac PRIVATE "-framework Metal -framework AppKit -framework QuartzCore")
+       # Because each test case is a separate file, the -force_load flag is necessary to prevent the
+       # linker from removing "unused" symbols.
+       target_link_libraries(backend_test_mac PRIVATE -force_load backend_test)
+       set_target_properties(backend_test_mac PROPERTIES FOLDER Tests)
 
-        target_compile_options(metal_utils_test PRIVATE "-fobjc-arc")
-
-        target_link_libraries(metal_utils_test PRIVATE
-                backend
-                gtest
-                )
-
-        set_target_properties(metal_utils_test PROPERTIES FOLDER Tests)
+       # This is needed after XCode 15.3
+       set_target_properties(backend_test_mac PROPERTIES BUILD_WITH_INSTALL_RPATH TRUE)
+       set_target_properties(backend_test_mac PROPERTIES INSTALL_RPATH /usr/local/lib)
     endif()
 endif()
+
+if (LINUX)
+    add_executable(backend_test_linux test/linux_runner.cpp ${BACKEND_TEST_SRC})
+    target_link_libraries(backend_test_linux PRIVATE ${BACKEND_TEST_LIBS})
+    set_target_properties(backend_test_linux PROPERTIES FOLDER Tests)
+    if (FILAMENT_SUPPORTS_WEBGPU)
+        target_link_libraries(backend_test_linux PRIVATE webgpu_dawn dawncpp_headers)
+    endif()
+endif()
+
+# ==================================================================================================
+# Compute tests
+#
+#if (NOT IOS AND NOT WEBGL)
+#
+#add_executable(compute_test
+#        test/ComputeTest.cpp
+#        test/Arguments.cpp
+#        test/test_ComputeBasic.cpp
+#        )
+#
+#target_link_libraries(compute_test PRIVATE
+#        backend
+#        getopt
+#        gtest
+#        )
+#
+#set_target_properties(compute_test PROPERTIES FOLDER Tests)
+#
+#endif()
+
+# ==================================================================================================
+# Metal utils tests
+
+if (APPLE AND NOT IOS)
+
+add_executable(metal_utils_test test/MetalTest.mm)
+
+target_compile_options(metal_utils_test PRIVATE "-fobjc-arc")
+
+target_link_libraries(metal_utils_test PRIVATE
+        backend
+        getopt
+        gtest
+        )
+
+set_target_properties(metal_utils_test PROPERTIES FOLDER Tests)
+
+endif()

filament/backend/include/backend/Platform.h

@@ -216,17 +216,6 @@ public:
         MULTIVIEW,
     };
 
-    /**
-     * Types of device/driver information that can be queried from the platform.
-     */
-    enum class DeviceInfoType {
-        OPENGL_RENDERER,    //!< glGetString(GL_RENDERER)
-        OPENGL_VENDOR,      //!< glGetString(GL_VENDOR)
-        VULKAN_DEVICE_NAME, //!< VkPhysicalDeviceProperties::deviceName
-        VULKAN_DRIVER_NAME, //!< VkPhysicalDeviceDriverProperties::driverName
-        VULKAN_DRIVER_INFO, //!< VkPhysicalDeviceDriverProperties::driverInfo
-    };
-
     /**
      * This controls the priority level for GPU work scheduling, which helps prioritize the
      * submitted GPU work and enables preemption.
@@ -327,7 +316,7 @@ 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).
          */
@@ -388,16 +377,6 @@ public:
      */
     virtual int getOSVersion() const noexcept = 0;
 
-    /**
-     * Queries device/driver information of the graphics API.
-     * @param infoType the type of information to query.
-     * @param driver a pointer to the current driver.
-     * @return a CString containing the requested information.
-     */
-    virtual utils::CString getDeviceInfo(DeviceInfoType infoType,
-            Driver* UTILS_NULLABLE driver) const noexcept = 0;
-
-
     /**
      * Creates and initializes the low-level API (e.g. an OpenGL context or Vulkan instance),
      * then creates the concrete Driver.

filament/backend/include/backend/platforms/OpenGLPlatform.h

@@ -52,9 +52,6 @@ protected:
 
     ~OpenGLPlatform() noexcept override;
 
-    utils::CString getDeviceInfo(DeviceInfoType infoType,
-            Driver* UTILS_NULLABLE driver) const noexcept override;
-
 public:
     struct ExternalTexture {
         unsigned int target; // GLenum target

filament/backend/include/backend/platforms/PlatformEGL.h

@@ -159,12 +159,6 @@ protected:
     EGLConfig getEglConfig() const noexcept { return mEGLConfig; }
     EGLConfig getSuitableConfigForSwapChain(uint64_t flags, bool window, bool pbuffer) const;
 
-    // Sets the EGLDisplay to be used by this platform. This should only be called by derived 
-    // classes before invoking createDriver. Calling it after that point will result in 
-    // undefined behaviour. This class will take ownership of the display and call eglTerminate
-    // on it during shutdown.
-    void setEglDisplay(EGLDisplay display) noexcept;
- 
     // supported extensions detected at runtime
     struct {
         struct {

filament/backend/include/backend/platforms/PlatformMetal.h

@@ -38,7 +38,6 @@ public:
 
     Driver* createDriver(void* sharedContext, const Platform::DriverConfig& driverConfig) override;
     int getOSVersion() const noexcept override { return 0; }
-    utils::CString getDeviceInfo(DeviceInfoType, Driver*) const noexcept override { return {}; }
 
     /**
      * Optionally initializes the Metal platform by acquiring resources necessary for rendering.

filament/backend/include/backend/platforms/VulkanPlatform.h

@@ -143,8 +143,6 @@ public:
         return 0;
     }
 
-    utils::CString getDeviceInfo(DeviceInfoType infoType, Driver* driver) const noexcept override;
-
     // ----------------------------------------------------
     // ---------- Platform Customization options ----------
     struct Customization {

filament/backend/include/backend/platforms/WebGPUPlatform.h

@@ -46,9 +46,6 @@ public:
     ~WebGPUPlatform() override = default;
 
     [[nodiscard]] int getOSVersion() const noexcept final { return 0; }
-    [[nodiscard]] utils::CString getDeviceInfo(DeviceInfoType, Driver*) const noexcept override {
-        return {};
-    }
 
     [[nodiscard]] wgpu::Instance& getInstance() noexcept { return mInstance; }
 

filament/backend/include/private/backend/CommandBufferQueue.h

@@ -27,6 +27,8 @@
 #include <stddef.h>
 #include <stdint.h>
 
+#include <functional>
+
 namespace filament::backend {
 
 /*
@@ -64,7 +66,7 @@ public:
 
     // all commands buffers (Slices) written to this point are returned by waitForCommand(). This
     // call blocks until the CircularBuffer has at least mRequiredSize bytes available.
-    void flush();
+    void flush(std::function<void(void*, void*)> const& debugPrintHistogram = nullptr);
 
     // returns from waitForCommands() immediately.
     void requestExit();

filament/backend/include/private/backend/CommandStream.h

@@ -56,6 +56,7 @@ namespace filament::backend {
 
 class CommandBase {
     static constexpr size_t FILAMENT_OBJECT_ALIGNMENT = alignof(std::max_align_t);
+    friend class CommandStream;
 
 protected:
     using Execute = Dispatcher::Execute;
@@ -168,8 +169,8 @@ struct CommandType<void (Driver::*)(ARGS...)> {
 
 class CustomCommand : public CommandBase {
     std::function<void()> mCommand;
-    static void execute(Driver&, CommandBase* base, intptr_t* next);
 public:
+    static void execute(Driver&, CommandBase* base, intptr_t* next);
     CustomCommand(CustomCommand&& rhs) = default;
 
     explicit CustomCommand(std::function<void()> cmd)
@@ -179,11 +180,12 @@ public:
 // ------------------------------------------------------------------------------------------------
 
 class NoopCommand : public CommandBase {
+public:
     intptr_t mNext;
     static void execute(Driver&, CommandBase* self, intptr_t* next) noexcept {
         *next = static_cast<NoopCommand*>(self)->mNext;
     }
-public:
+
     constexpr explicit NoopCommand(void* next) noexcept
             : CommandBase(execute), mNext(intptr_t((char *)next - (char *)this)) { }
 };
@@ -219,6 +221,36 @@ public:
 
     CircularBuffer const& getCircularBuffer() const noexcept { return mCurrentBuffer; }
 
+#if FILAMENT_DEBUG_COMMANDS_HISTOGRAM
+    using Execute = Dispatcher::Execute;
+    struct CommandInfo {
+        size_t size;
+        const char* name;
+        int index;
+    };
+    std::unordered_map<Execute, CommandInfo> mCommands;
+
+    void initializeLookup() {
+        int currentIndex = 0;
+#define DECL_DRIVER_API_SYNCHRONOUS(RetType, methodName, paramsDecl, params)
+#define DECL_DRIVER_API(methodName, paramsDecl, params)                                            \
+    mCommands[mDispatcher.methodName##_] = { CommandBase::align(sizeof(COMMAND_TYPE(methodName))), \
+        #methodName, currentIndex++ };
+#define DECL_DRIVER_API_RETURN(RetType, methodName, paramsDecl, params)                            \
+    mCommands[mDispatcher.methodName##_] = {                                                       \
+        CommandBase::align(sizeof(COMMAND_TYPE(methodName##R))), #methodName, currentIndex++       \
+    };
+
+#include "private/backend/DriverAPI.inc"
+
+        mCommands[CustomCommand::execute] = { CommandBase::align(sizeof(CustomCommand)),
+            "CustomCommand", currentIndex++ };
+
+        // NoopCommands have variable size. We will handle them specially using their mNext pointer.
+        mCommands[NoopCommand::execute] = { 0, "NoopCommand", currentIndex++ };
+    }
+#endif
+
 public:
 #define DECL_DRIVER_API(methodName, paramsDecl, params)                                         \
     inline void methodName(paramsDecl) noexcept {                                               \
@@ -263,6 +295,13 @@ public:
 
     void execute(void* buffer);
 
+#if FILAMENT_DEBUG_COMMANDS_HISTOGRAM
+    void debugIterateCommands(void* head, void* tail,
+            std::function<void(CommandInfo const& info)> const& callback);
+
+    void debugPrintHistogram(void* head, void* tail);
+#endif
+
     /*
      * queueCommand() allows to queue a lambda function as a command.
      * This is much less efficient than using the Driver* API.

filament/backend/include/private/backend/Driver.h

@@ -48,6 +48,11 @@
 
 #define FILAMENT_DEBUG_COMMANDS              FILAMENT_DEBUG_COMMANDS_NONE
 
+// Upon command stream overflow, print a histogram of commands
+#ifndef FILAMENT_DEBUG_COMMANDS_HISTOGRAM
+#define FILAMENT_DEBUG_COMMANDS_HISTOGRAM 0
+#endif
+
 namespace filament::backend {
 
 class BufferDescriptor;

filament/backend/include/private/backend/HandleAllocator.h

@@ -42,7 +42,7 @@
 #include <stdint.h>
 
 #define HandleAllocatorGL   HandleAllocator<32,  96, 184>    // ~4520 / pool / MiB
-#define HandleAllocatorVK   HandleAllocator<64, 160, 352>    // ~1820 / pool / MiB
+#define HandleAllocatorVK   HandleAllocator<64, 160, 312>    // ~1820 / pool / MiB
 #define HandleAllocatorMTL  HandleAllocator<32,  64, 552>    // ~1660 / pool / MiB
 // TODO WebGPU examine right size of handles
 #define HandleAllocatorWGPU HandleAllocator<64, 160, 552>    // ~1820 / pool / MiB

filament/backend/src/CommandBufferQueue.cpp

@@ -79,7 +79,7 @@ bool CommandBufferQueue::isExitRequested() const {
 }
 
 
-void CommandBufferQueue::flush() {
+void CommandBufferQueue::flush(std::function<void(void*, void*)> const& debugPrintHistogram) {
     FILAMENT_TRACING_CALL(FILAMENT_TRACING_CATEGORY_FILAMENT);
 
     CircularBuffer& circularBuffer = mCircularBuffer;
@@ -106,6 +106,13 @@ void CommandBufferQueue::flush() {
     std::unique_lock lock(mLock);
 
     // circular buffer is too small, we corrupted the stream
+#if FILAMENT_DEBUG_COMMANDS_HISTOGRAM
+    if (UTILS_VERY_UNLIKELY(used > mFreeSpace)) {
+        if (debugPrintHistogram) {
+            debugPrintHistogram(begin, end);
+        }
+    }
+#endif
     FILAMENT_CHECK_POSTCONDITION(used <= mFreeSpace) <<
             "Backend CommandStream overflow. Commands are corrupted and unrecoverable.\n"
             "Please increase minCommandBufferSizeMB inside the Config passed to Engine::create.\n"

filament/backend/src/CommandStream.cpp

@@ -30,6 +30,11 @@
 #include <utils/ostream.h>
 #include <utils/sstream.h>
 
+#if FILAMENT_DEBUG_COMMANDS_HISTOGRAM
+#include <algorithm>
+#include <vector>
+#endif
+
 #include <cstddef>
 #include <functional>
 #include <string>
@@ -83,6 +88,10 @@ CommandStream::CommandStream(Driver& driver, CircularBuffer& buffer) noexcept
     __system_property_get("debug.filament.perfcounters", property);
     mUsePerformanceCounter = bool(atoi(property));
 #endif
+
+#if FILAMENT_DEBUG_COMMANDS_HISTOGRAM
+    initializeLookup();
+#endif
 }
 
 void CommandStream::execute(void* buffer) {
@@ -126,6 +135,71 @@ void CommandStream::execute(void* buffer) {
     }
 }
 
+#if FILAMENT_DEBUG_COMMANDS_HISTOGRAM
+void CommandStream::debugIterateCommands(void* head, void* tail,
+        std::function<void(CommandInfo const& info)> const& callback) {
+    CommandBase* UTILS_RESTRICT base = static_cast<CommandBase*>(head);
+    auto p = base;
+    while (UTILS_LIKELY(p)) {
+        if (p >= tail) {
+            break;
+        }
+        Execute e = p->mExecute;
+
+        if (e == NoopCommand::execute) {
+            NoopCommand* noop = static_cast<NoopCommand*>(p);
+            size_t size = noop->mNext;
+            int noopIndex = mCommands[NoopCommand::execute].index;
+            callback({ size, "NoopCommand", noopIndex });
+            p = reinterpret_cast<CommandBase*>(reinterpret_cast<char*>(p) + size);
+            continue;
+        }
+
+        if (auto it = mCommands.find(e); it != mCommands.end()) {
+            size_t size = it->second.size;
+            callback(it->second);
+            p = reinterpret_cast<CommandBase*>(reinterpret_cast<char*>(p) + size);
+        } else {
+            LOG(ERROR) << "Cannot find command in lookup table";
+            return;
+        }
+    }
+}
+
+void CommandStream::debugPrintHistogram(void* head, void* tail) {
+    std::unordered_map<std::string_view, int> histogram;
+    std::unordered_map<int, int> index_histogram;
+    debugIterateCommands(head, tail, [&](CommandInfo const& info) {
+        histogram[std::string_view(info.name)]++;
+        index_histogram[info.index]++;
+    });
+
+    std::vector<std::pair<std::string_view, int>> sorted_histogram(histogram.begin(),
+            histogram.end());
+    std::sort(sorted_histogram.begin(), sorted_histogram.end(),
+            [](auto const& a, auto const& b) { return a.second > b.second; });
+
+    LOG(INFO) << "Command stream histogram:";
+    for (auto const& [name, count]: sorted_histogram) {
+        LOG(INFO) << name << ": " << count;
+    }
+
+    std::vector<std::pair<int, int>> sorted_index_histogram(index_histogram.begin(),
+            index_histogram.end());
+    std::sort(sorted_index_histogram.begin(), sorted_index_histogram.end(),
+            [](auto const& a, auto const& b) { return a.second > b.second; });
+
+    std::string short_histogram = "";
+    for (size_t i = 0, n = sorted_index_histogram.size(); i < n; ++i) {
+        short_histogram += std::to_string(sorted_index_histogram[i].first) + ":" +
+                           std::to_string(sorted_index_histogram[i].second);
+        short_histogram += (i < n - 1) ? ";" : ".";
+    }
+    LOG(INFO) << "CS hist: " << short_histogram;
+    LOG(INFO) << "";
+}
+#endif
+
 void CommandStream::queueCommand(std::function<void()> command) {
     new(allocateCommand(CustomCommand::align(sizeof(CustomCommand)))) CustomCommand(std::move(command));
 }

filament/backend/src/VirtualMachineEnv.cpp

@@ -25,11 +25,6 @@
 
 #include <mutex>
 
-#ifdef __ANDROID__
-#include <pthread.h>
-#endif
-
-
 namespace filament {
 
 using namespace utils;
@@ -110,21 +105,8 @@ JNIEnv* VirtualMachineEnv::getEnvironmentSlow() {
     FILAMENT_CHECK_PRECONDITION(mVirtualMachine)
             << "JNI_OnLoad() has not been called";
 
-#ifdef __ANDROID__
-    JavaVMAttachArgs args;
-    args.version = JNI_VERSION_1_6;
-    args.group = nullptr;
-    char threadName[16]; // pthread_getname_np returns at most 16 bytes
-    if (__builtin_available(android 26, *)) {
-        if (pthread_getname_np(pthread_self(), threadName, sizeof(threadName)) == 0) {
-            args.name = threadName;
-        } else {
-            args.name = nullptr;
-        }
-    } else {
-        args.name = nullptr;
-    }
-    jint const result = mVirtualMachine->AttachCurrentThread(&mJniEnv, &args);
+#if defined(__ANDROID__)
+    jint const result = mVirtualMachine->AttachCurrentThread(&mJniEnv, nullptr);
 #else
     jint const result = mVirtualMachine->AttachCurrentThread(reinterpret_cast<void**>(&mJniEnv), nullptr);
 #endif

filament/backend/src/noop/PlatformNoop.h

@@ -26,7 +26,6 @@ class PlatformNoop final : public Platform {
 public:
 
     int getOSVersion() const noexcept final { return 0; }
-    utils::CString getDeviceInfo(DeviceInfoType, Driver*) const noexcept override { return {}; }
 
     ~PlatformNoop() noexcept override = default;
 

filament/backend/src/opengl/GLDescriptorSet.cpp

@@ -341,44 +341,7 @@ void GLDescriptorSet::bind(
                 if (arg.handle) {
                     GLTexture const* const t = handleAllocator.handle_cast<GLTexture*>(arg.handle);
                     gl.bindTexture(unit, t->gl.target, t->gl.id, t->gl.external);
-                    SamplerParams params = arg.params;
-
-#if defined(__EMSCRIPTEN__)
-                    // From https://registry.khronos.org/OpenGL-Refpages/es2.0/
-                    // GLES 2.0 will draw mipmapped samplers as black if the following conditions are not met:
-                    //
-                    // "...if the width or height of a texture image are not powers of two and either the
-                    // GL_TEXTURE_MIN_FILTER is set to one of the functions that requires mipmaps or the
-                    // GL_TEXTURE_WRAP_S or GL_TEXTURE_WRAP_T is not set to GL_CLAMP_TO_EDGE, then the
-                    // texture image unit will return (R, G, B, A) = (0, 0, 0, 1)."
-                    //
-                    // "If the texture has dimensions w × h , there are [floor(log2(max(w, h))) + 1] mipmap levels.
-                    // Level 0 is the original texture; level [floor(log2(max(w, h)))] is the final 1 × 1 mipmap."
-                    // "Suppose that a texture is accessed from a fragment shader or vertex shader and has set GL_TEXTURE_MIN_FILTER
-                    // to one of the functions that requires mipmaps. If either the dimensions of the texture images currently
-                    // defined (with previous calls to glTexImage2D, glCompressedTexImage2D, or glCopyTexImage2D) do not follow
-                    // the proper sequence for mipmaps (described above), or there are fewer texture images defined than are needed,
-                    // or the set of texture images were defined with different formats or types, then the texture image unit
-                    // will return (R, G, B, A) = (0, 0, 0, 1)."
-                    //
-                    // So we force the sampler to a valid state in those cases.
-                    auto isPowerOfTwo = [](uint32_t x) -> bool { return (x & (x - 1)) == 0 && x > 0; };
-                    bool textureIsPowerOfTwo = isPowerOfTwo(t->width) && isPowerOfTwo(t->height);
-
-                    uint32_t requiredMipLevels = (std::floor(std::log2(std::max(t->width, std::max(t->height, t->depth)))) + 1);
-                    bool textureHasRequiredMipLevels = t->levels == requiredMipLevels;
-
-                    bool samplerCanBeInvalid = params.filterMin > SamplerMinFilter::LINEAR;
-                    if (samplerCanBeInvalid && (!textureIsPowerOfTwo || !textureHasRequiredMipLevels)) {
-                        if (params.filterMin == SamplerMinFilter::NEAREST_MIPMAP_NEAREST
-                            || params.filterMin == SamplerMinFilter::LINEAR_MIPMAP_NEAREST) {
-                            params.filterMin = SamplerMinFilter::NEAREST;
-                        } else {
-                            params.filterMin = SamplerMinFilter::LINEAR;
-                        }
-                    }
-#endif
-                    
+                    SamplerParams const params = arg.params;
                     glTexParameteri(t->gl.target, GL_TEXTURE_MIN_FILTER,
                             (GLint)GLUtils::getTextureFilter(params.filterMin));
                     glTexParameteri(t->gl.target, GL_TEXTURE_MAG_FILTER,

filament/backend/src/opengl/OpenGLContext.h

@@ -91,7 +91,7 @@ public:
         GLenum getIndicesType() const noexcept {
             return indicesType;
         }
-    };
+    } gl;
 
     static bool queryOpenGLVersion(GLint* major, GLint* minor) noexcept;
 

filament/backend/src/opengl/OpenGLDriver.cpp

@@ -716,11 +716,7 @@ Handle<HwSwapChain> OpenGLDriver::createSwapChainHeadlessS() noexcept {
 }
 
 Handle<HwTimerQuery> OpenGLDriver::createTimerQueryS() noexcept {
-    Handle<HwTimerQuery> tqh = initHandle<GLTimerQuery>();
-    // The state must be constructed here, as a synchronous call to getTimerQueryValue might happen
-    // before createTimerQueryR is executed on the backend thread.
-    handle_cast<GLTimerQuery*>(tqh)->state = std::make_shared<GLTimerQuery::State>();
-    return tqh;
+    return initHandle<GLTimerQuery>();
 }
 
 Handle<HwDescriptorSetLayout> OpenGLDriver::createDescriptorSetLayoutS() noexcept {

filament/backend/src/opengl/OpenGLPlatform.cpp

@@ -45,19 +45,6 @@ Driver* OpenGLPlatform::createDefaultDriver(OpenGLPlatform* platform,
 
 OpenGLPlatform::~OpenGLPlatform() noexcept = default;
 
-utils::CString OpenGLPlatform::getDeviceInfo(DeviceInfoType infoType,
-        Driver* driver) const noexcept {
-    switch (infoType) {
-        case DeviceInfoType::OPENGL_RENDERER:
-            return getRendererString(driver);
-        case DeviceInfoType::OPENGL_VENDOR:
-            return getVendorString(driver);
-        default:
-            FILAMENT_CHECK_POSTCONDITION(false) << "Unsupported DeviceInfoType for OpenGLPlatform";
-            return {};
-    }
-}
-
 utils::CString OpenGLPlatform::getVendorString(Driver const* driver) {
     auto const p = static_cast<OpenGLDriverBase const*>(driver);
 #if UTILS_HAS_RTTI

filament/backend/src/opengl/OpenGLTimerQuery.cpp

@@ -88,14 +88,15 @@ TimerQueryFactoryInterface::~TimerQueryFactoryInterface() = default;
 // This is a backend synchronous call
 TimerQueryResult TimerQueryFactoryInterface::getTimerQueryValue(
         GLTimerQuery* tq, uint64_t* elapsedTime) noexcept {
-    assert_invariant(tq->state);
-
-    int64_t const elapsed = tq->state->elapsed.load(std::memory_order_relaxed);
-    if (elapsed > 0) {
-        *elapsedTime = elapsed;
-        return TimerQueryResult::AVAILABLE;
+    if (UTILS_LIKELY(tq->state)) {
+        int64_t const elapsed = tq->state->elapsed.load(std::memory_order_relaxed);
+        if (elapsed > 0) {
+            *elapsedTime = elapsed;
+            return TimerQueryResult::AVAILABLE;
+        }
+        return TimerQueryResult(elapsed);
     }
-    return TimerQueryResult(elapsed);
+    return TimerQueryResult::ERROR;
 }
 
 // ------------------------------------------------------------------------------------------------
@@ -109,8 +110,9 @@ TimerQueryNativeFactory::TimerQueryNativeFactory(OpenGLContext& context)
 TimerQueryNativeFactory::~TimerQueryNativeFactory() = default;
 
 void TimerQueryNativeFactory::createTimerQuery(GLTimerQuery* tq) {
-    assert_invariant(tq->state);
+    assert_invariant(!tq->state);
 
+    tq->state = std::make_shared<GLTimerQuery::State>();
     mContext.procs.genQueries(1u, &tq->state->gl.query);
     CHECK_GL_ERROR()
 }
@@ -179,7 +181,8 @@ TimerQueryFenceFactory::~TimerQueryFenceFactory() {
 }
 
 void TimerQueryFenceFactory::createTimerQuery(GLTimerQuery* tq) {
-    assert_invariant(tq->state);
+    assert_invariant(!tq->state);
+    tq->state = std::make_shared<GLTimerQuery::State>();
 }
 
 void TimerQueryFenceFactory::destroyTimerQuery(GLTimerQuery* tq) {
@@ -235,7 +238,8 @@ TimerQueryFallbackFactory::TimerQueryFallbackFactory() = default;
 TimerQueryFallbackFactory::~TimerQueryFallbackFactory() = default;
 
 void TimerQueryFallbackFactory::createTimerQuery(GLTimerQuery* tq) {
-    assert_invariant(tq->state);
+    assert_invariant(!tq->state);
+    tq->state = std::make_shared<GLTimerQuery::State>();
 }
 
 void TimerQueryFallbackFactory::destroyTimerQuery(GLTimerQuery* tq) {

filament/backend/src/opengl/ShaderCompilerService.cpp

@@ -117,13 +117,6 @@ struct ShaderCompilerService::OpenGLProgramToken : ProgramToken {
         cond.wait(l, [this] { return signaled; });
     }
 
-    // Used in THREAD_POOL mode. Returns true if the token is signaled, meaning it's ready to be
-    // used.
-    bool isReady() const noexcept {
-        std::unique_lock const l(lock);
-        return signaled;
-    }
-
     // This is invoked upon token completion, which occurs after a successful `gl.program`
     // population or upon cancellation. In either scenario, the callback handle must be submitted
     // to notify the caller that resource loading has concluded.
@@ -531,15 +524,8 @@ GLuint ShaderCompilerService::initialize(program_token_t& token) {
 }
 
 void ShaderCompilerService::ensureTokenIsReady(program_token_t const& token) {
-    if (mMode == Mode::THREAD_POOL) {
-        // Check if `token->gl.program` is populated
-        if (token->isReady()) {
-            return;
-        }
-    } else {
-        if (token->gl.program) {
-            return;
-        }
+    if (token->gl.program) {
+        return;// It's ready.
     }
 
     switch (mMode) {
@@ -949,7 +935,6 @@ void ShaderCompilerService::cancelPendingSynchronousProgram(program_token_t cons
         return false;
     }
     token->retrievedFromBlobCache = true;
-    token->signal(); // notify that `token->gl.program` is ready to use
     return true;
 }
 

filament/backend/src/opengl/platforms/PlatformEGL.cpp

@@ -34,7 +34,6 @@
 
 #include <utils/Invocable.h>
 #include <utils/Logger.h>
-#include <utils/Panic.h>
 #include <utils/debug.h>
 #include <utils/ostream.h>
 
@@ -120,41 +119,31 @@ bool PlatformEGL::isOpenGL() const noexcept {
 
 PlatformEGL::ExternalImageEGL::~ExternalImageEGL() = default;
 
-void PlatformEGL::setEglDisplay(EGLDisplay display) noexcept {
-    FILAMENT_CHECK_PRECONDITION(mEGLDisplay == EGL_NO_DISPLAY)
-        << "EGL Display has already been set.";
-    FILAMENT_CHECK_PRECONDITION(display != EGL_NO_DISPLAY)
-        << "Must specify a valid EGL Display.";
-    mEGLDisplay = display;
-}
-
 Driver* PlatformEGL::createDriver(void* sharedContext, const DriverConfig& driverConfig) {
-    if (mEGLDisplay == EGL_NO_DISPLAY) {
-        mEGLDisplay = eglGetDisplay(EGL_DEFAULT_DISPLAY);
-        assert_invariant(mEGLDisplay != EGL_NO_DISPLAY);
+    mEGLDisplay = eglGetDisplay(EGL_DEFAULT_DISPLAY);
+    assert_invariant(mEGLDisplay != EGL_NO_DISPLAY);
 
-        EGLint major, minor;
-        EGLBoolean initialized = eglInitialize(mEGLDisplay, &major, &minor);
+    EGLint major, minor;
+    EGLBoolean initialized = eglInitialize(mEGLDisplay, &major, &minor);
 
-        if (!initialized) {
-            EGLDeviceEXT eglDevice;
-            EGLint numDevices;
-            PFNEGLQUERYDEVICESEXTPROC const eglQueryDevicesEXT =
-                    PFNEGLQUERYDEVICESEXTPROC(eglGetProcAddress("eglQueryDevicesEXT"));
-            if (eglQueryDevicesEXT != nullptr) {
-                eglQueryDevicesEXT(1, &eglDevice, &numDevices);
-                if(auto* getPlatformDisplay = reinterpret_cast<PFNEGLGETPLATFORMDISPLAYEXTPROC>(
-                        eglGetProcAddress("eglGetPlatformDisplay"))) {
-                    mEGLDisplay = getPlatformDisplay(EGL_PLATFORM_DEVICE_EXT, eglDevice, nullptr);
-                    initialized = eglInitialize(mEGLDisplay, &major, &minor);
-                }
+    if (!initialized) {
+        EGLDeviceEXT eglDevice;
+        EGLint numDevices;
+        PFNEGLQUERYDEVICESEXTPROC const eglQueryDevicesEXT =
+                PFNEGLQUERYDEVICESEXTPROC(eglGetProcAddress("eglQueryDevicesEXT"));
+        if (eglQueryDevicesEXT != nullptr) {
+            eglQueryDevicesEXT(1, &eglDevice, &numDevices);
+            if(auto* getPlatformDisplay = reinterpret_cast<PFNEGLGETPLATFORMDISPLAYEXTPROC>(
+                    eglGetProcAddress("eglGetPlatformDisplay"))) {
+                mEGLDisplay = getPlatformDisplay(EGL_PLATFORM_DEVICE_EXT, eglDevice, nullptr);
+                initialized = eglInitialize(mEGLDisplay, &major, &minor);
             }
         }
+    }
 
-        if (UTILS_UNLIKELY(!initialized)) {
-            LOG(ERROR) << "eglInitialize failed";
-            return nullptr;
-        }
+    if (UTILS_UNLIKELY(!initialized)) {
+        LOG(ERROR) << "eglInitialize failed";
+        return nullptr;
     }
 
 #if defined(FILAMENT_IMPORT_ENTRY_POINTS)
@@ -717,11 +706,10 @@ bool PlatformEGL::setExternalImage(ExternalImageHandleRef externalImage,
 // -----------------------------------------------------------------------------------------------
 
 void PlatformEGL::initializeGlExtensions() noexcept {
+    // We're guaranteed to be on an ES platform, since we're using EGL
     const char* const extensions = (const char*)glGetString(GL_EXTENSIONS);
-    if (extensions) {
-        GLUtils::unordered_string_set const glExtensions = GLUtils::split(extensions);
-        ext.gl.OES_EGL_image_external_essl3 = glExtensions.has("GL_OES_EGL_image_external_essl3");
-    }
+    GLUtils::unordered_string_set const glExtensions = GLUtils::split(extensions);
+    ext.gl.OES_EGL_image_external_essl3 = glExtensions.has("GL_OES_EGL_image_external_essl3");
 }
 
 EGLContext PlatformEGL::getContextForType(ContextType const type) const noexcept {

filament/backend/src/vulkan/VulkanAsyncHandles.cpp

@@ -29,12 +29,6 @@ using namespace bluevk;
 
 namespace filament::backend {
 
-std::shared_ptr<VulkanCmdFence> VulkanCmdFence::completed() noexcept {
-    auto cmdFence = std::make_shared<VulkanCmdFence>(VK_NULL_HANDLE);
-    cmdFence->mStatus = VK_SUCCESS;
-    return cmdFence;
-}
-
 FenceStatus VulkanCmdFence::wait(VkDevice device, uint64_t const timeout,
     std::chrono::steady_clock::time_point const until) {
 

filament/backend/src/vulkan/VulkanAsyncHandles.h

@@ -40,13 +40,6 @@ struct VulkanCmdFence {
     explicit VulkanCmdFence(VkFence fence) : mFence(fence) { }
     ~VulkanCmdFence() = default;
 
-    // Creates a VulkanCmdFence with its status set to VK_SUCCESS. It holds
-    // a null handle; it is assumed that any user of this object will avoid
-    // using the fence handle directly if getStatus() returns VK_SUCCESS, as
-    // in that case, it's likely the fence is being reused for other passes,
-    // and is not in the expected state anyway.
-    static std::shared_ptr<VulkanCmdFence> completed() noexcept;
-
     void setStatus(VkResult const value) {
         std::lock_guard const l(mLock);
         mStatus = value;

filament/backend/src/vulkan/VulkanCommands.h

@@ -277,11 +277,7 @@ private:
     fvkmemory::resource_ptr<VulkanSemaphore> mLastSubmit;
 
     VkFence mLastFence = VK_NULL_HANDLE;
-    // Start out with a completed fence, because if no commands have
-    // been queued or submited, then by definition, all pending work
-    // is complete.
-    std::shared_ptr<VulkanCmdFence> mLastFenceStatus =
-            VulkanCmdFence::completed();
+    std::shared_ptr<VulkanCmdFence> mLastFenceStatus;
 
     VkPipelineStageFlags mInjectedDependencyWaitStage = 0;
 };

filament/backend/src/vulkan/VulkanConstants.h

@@ -95,9 +95,9 @@
 #endif
 
 #ifndef NDEBUG
-#define FVK_DEBUG_FLAGS (FVK_DEBUG_PERFORMANCE | FVK_DEBUG_FORWARDED_FLAG | FVK_DEBUG_RESOURCE_LEAK)
+#define FVK_DEBUG_FLAGS (FVK_DEBUG_PERFORMANCE | FVK_DEBUG_FORWARDED_FLAG)
 #else
-#define FVK_DEBUG_FLAGS (FVK_DEBUG_RESOURCE_LEAK)
+#define FVK_DEBUG_FLAGS 0
 #endif
 
 // Override the debug flags if we are forcing profiling mode

filament/backend/src/vulkan/VulkanContext.h

@@ -36,7 +36,6 @@ VK_DEFINE_HANDLE(VmaPool)
 namespace filament::backend {
 
 struct VulkanCommandBuffer;
-struct VulkanRenderPass;
 struct VulkanRenderTarget;
 struct VulkanSwapChain;
 struct VulkanTexture;
@@ -59,11 +58,11 @@ struct VulkanAttachment {
     VkImageSubresourceRange getSubresourceRange() const;
 };
 
-struct VulkanRenderPassContext {
+struct VulkanRenderPass {
     // Between the begin and end command render pass we cache the command buffer
     VulkanCommandBuffer* commandBuffer;
     fvkmemory::resource_ptr<VulkanRenderTarget> renderTarget;
-    fvkmemory::resource_ptr<VulkanRenderPass> renderPass;
+    VkRenderPass renderPass;
     RenderPassParams params;
     int currentSubpass;
 };
@@ -137,14 +136,6 @@ public:
         return mFenceExportFlags;
     }
 
-    inline const char* getPhysicalDeviceName() const noexcept {
-        return mPhysicalDeviceProperties.properties.deviceName;
-    }
-
-    inline const char* getDriverName() const noexcept { return mDriverProperties.driverName; }
-
-    inline const char* getDriverInfo() const noexcept { return mDriverProperties.driverInfo; }
-
     inline bool isImageCubeArraySupported() const noexcept {
         return mPhysicalDeviceFeatures.features.imageCubeArray == VK_TRUE;
     }
@@ -220,16 +211,11 @@ public:
         return mGlobalPrioritySupported;
     }
 
-    inline bool isDriverPropertiesSupported() const noexcept { return mDriverPropertiesSupported; }
-
 private:
     VkPhysicalDeviceMemoryProperties mMemoryProperties = {};
     VkPhysicalDeviceProperties2 mPhysicalDeviceProperties = {
         .sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROPERTIES_2,
     };
-    VkPhysicalDeviceDriverProperties mDriverProperties = {
-        .sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DRIVER_PROPERTIES,
-    };
     VkPhysicalDeviceVulkan11Features mPhysicalDeviceVk11Features = {
         .sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_1_1_FEATURES,
     };
@@ -259,7 +245,6 @@ private:
     bool mProtectedMemorySupported = false;
     bool mVertexInputDynamicStateSupported = false;
     bool mGlobalPrioritySupported = false;
-    bool mDriverPropertiesSupported = false;
 
     // These are options that can be enabled or disabled at an application level.
     bool mAsyncPipelineCachePrewarmingEnabled = false;

filament/backend/src/vulkan/VulkanDescriptorSetCache.cpp

@@ -355,8 +355,35 @@ void VulkanDescriptorSetCache::updateBuffer(fvkmemory::resource_ptr<VulkanDescri
 }
 
 void VulkanDescriptorSetCache::updateSampler(fvkmemory::resource_ptr<VulkanDescriptorSet> set,
-        uint8_t binding, fvkmemory::resource_ptr<VulkanTexture> texture,
-        VkSampler sampler, VkDescriptorSetLayout externalSamplerLayout) noexcept {
+        uint8_t binding, fvkmemory::resource_ptr<VulkanTexture> texture, VkSampler sampler,
+        VkDescriptorSetLayout externalSamplerLayout) noexcept {
+
+    // We have to update a bound set for two use cases
+    //   - streaming API (a changing feed of AHardwareBuffer)
+    //   - external samplers - potential changing of dataspace per-frame
+
+    // TODO: Fix the stream flow case base on the above comment!!
+    if (set->isAnExternalSamplerBound) {
+        auto layout = set->getLayout();
+        // Build a new descriptor set from the new layout
+        VkDescriptorSetLayout const genLayout = set->boundLayout;
+        VkDescriptorSet const newSet = getVkSet(layout->count, genLayout);
+        Bitmask const ubo = layout->bitmask.ubo | layout->bitmask.dynamicUbo;
+        Bitmask samplers = layout->bitmask.sampler;
+        samplers.unset(binding);
+
+        // Each bitmask denotes a binding index, and separated into two stages - vertex and buffer
+        // We fold the two stages into just the lower half of the bits to denote a combined set of
+        // bindings.
+        Bitmask const copyBindings = foldBitsInHalf(ubo | samplers);
+        VkDescriptorSet const srcSet = set->getVkSet();
+        copySet(srcSet, newSet, copyBindings);
+        set->addNewSet(newSet,
+                [this, layoutCount = layout->count, genLayout, newSet](VulkanDescriptorSet*) {
+                    this->manualRecycle(layoutCount, genLayout, newSet);
+                });
+    }
+
     VkDescriptorSet const vkset = set->getVkSet();
     VkImageSubresourceRange range = texture->getPrimaryViewRange();
     VkImageViewType const expectedType = texture->getViewType();
@@ -405,28 +432,6 @@ fvkmemory::resource_ptr<VulkanDescriptorSet> VulkanDescriptorSetCache::createSet
     return set;
 }
 
-void VulkanDescriptorSetCache::cloneSet(fvkmemory::resource_ptr<VulkanDescriptorSet> set,
-        fvkutils::SamplerBitmask samplerMask) noexcept {
-    auto const& layout = set->getLayout();
-    // Build a new descriptor set from layout
-    VkDescriptorSetLayout const genLayout = set->boundLayout;
-    VkDescriptorSet const newSet = getVkSet(layout->count, genLayout);
-
-    // Each bitmask denotes a binding index, and separated into two stages - vertex and buffer
-    // We fold the two stages into just the lower half of the bits to denote a combined set of
-    // bindings.
-    Bitmask const ubo = layout->bitmask.ubo | layout->bitmask.dynamicUbo;
-    // Don't copy the samplers in the mask
-    Bitmask samplers = layout->bitmask.sampler ^ samplerMask;
-    Bitmask const copyBindings = foldBitsInHalf(ubo | samplers);
-
-    VkDescriptorSet const srcSet = set->getVkSet();
-    copySet(srcSet, newSet, copyBindings);
-    set->addNewSet(newSet,
-            [this, layoutCount = layout->count, genLayout, newSet](
-                    VulkanDescriptorSet*) { this->manualRecycle(layoutCount, genLayout, newSet); });
-}
-
 VkDescriptorSet VulkanDescriptorSetCache::getVkSet(DescriptorCount const& count,
         VkDescriptorSetLayout vklayout) {
     return mDescriptorPool->obtainSet(count, vklayout);

filament/backend/src/vulkan/VulkanDescriptorSetCache.h

@@ -76,11 +76,6 @@ public:
     fvkmemory::resource_ptr<VulkanDescriptorSet> createSet(Handle<HwDescriptorSet> handle,
             fvkmemory::resource_ptr<VulkanDescriptorSetLayout> layout);
 
-    // Create and set as current a new VkDescriptorSet using the `set` currently bound layout and
-    // copy all the bindings and ignoring the samplers bindings in the `samplerMask`.
-    void cloneSet(fvkmemory::resource_ptr<VulkanDescriptorSet> set,
-            fvkutils::SamplerBitmask samplerMask) noexcept;
-
     // This method is meant to be used with external samplers
     VkDescriptorSet getVkSet(DescriptorCount const& count, VkDescriptorSetLayout vklayout);
 

filament/backend/src/vulkan/VulkanDriver.cpp

@@ -248,7 +248,7 @@ VulkanDriver::VulkanDriver(VulkanPlatform* platform, VulkanContext& context,
       // swap the content later when createDefaultRenderTarget() is called.  This frees
       // createDefaultRenderTarget() from being ordered with makeCurrent().
       mDefaultRenderTarget(
-              fvkmemory::resource_ptr<VulkanRenderTarget>::construct(&mResourceManager, mPlatform->getDevice())),
+              fvkmemory::resource_ptr<VulkanRenderTarget>::construct(&mResourceManager)),
       mAllocator(createAllocator(mPlatform->getInstance(), mPlatform->getPhysicalDevice(),
               mPlatform->getDevice())),
       mContext(context),
@@ -484,9 +484,6 @@ void VulkanDriver::endFrame(uint32_t frameId) {
     FVK_PROFILE_MARKER(PROFILE_NAME_ENDFRAME);
     endCommandRecording();
     collectGarbage();
-//#if FVK_ENABLED(FVK_DEBUG_RESOURCE_LEAK)
-//    mResourceManager.print();
-//#endif
 }
 
 void VulkanDriver::updateDescriptorSetBuffer(
@@ -1916,6 +1913,9 @@ void VulkanDriver::beginRenderPass(Handle<HwRenderTarget> rth, const RenderPassP
 
     auto rt = resource_ptr<VulkanRenderTarget>::cast(&mResourceManager, rth);
 
+    VulkanCommandBuffer* commandBuffer = rt->isProtected() ?
+           &mCommands.getProtected() : &mCommands.get();
+
     // Filament has the expectation that the contents of the swap chain are not preserved on the
     // first render pass. Note however that its contents are often preserved on subsequent render
     // passes, due to multiple views.
@@ -1930,11 +1930,6 @@ void VulkanDriver::beginRenderPass(Handle<HwRenderTarget> rth, const RenderPassP
         }
     }
 
-    // Note that this needs to come after the acquireNextswapchainImage() above because that path
-    // might flush the current command buffer.
-    VulkanCommandBuffer* commandBuffer =
-            rt->isProtected() ? &mCommands.getProtected() : &mCommands.get();
-
     // Note that retrieving the extent must come after the acquireNextSwapchainImage() above;
     // otherwise it might be 0.
     VkExtent2D const extent = rt->getExtent();
@@ -1980,13 +1975,17 @@ void VulkanDriver::beginRenderPass(Handle<HwRenderTarget> rth, const RenderPassP
     rpkey.initialDepthLayout = currentDepthLayout;
     rpkey.subpassMask = uint8_t(params.subpassMask);
 
-    fvkmemory::resource_ptr<VulkanRenderPass> renderPass =
-            mFramebufferCache.getRenderPass(rpkey, &mResourceManager);
+    VkRenderPass renderPass = mFramebufferCache.getRenderPass(rpkey);
     mPipelineCache.bindRenderPass(renderPass, 0);
 
+    // Create the VkFramebuffer or fetch it from cache.
+    VulkanFboCache::FboKey fbkey = rt->getFboKey();
+    fbkey.renderPass = renderPass;
+    fbkey.layers = 1;
+
     rt->emitBarriersBeginRenderPass(*commandBuffer);
 
-    VkFramebuffer vkfb = rt->getFramebuffer(renderPass->getVkRenderPass(), commandBuffer);
+    VkFramebuffer vkfb = mFramebufferCache.getFramebuffer(fbkey);
 
 // Assign a label to the framebuffer for debugging purposes.
 #if FVK_ENABLED(FVK_DEBUG_GROUP_MARKERS | FVK_DEBUG_DEBUG_UTILS)
@@ -1999,12 +1998,11 @@ void VulkanDriver::beginRenderPass(Handle<HwRenderTarget> rth, const RenderPassP
 
     // The current command buffer now has references to the render target and its attachments.
     commandBuffer->acquire(rt);
-    commandBuffer->acquire(renderPass);
 
     // Populate the structures required for vkCmdBeginRenderPass.
     VkRenderPassBeginInfo renderPassInfo {
         .sType = VK_STRUCTURE_TYPE_RENDER_PASS_BEGIN_INFO,
-        .renderPass = renderPass->getVkRenderPass(),
+        .renderPass = renderPass,
         .framebuffer = vkfb,
 
         // The renderArea field constrains the LoadOp, but scissoring does not.
@@ -2019,10 +2017,10 @@ void VulkanDriver::beginRenderPass(Handle<HwRenderTarget> rth, const RenderPassP
             1] = {};
     if (clearVal != TargetBufferFlags::NONE) {
         // NOTE: clearValues must be populated in the same order as the attachments array in
-        // VulkanRenderTarget::getFramebuffer. Values must be provided regardless of whether Vulkan is
+        // VulkanFboCache::getFramebuffer. Values must be provided regardless of whether Vulkan is
         // actually clearing that particular target.
         for (int i = 0; i < MRT::MAX_SUPPORTED_RENDER_TARGET_COUNT; i++) {
-            if (rpkey.colorFormat[i] != VK_FORMAT_UNDEFINED) {
+            if (fbkey.color[i]) {
                 VkClearValue &clearValue = clearValues[renderPassInfo.clearValueCount++];
                 clearValue.color.float32[0] = params.clearColor.r;
                 clearValue.color.float32[1] = params.clearColor.g;
@@ -2036,7 +2034,7 @@ void VulkanDriver::beginRenderPass(Handle<HwRenderTarget> rth, const RenderPassP
                 renderPassInfo.clearValueCount++;
             }
         }
-        if (rpkey.depthFormat != VK_FORMAT_UNDEFINED) {
+        if (fbkey.depth) {
             VkClearValue &clearValue = clearValues[renderPassInfo.clearValueCount++];
             clearValue.depthStencil = {(float) params.clearDepth, 0};
         }
@@ -2060,7 +2058,7 @@ void VulkanDriver::beginRenderPass(Handle<HwRenderTarget> rth, const RenderPassP
     mCurrentRenderPass = {
         .commandBuffer = commandBuffer,
         .renderTarget = rt,
-        .renderPass = renderPass,
+        .renderPass = renderPassInfo.renderPass,
         .params = params,
         .currentSubpass = 0,
     };
@@ -2080,7 +2078,8 @@ void VulkanDriver::endRenderPass(int) {
     rt->emitBarriersEndRenderPass(*mCurrentRenderPass.commandBuffer);
 
     mCurrentRenderPass.renderTarget = {};
-    mCurrentRenderPass.renderPass = {};
+    mCurrentRenderPass.renderPass = VK_NULL_HANDLE;
+
     mCurrentRenderPass.commandBuffer = nullptr;
 }
 
@@ -2099,7 +2098,7 @@ void VulkanDriver::nextSubpass(int) {
             ++mCurrentRenderPass.currentSubpass);
 
     if (mCurrentRenderPass.params.subpassMask & 0x1) {
-        VulkanAttachment const& subpassInput = renderTarget->getColor0();
+        VulkanAttachment& subpassInput = renderTarget->getColor0();
         mDescriptorSetCache.updateInputAttachment({}, subpassInput);
     }
 }
@@ -2245,7 +2244,7 @@ void VulkanDriver::resolve(
         Handle<HwTexture> src, uint8_t dstLevel, uint8_t dstLayer) {
     FVK_SYSTRACE_SCOPE();
 
-    FILAMENT_CHECK_PRECONDITION(!mCurrentRenderPass.renderPass)
+    FILAMENT_CHECK_PRECONDITION(mCurrentRenderPass.renderPass == VK_NULL_HANDLE)
             << "resolve() cannot be invoked inside a render pass.";
 
     auto srcTexture = resource_ptr<VulkanTexture>::cast(&mResourceManager, src);
@@ -2288,7 +2287,7 @@ void VulkanDriver::blit(
         math::uint2 size) {
     FVK_SYSTRACE_SCOPE();
 
-    FILAMENT_CHECK_PRECONDITION(!mCurrentRenderPass.renderPass)
+    FILAMENT_CHECK_PRECONDITION(mCurrentRenderPass.renderPass == VK_NULL_HANDLE)
             << "blit() cannot be invoked inside a render pass.";
 
     auto srcTexture = resource_ptr<VulkanTexture>::cast(&mResourceManager, src);
@@ -2330,7 +2329,7 @@ void VulkanDriver::blitDEPRECATED(TargetBufferFlags buffers,
 
     // Note: blitDEPRECATED is only used for Renderer::copyFrame()
 
-    FILAMENT_CHECK_PRECONDITION(!mCurrentRenderPass.renderPass)
+    FILAMENT_CHECK_PRECONDITION(mCurrentRenderPass.renderPass == VK_NULL_HANDLE)
             << "blitDEPRECATED() cannot be invoked inside a render pass.";
 
     FILAMENT_CHECK_PRECONDITION(buffers == TargetBufferFlags::COLOR0)
@@ -2706,6 +2705,9 @@ void VulkanDriver::acquireNextSwapchainImage() {
 
     bool resized = false;
     mCurrentSwapChain->acquire(resized);
+    if (resized) {
+        mFramebufferCache.resetFramebuffers();
+    }
     // Note that ordering this after the above lines is necessary since we set the swapchain image
     // to the render target in bindSwapChain().
     mDefaultRenderTarget->bindSwapChain(mCurrentSwapChain);

filament/backend/src/vulkan/VulkanDriver.h

@@ -139,7 +139,7 @@ private:
 
     resource_ptr<VulkanSwapChain> mCurrentSwapChain;
     resource_ptr<VulkanRenderTarget> mDefaultRenderTarget;
-    VulkanRenderPassContext mCurrentRenderPass = {};
+    VulkanRenderPass mCurrentRenderPass = {};
     VmaAllocator mAllocator = VK_NULL_HANDLE;
     VkDebugReportCallbackEXT mDebugCallback = VK_NULL_HANDLE;
 

filament/backend/src/vulkan/VulkanExternalImageManager.cpp

@@ -94,9 +94,6 @@ void VulkanExternalImageManager::updateSetAndLayout(
     fvkmemory::resource_ptr<VulkanDescriptorSetLayout> const& layout = set->getLayout();
     set->boundLayout = mDescriptorSetLayoutCache->getVkLayout(layout->bitmask,
             actualExternalSamplers, outSamplers);
-
-    mDescriptorSetCache->cloneSet(set, actualExternalSamplers);
-
     // Update the external samplers in the set
     for (auto& [binding, sampler, image]: samplerAndBindings) {
         // We cannot call updateSamplerForExternalSamplerSet because some samplers are non NULL

filament/backend/src/vulkan/VulkanFboCache.cpp

@@ -17,7 +17,6 @@
 #include "VulkanFboCache.h"
 
 #include "VulkanConstants.h"
-#include "VulkanHandles.h"
 #include "vulkan/utils/Image.h"
 
 #include <utils/Panic.h>
@@ -48,18 +47,83 @@ bool VulkanFboCache::RenderPassEq::operator()(const RenderPassKey& k1,
     return true;
 }
 
+bool VulkanFboCache::FboKeyEqualFn::operator()(const FboKey& k1, const FboKey& k2) const {
+    if (k1.renderPass != k2.renderPass) return false;
+    if (k1.width != k2.width) return false;
+    if (k1.height != k2.height) return false;
+    if (k1.layers != k2.layers) return false;
+    if (k1.samples != k2.samples) return false;
+    if (k1.depth != k2.depth) return false;
+    for (int i = 0; i < MRT::MAX_SUPPORTED_RENDER_TARGET_COUNT; i++) {
+        if (k1.color[i] != k2.color[i]) return false;
+        if (k1.resolve[i] != k2.resolve[i]) return false;
+    }
+    return true;
+}
+
 VulkanFboCache::VulkanFboCache(VkDevice device)
     : mDevice(device) {}
 
 VulkanFboCache::~VulkanFboCache() {
-    FILAMENT_CHECK_POSTCONDITION(mRenderPassCache.empty())
+    FILAMENT_CHECK_POSTCONDITION(mFramebufferCache.empty() && mRenderPassCache.empty())
             << "Please explicitly call terminate() while the VkDevice is still alive.";
 }
 
-fvkmemory::resource_ptr<VulkanRenderPass> VulkanFboCache::getRenderPass(
-        RenderPassKey const& config, fvkmemory::ResourceManager* resManager) noexcept {
+VkFramebuffer VulkanFboCache::getFramebuffer(FboKey const& config) noexcept {
+    FboMap::iterator iter = mFramebufferCache.find(config);
+    if (UTILS_LIKELY(iter != mFramebufferCache.end() && iter->second.handle != VK_NULL_HANDLE)) {
+        iter.value().timestamp = mCurrentTime;
+        return iter->second.handle;
+    }
+
+    // The attachment list contains: Color Attachments, Resolve Attachments, and Depth Attachment.
+    // For simplicity, create an array that can hold the maximum possible number of attachments.
+    // Note that this needs to have the same ordering as the corollary array in getRenderPass.
+    VkImageView attachments[MRT::MAX_SUPPORTED_RENDER_TARGET_COUNT + MRT::MAX_SUPPORTED_RENDER_TARGET_COUNT + 1];
+    uint32_t attachmentCount = 0;
+    for (VkImageView attachment : config.color) {
+        if (attachment) {
+            attachments[attachmentCount++] = attachment;
+        }
+    }
+    for (VkImageView attachment : config.resolve) {
+        if (attachment) {
+            attachments[attachmentCount++] = attachment;
+        }
+    }
+    if (config.depth) {
+        attachments[attachmentCount++] = config.depth;
+    }
+
+    #if FVK_ENABLED(FVK_DEBUG_FBO_CACHE)
+    FVK_LOGD << "Creating framebuffer " << config.width << "x" << config.height << " "
+        << "for render pass " << config.renderPass << ", "
+        << "samples = " << int(config.samples) << ", "
+        << "depth = " << (config.depth ? 1 : 0) << ", "
+        << "attachmentCount = " << attachmentCount;
+    #endif
+
+    VkFramebufferCreateInfo info {
+        .sType = VK_STRUCTURE_TYPE_FRAMEBUFFER_CREATE_INFO,
+        .renderPass = config.renderPass,
+        .attachmentCount = attachmentCount,
+        .pAttachments = attachments,
+        .width = config.width,
+        .height = config.height,
+        .layers = config.layers,
+    };
+    mRenderPassRefCount[info.renderPass]++;
+    VkFramebuffer framebuffer;
+    VkResult error = vkCreateFramebuffer(mDevice, &info, VKALLOC, &framebuffer);
+    FILAMENT_CHECK_POSTCONDITION(error == VK_SUCCESS) << "Unable to create framebuffer."
+                                                     << " error=" << static_cast<int32_t>(error);
+    mFramebufferCache[config] = {framebuffer, mCurrentTime};
+    return framebuffer;
+}
+
+VkRenderPass VulkanFboCache::getRenderPass(RenderPassKey const& config) noexcept {
     auto iter = mRenderPassCache.find(config);
-    if (UTILS_LIKELY(iter != mRenderPassCache.end())) {
+    if (UTILS_LIKELY(iter != mRenderPassCache.end() && iter->second.handle != VK_NULL_HANDLE)) {
         iter.value().timestamp = mCurrentTime;
         return iter->second.handle;
     }
@@ -262,9 +326,7 @@ fvkmemory::resource_ptr<VulkanRenderPass> VulkanFboCache::getRenderPass(
     VkResult error = vkCreateRenderPass(mDevice, &renderPassInfo, VKALLOC, &renderPass);
     FILAMENT_CHECK_POSTCONDITION(error == VK_SUCCESS) << "Unable to create render pass."
                                                       << " error=" << error;
-    fvkmemory::resource_ptr<VulkanRenderPass> rph =
-        fvkmemory::resource_ptr<VulkanRenderPass>::construct(resManager, mDevice, renderPass);
-    mRenderPassCache[config] = {rph, mCurrentTime};
+    mRenderPassCache[config] = {renderPass, mCurrentTime};
 
 #if FVK_ENABLED(FVK_DEBUG_FBO_CACHE)
     FVK_LOGD << "Created render pass " << renderPass << " with ";
@@ -281,10 +343,23 @@ fvkmemory::resource_ptr<VulkanRenderPass> VulkanFboCache::getRenderPass(
              << "colorAttachmentCount[0] = " << subpasses[0].colorAttachmentCount;
 #endif
 
-    return rph;
+    return renderPass;
+}
+
+void VulkanFboCache::resetFramebuffers() noexcept {
+    for (const auto& pair: mFramebufferCache) {
+        mRenderPassRefCount[pair.first.renderPass]--;
+        vkDestroyFramebuffer(mDevice, pair.second.handle, VKALLOC);
+    }
+    mFramebufferCache.clear();
 }
 
 void VulkanFboCache::terminate() noexcept {
+    resetFramebuffers();
+
+    for (const auto& pair: mRenderPassCache) {
+        vkDestroyRenderPass(mDevice, pair.second.handle, VKALLOC);
+    }
     mRenderPassRefCount.clear();
     mRenderPassCache.clear();
 }
@@ -301,9 +376,26 @@ void VulkanFboCache::gc() noexcept {
     }
     const uint32_t evictTime = mCurrentTime - TIME_BEFORE_EVICTION;
 
+    for (FboMap::iterator iter = mFramebufferCache.begin(); iter != mFramebufferCache.end(); ) {
+        const FboVal fbo = iter->second;
+        if (fbo.timestamp < evictTime && fbo.handle) {
+            mRenderPassRefCount[iter->first.renderPass]--;
+            vkDestroyFramebuffer(mDevice, fbo.handle, VKALLOC);
+            iter.value().handle = VK_NULL_HANDLE;
+
+            // erase(iterator) returns the iterator to the next element.
+            iter = mFramebufferCache.erase(iter);
+        } else {
+            ++iter;
+        }
+    }
+
     for (RenderPassMap::iterator iter = mRenderPassCache.begin(); iter != mRenderPassCache.end(); ) {
-        const VkRenderPass handle = iter->second.handle->getVkRenderPass();
+        const VkRenderPass handle = iter->second.handle;
         if (iter->second.timestamp < evictTime && handle && mRenderPassRefCount[handle] == 0) {
+            vkDestroyRenderPass(mDevice, handle, VKALLOC);
+            iter.value().handle = VK_NULL_HANDLE;
+
             // erase(iterator) returns the iterator to the next element.
             iter = mRenderPassCache.erase(iter);
             mRenderPassRefCount.erase(handle);

filament/backend/src/vulkan/VulkanFboCache.h

@@ -18,9 +18,6 @@
 #define TNT_FILAMENT_BACKEND_VULKANFBOCACHE_H
 
 #include "VulkanContext.h"
-#include "vulkan/memory/Resource.h"
-#include "vulkan/memory/ResourceManager.h"
-#include "vulkan/memory/ResourcePointer.h"
 
 #include <utils/Hash.h>
 
@@ -30,8 +27,6 @@
 
 namespace filament::backend {
 
-struct VulkanRenderPass;
-
 // Simple manager for VkFramebuffer and VkRenderPass objects.
 //
 // Note that a VkFramebuffer is just a binding between a render pass and a set of image views. So,
@@ -62,7 +57,7 @@ public:
         uint8_t padding[2];
     };
     struct RenderPassVal {
-        fvkmemory::resource_ptr<VulkanRenderPass> handle;
+        VkRenderPass handle;
         uint32_t timestamp;
     };
     static_assert(0 == MRT::MAX_SUPPORTED_RENDER_TARGET_COUNT % 8);
@@ -74,24 +69,54 @@ public:
         bool operator()(const RenderPassKey& k1, const RenderPassKey& k2) const;
     };
 
+    // FboKey is a small POD representing the immutable state that we wish to configure
+    // in VkFramebuffer. It is hashed and used as a lookup key. There are several attachments, but
+    // rather than storing a count, we simply zero out the unused slots.
+    struct alignas(8) FboKey {
+        VkRenderPass renderPass; // 8 bytes
+        uint16_t width; // 2 bytes
+        uint16_t height; // 2 bytes
+        uint16_t layers; // 2 bytes
+        uint16_t samples; // 2 bytes
+        VkImageView color[MRT::MAX_SUPPORTED_RENDER_TARGET_COUNT]; // 64 bytes
+        VkImageView resolve[MRT::MAX_SUPPORTED_RENDER_TARGET_COUNT]; // 64 bytes
+        VkImageView depth; // 8 bytes
+    };
+    struct FboVal {
+        VkFramebuffer handle;
+        uint32_t timestamp;
+    };
     static_assert(sizeof(VkRenderPass) == 8, "VkRenderPass has unexpected size.");
     static_assert(sizeof(VkImageView) == 8, "VkImageView has unexpected size.");
+    static_assert(sizeof(FboKey) == 152, "FboKey has unexpected size.");
+    using FboKeyHashFn = utils::hash::MurmurHashFn<FboKey>;
+    struct FboKeyEqualFn {
+        bool operator()(const FboKey& k1, const FboKey& k2) const;
+    };
 
     explicit VulkanFboCache(VkDevice device);
     ~VulkanFboCache();
 
+    // Retrieves or creates a VkFramebuffer handle.
+    VkFramebuffer getFramebuffer(FboKey const& config) noexcept;
+
     // Retrieves or creates a VkRenderPass handle.
-    fvkmemory::resource_ptr<VulkanRenderPass> getRenderPass(
-        RenderPassKey const& config, fvkmemory::ResourceManager* resManager) noexcept;
+    VkRenderPass getRenderPass(RenderPassKey const& config) noexcept;
 
     // Evicts old unused Vulkan objects. Call this once per frame.
     void gc() noexcept;
 
+    // Frees all Framebuffer objects. Call this every time a the swapchain is resized
+    void resetFramebuffers() noexcept;
+
     // Frees all Vulkan objects. Call this during shutdown before the device is destroyed.
     void terminate() noexcept;
 
 private:
     VkDevice mDevice;
+    using FboMap = tsl::robin_map<FboKey, FboVal, FboKeyHashFn, FboKeyEqualFn>;
+    FboMap mFramebufferCache;
+
     using RenderPassMap = tsl::robin_map<RenderPassKey, RenderPassVal, RenderPassHash, RenderPassEq>;
     RenderPassMap mRenderPassCache;
     tsl::robin_map<VkRenderPass, uint32_t> mRenderPassRefCount;

filament/backend/src/vulkan/VulkanHandles.cpp

@@ -27,9 +27,7 @@
 #include "vulkan/utils/Definitions.h"
 #include "vulkan/utils/Image.h"
 #include "vulkan/utils/Spirv.h"
-#include "vulkan/vulkan_core.h"
 
-#include <algorithm>
 #include <backend/platforms/VulkanPlatform.h>
 
 #include <utils/compiler.h> // UTILS_FALLTHROUGH
@@ -400,25 +398,19 @@ void VulkanProgram::flushPushConstants(VkPipelineLayout layout) {
 }
 
 // Creates a special "default" render target (i.e. associated with the swap chain)
-VulkanRenderTarget::VulkanRenderTarget(VkDevice device)
+VulkanRenderTarget::VulkanRenderTarget()
     : HwRenderTarget(0, 0),
-      mDevice(device) {
-    assert_invariant(device != VK_NULL_HANDLE);    
-    mRpKey.samples = 1;
+      mOffscreen(false),
+      mProtected(false),
+      mInfo(std::make_unique<Auxiliary>()) {
+    mInfo->rpkey.samples = mInfo->fbkey.samples = 1;
 }
 
-VulkanRenderTarget::~VulkanRenderTarget() {
-    if (mDevice == VK_NULL_HANDLE) {
-        return;
-    }
-    for (auto const& [renderpass, framebuffer, fence] : mVkFrameBuffers) {
-        vkDestroyFramebuffer(mDevice, framebuffer, VKALLOC);
-    }
-}
+VulkanRenderTarget::~VulkanRenderTarget() = default;
 
 void VulkanRenderTarget::bindSwapChain(fvkmemory::resource_ptr<VulkanSwapChain> swapchain) {
     assert_invariant(!mOffscreen);
-    assert_invariant(!mColors[0]);
+    assert_invariant(!mInfo->colors[0]);
 
     VkExtent2D const extent = swapchain->getExtent();
     width = extent.width;
@@ -426,50 +418,36 @@ void VulkanRenderTarget::bindSwapChain(fvkmemory::resource_ptr<VulkanSwapChain>
     mProtected = swapchain->isProtected();
 
     VulkanAttachment color = createSwapchainAttachment(swapchain->getCurrentColor());
-    assert_invariant(mAttachments.size() == 0);
-    mAttachments.push_back(color);
+    assert_invariant(mInfo->attachments.size() == 0);
+    mInfo->attachments.push_back(color);
 
-    auto& rpkey = mRpKey;
+    auto& fbkey = mInfo->fbkey;
+    auto& rpkey = mInfo->rpkey;
 
     rpkey.colorFormat[0] = color.getFormat();
     rpkey.viewCount = color.layerCount;
-
-    mFboInfo.sType = VK_STRUCTURE_TYPE_FRAMEBUFFER_CREATE_INFO;
-    mFboInfo.width = width;
-    mFboInfo.height = height;
-    mFboInfo.layers = 1;
-    mFboInfo.pAttachments = mFboAttachments;
-
-    uint32_t attachmentCount = 0;
-    mFboAttachments[attachmentCount++] = color.getImageView();
+    fbkey.width = width;
+    fbkey.height = height;
+    fbkey.color[0] = color.getImageView();
+    fbkey.resolve[0] = VK_NULL_HANDLE;
 
     if (swapchain->getDepth()) {
         VulkanAttachment depth = createSwapchainAttachment(swapchain->getDepth());
-        mAttachments.push_back(depth);
-        mDepthIndex = 1;
+        mInfo->attachments.push_back(depth);
+        mInfo->depthIndex = 1;
 
         rpkey.depthFormat = depth.getFormat();
-        mFboAttachments[attachmentCount++] = depth.getImageView();
+        fbkey.depth = depth.getImageView();
     } else {
         rpkey.depthFormat = VK_FORMAT_UNDEFINED;
+        fbkey.depth = VK_NULL_HANDLE;
     }
-    mFboInfo.attachmentCount = attachmentCount;
-    mColors.set(0);
-
-    std::vector<FboData> nbuffers;
-    for (auto const& [renderpass, framebuffer, fence] : mVkFrameBuffers) {
-        if (fence->getStatus() == VK_SUCCESS) {
-            vkDestroyFramebuffer(mDevice, framebuffer, VKALLOC);
-        } else {
-            nbuffers.push_back({renderpass,framebuffer,fence});
-        }
-    }
-    std::swap(mVkFrameBuffers, nbuffers);
+    mInfo->colors.set(0);
 }
 
 void VulkanRenderTarget::releaseSwapchain() {
-    mColors = {};
-    mAttachments.clear();
+    mInfo->colors = {};
+    mInfo->attachments.clear();
 }
 
 VulkanRenderTarget::VulkanRenderTarget(VkDevice device, VkPhysicalDevice physicalDevice,
@@ -478,10 +456,9 @@ VulkanRenderTarget::VulkanRenderTarget(VkDevice device, VkPhysicalDevice physica
         uint8_t samples, VulkanAttachment color[MRT::MAX_SUPPORTED_RENDER_TARGET_COUNT],
         VulkanAttachment depthStencil[2], VulkanStagePool& stagePool, uint8_t layerCount)
     : HwRenderTarget(width, height),
-      mDevice(device),
       mOffscreen(true),
-      mProtected(false) {
-    assert_invariant(device != VK_NULL_HANDLE);        
+      mProtected(false),
+      mInfo(std::make_unique<Auxiliary>()) {
     auto& depth = depthStencil[0];
 
     // Constrain the sample count according to both kinds of sample count masks obtained from
@@ -490,25 +467,19 @@ VulkanRenderTarget::VulkanRenderTarget(VkDevice device, VkPhysicalDevice physica
     samples = fvkutils::reduceSampleCount(samples,
             limits.framebufferDepthSampleCounts & limits.framebufferColorSampleCounts);
 
-    auto& rpkey = mRpKey;
+    auto& rpkey = mInfo->rpkey;
     rpkey.samples = samples;
     rpkey.depthFormat = depth.getFormat();
     rpkey.viewCount = layerCount;
 
-    auto& fboInfo = mFboInfo;
-    fboInfo.sType = VK_STRUCTURE_TYPE_FRAMEBUFFER_CREATE_INFO;
-    fboInfo.width = width;
-    fboInfo.height = height;
-    fboInfo.layers = 1;
-    fboInfo.pAttachments = mFboAttachments;
+    auto& fbkey = mInfo->fbkey;
+    fbkey.width = width;
+    fbkey.height = height;
+    fbkey.samples = samples;
 
-    std::vector<VulkanAttachment>& attachments = mAttachments;
+    std::vector<VulkanAttachment>& attachments = mInfo->attachments;
     std::vector<VulkanAttachment> msaaAttachments;
 
-    VkImageView colorAttachments[MRT::MAX_SUPPORTED_RENDER_TARGET_COUNT] = {};
-    VkImageView resolveAttachments[MRT::MAX_SUPPORTED_RENDER_TARGET_COUNT] = {};
-    VkImageView depthAttachment = VK_NULL_HANDLE;
-
     for (int index = 0; index < MRT::MAX_SUPPORTED_RENDER_TARGET_COUNT; index++) {
         VulkanAttachment& attachment = color[index];
         auto texture = attachment.texture;
@@ -520,11 +491,11 @@ VulkanRenderTarget::VulkanRenderTarget(VkDevice device, VkPhysicalDevice physica
         mProtected |= texture->getIsProtected();
 
         attachments.push_back(attachment);
-        mColors.set(index);
+        mInfo->colors.set(index);
 
         rpkey.colorFormat[index] = attachment.getFormat();
-        colorAttachments[index] = attachment.getImageView();
-        resolveAttachments[index] = VK_NULL_HANDLE;
+        fbkey.color[index] = attachment.getImageView();
+        fbkey.resolve[index] = VK_NULL_HANDLE;
 
         if (samples > 1) {
             VulkanAttachment msaaAttachment = {};
@@ -542,30 +513,30 @@ VulkanRenderTarget::VulkanRenderTarget(VkDevice device, VkPhysicalDevice physica
                     .layerCount = layerCount,
                 };
 
-                resolveAttachments[index] = attachment.getImageView();
+                fbkey.resolve[index] = attachment.getImageView();
             } else {
                 msaaAttachment = {
                     .texture = texture,
                     .layerCount = layerCount,
                 };
             }
-            colorAttachments[index] = msaaAttachment.getImageView();
+            fbkey.color[index] = msaaAttachment.getImageView();
             msaaAttachments.push_back(msaaAttachment);
         }
     }
 
     if (attachments.size() > 0 && samples > 1 && msaaAttachments.size() > 0) {
-        mMsaaIndex = (uint8_t) attachments.size();
+        mInfo->msaaIndex = (uint8_t) attachments.size();
         attachments.insert(attachments.end(), msaaAttachments.begin(), msaaAttachments.end());
     }
 
     if (depth.texture) {
         auto depthTexture = depth.texture;
-        mDepthIndex = (uint8_t) attachments.size();
+        mInfo->depthIndex = (uint8_t) attachments.size();
         attachments.push_back(depth);
-        depthAttachment = depth.getImageView();
+        fbkey.depth = depth.getImageView();
         if (samples > 1) {
-            mMsaaDepthIndex = mDepthIndex;
+            mInfo->msaaDepthIndex = mInfo->depthIndex;
             if (depthTexture->samples == 1) {
                 // MSAA depth texture must have the mipmap count of 1
                 uint8_t const msLevel = 1;
@@ -573,54 +544,16 @@ VulkanRenderTarget::VulkanRenderTarget(VkDevice device, VkPhysicalDevice physica
                 // exist.
                 auto msaaTexture = initMsaaTexture(depthTexture, device, physicalDevice, context,
                         allocator, commands, resourceManager, msLevel, samples, stagePool);
-                mMsaaDepthIndex = (uint8_t) attachments.size();
+                mInfo->msaaDepthIndex = (uint8_t) attachments.size();
                 VulkanAttachment msaaAttachment = {
                     .texture = msaaTexture,
                     .layerCount = layerCount,
                 };
                 attachments.push_back(msaaAttachment);
-                depthAttachment = msaaAttachment.getImageView();
+                fbkey.depth = msaaAttachment.getImageView();
             }
         }
     }
-
-    uint32_t attachmentCount = 0;
-    for (int index = 0; index < MRT::MAX_SUPPORTED_RENDER_TARGET_COUNT; index++) {
-        if (colorAttachments[index]) {
-            mFboAttachments[attachmentCount++] = colorAttachments[index];
-        }
-    }
-    for (int index = 0; index < MRT::MAX_SUPPORTED_RENDER_TARGET_COUNT; index++) {
-        if (resolveAttachments[index]) {
-            mFboAttachments[attachmentCount++] = resolveAttachments[index];
-        }
-    }
-    if (depthAttachment) {
-        mFboAttachments[attachmentCount++] = depthAttachment;
-    }
-    fboInfo.attachmentCount = attachmentCount;
-}
-
-VkFramebuffer VulkanRenderTarget::getFramebuffer(VkRenderPass renderPass, VulkanCommandBuffer* commands) {
-    if (mOffscreen) {
-        for (auto& [rp, fb, fence] : mVkFrameBuffers) {
-            if (rp == renderPass) {
-                fence = commands->getFenceStatus();
-                return fb;
-            }
-        }
-    }
-
-    VkDevice device = mDevice;
-
-    mFboInfo.renderPass = renderPass;
-    VkFramebuffer framebuffer;
-    VkResult error = vkCreateFramebuffer(device, &mFboInfo, VKALLOC, &framebuffer);
-    FILAMENT_CHECK_POSTCONDITION(error == VK_SUCCESS) << "Unable to create framebuffer."
-                                                      << " error=" << static_cast<int32_t>(error);
-    mVkFrameBuffers.push_back({renderPass, framebuffer, commands->getFenceStatus()});
-
-    return framebuffer;
 }
 
 void VulkanRenderTarget::transformClientRectToPlatform(VkRect2D* bounds) const {
@@ -632,15 +565,15 @@ void VulkanRenderTarget::transformViewportToPlatform(VkViewport* bounds) const {
     flipVertically(bounds, getExtent().height);
 }
 
-uint8_t VulkanRenderTarget::getColorTargetCount(const VulkanRenderPassContext& pass) const {
+uint8_t VulkanRenderTarget::getColorTargetCount(const VulkanRenderPass& pass) const {
     if (!mOffscreen) {
         return 1;
     }
     if (pass.currentSubpass == 1) {
-        return mColors.count();
+        return mInfo->colors.count();
     }
     uint8_t count = 0;
-    mColors.forEachSetBit([&count, &pass](size_t index) {
+    mInfo->colors.forEachSetBit([&count, &pass](size_t index) {
         if (!(pass.params.subpassMask & (1 << index))) {
             count++;
         }
@@ -649,7 +582,8 @@ uint8_t VulkanRenderTarget::getColorTargetCount(const VulkanRenderPassContext& p
 }
 
 void VulkanRenderTarget::emitBarriersBeginRenderPass(VulkanCommandBuffer& commands) {
-    auto samples = mRpKey.samples;
+    auto& attachments = mInfo->attachments;
+    auto samples = mInfo->fbkey.samples;
     auto barrier = [&commands](VulkanAttachment& attachment, VulkanLayout const layout) {
         auto tex = attachment.texture;
         auto const& range = attachment.getSubresourceRange();
@@ -660,24 +594,24 @@ void VulkanRenderTarget::emitBarriersBeginRenderPass(VulkanCommandBuffer& comman
         }
     };
 
-    for (size_t i = 0, count = mColors.count(); i < count; ++i) {
-        auto& attachment = mAttachments[i];
+    for (size_t i = 0, count = mInfo->colors.count(); i < count; ++i) {
+        auto& attachment = attachments[i];
         auto tex = attachment.texture;
         if (samples == 1 || tex->samples == 1) {
             barrier(attachment, VulkanLayout::COLOR_ATTACHMENT);
         }
     }
-    if (mMsaaIndex != UNDEFINED_INDEX) {
-        for (size_t i = mMsaaIndex, count = mMsaaIndex + mColors.count();
+    if (mInfo->msaaIndex != Auxiliary::UNDEFINED_INDEX) {
+        for (size_t i = mInfo->msaaIndex, count = mInfo->msaaIndex + mInfo->colors.count();
                 i < count; ++i) {
-            barrier(mAttachments[i], VulkanLayout::COLOR_ATTACHMENT);
+            barrier(attachments[i], VulkanLayout::COLOR_ATTACHMENT);
         }
     }
-    if (mDepthIndex != UNDEFINED_INDEX) {
-        barrier(mAttachments[mDepthIndex], VulkanLayout::DEPTH_ATTACHMENT);
+    if (mInfo->depthIndex != Auxiliary::UNDEFINED_INDEX) {
+        barrier(attachments[mInfo->depthIndex], VulkanLayout::DEPTH_ATTACHMENT);
     }
-    if (mMsaaDepthIndex != UNDEFINED_INDEX) {
-        barrier(mAttachments[mMsaaDepthIndex], VulkanLayout::DEPTH_ATTACHMENT);
+    if (mInfo->msaaDepthIndex != Auxiliary::UNDEFINED_INDEX) {
+        barrier(attachments[mInfo->msaaDepthIndex], VulkanLayout::DEPTH_ATTACHMENT);
     }
 }
 
@@ -686,7 +620,7 @@ void VulkanRenderTarget::emitBarriersEndRenderPass(VulkanCommandBuffer& commands
         return;
     }
 
-    for (auto& attachment: mAttachments) {
+    for (auto& attachment: mInfo->attachments) {
         auto const& range = attachment.getSubresourceRange();
         bool const isDepth = attachment.isDepth();
         auto texture = attachment.texture;
@@ -781,11 +715,4 @@ VulkanRenderPrimitive::VulkanRenderPrimitive(PrimitiveType pt,
       vertexBuffer(vb),
       indexBuffer(ib) {}
 
-VulkanRenderPass::VulkanRenderPass(VkDevice device, VkRenderPass renderPass)
-    : mDevice(device), mRenderPass(renderPass) {}
-
-VulkanRenderPass::~VulkanRenderPass() {
-    vkDestroyRenderPass(mDevice, mRenderPass, VKALLOC);
-}
-
 } // namespace filament::backend

filament/backend/src/vulkan/VulkanHandles.h

@@ -26,7 +26,6 @@
 #include "VulkanFboCache.h"
 #include "VulkanSwapChain.h"
 #include "VulkanTexture.h"
-#include "utils/compiler.h"
 #include "vulkan/VulkanCommands.h"
 #include "vulkan/memory/Resource.h"
 #include "vulkan/memory/ResourcePointer.h"
@@ -36,7 +35,6 @@
 #include <backend/Program.h>
 
 #include <utils/FixedCapacityVector.h>
-#include <utils/LruCache.h>
 #include <utils/Mutex.h>
 #include <utils/StructureOfArrays.h>
 #include <utils/bitset.h>
@@ -197,7 +195,7 @@ public:
     }
 
     // The current layout used by the descriptor set. This one will match the bindings, including
-    // external samplers data.
+    // external samplers data. 
     // This will not necessarilly be the same as `mLayout`.
     VkDescriptorSetLayout boundLayout = VK_NULL_HANDLE;
 
@@ -205,7 +203,7 @@ public:
 
     fvkutils::UniformBufferBitmask const& dynamicUboMask;
     uint8_t const uniqueDynamicUboCount;
-
+    
     // Flag to indicate if the current layout needs to be recreated or not.
     // This should only set to `true` when a external sampler image is bound to the descriptor set.
     bool isLayoutDirty = false;
@@ -374,10 +372,12 @@ struct VulkanRenderTarget : private HwRenderTarget, fvkmemory::Resource {
     ~VulkanRenderTarget();
 
     // Creates a special "default" render target (i.e. associated with the swap chain)
-    explicit VulkanRenderTarget(VkDevice device);
+    explicit VulkanRenderTarget();
 
     VulkanRenderTarget(VulkanRenderTarget&& target)
-        : HwRenderTarget(0, 0) {
+        : HwRenderTarget(0, 0),
+          mOffscreen(false),
+          mProtected(false) {
         swap(std::move(target));
     }
 
@@ -394,30 +394,34 @@ struct VulkanRenderTarget : private HwRenderTarget, fvkmemory::Resource {
         return {width, height};
     }
 
-    inline VulkanAttachment const& getColor0() const {
-        assert_invariant(mColors[0]);
-        return mAttachments[0];
+    inline VulkanAttachment& getColor0() const {
+        assert_invariant(mInfo->colors[0]);
+        return mInfo->attachments[0];
     }
 
-    inline VulkanAttachment const& getDepth() const {
+    inline VulkanAttachment& getDepth() const {
         assert_invariant(hasDepth());
-        if (mRpKey.samples == 1) {
-            return mAttachments[mDepthIndex];
+        if (mInfo->fbkey.samples == 1) {
+            return mInfo->attachments[mInfo->depthIndex];
         }
-        return mAttachments[mMsaaDepthIndex];
+        return mInfo->attachments[mInfo->msaaDepthIndex];
     }
 
     inline VulkanFboCache::RenderPassKey const& getRenderPassKey() const {
-        return mRpKey;
+        return mInfo->rpkey;
+    }
+
+    inline VulkanFboCache::FboKey const& getFboKey() const {
+        return mInfo->fbkey;
     }
 
     inline uint8_t getSamples() const {
-        return mRpKey.samples;
+        return mInfo->fbkey.samples;
     }
 
-    uint8_t getColorTargetCount(VulkanRenderPassContext const& pass) const;
+    uint8_t getColorTargetCount(VulkanRenderPass const& pass) const;
 
-    inline bool hasDepth() const { return mDepthIndex != UNDEFINED_INDEX; }
+    inline bool hasDepth() const { return mInfo->depthIndex != Auxiliary::UNDEFINED_INDEX; }
 
     inline bool isSwapChain() const { return !mOffscreen; }
     inline bool isProtected() const { return mProtected; }
@@ -427,65 +431,41 @@ struct VulkanRenderTarget : private HwRenderTarget, fvkmemory::Resource {
     void releaseSwapchain();
 
     bool isSwapchainBound() const {
-        return isSwapChain() && mColors[0];
+        return isSwapChain() && mInfo->colors[0];
     }
 
     void emitBarriersBeginRenderPass(VulkanCommandBuffer& commands);
 
     void emitBarriersEndRenderPass(VulkanCommandBuffer& commands);
 
-    VkFramebuffer getFramebuffer(VkRenderPass renderPass, VulkanCommandBuffer* commands);
-
 private:
     void swap(VulkanRenderTarget&& target) {
         std::swap(width, target.width);
         std::swap(height, target.height);
-
-        assert_invariant(target.mDevice != VK_NULL_HANDLE);
-        //assert_invariant(mDevice != VK_NULL_HANDLE);
-
-        std::swap(mDevice, target.mDevice);
-        std::swap(mColors, target.mColors);
-        std::swap(mDepthIndex, target.mDepthIndex);
-        std::swap(mMsaaDepthIndex, target.mMsaaDepthIndex);
-        std::swap(mMsaaIndex, target.mMsaaIndex);
-
         std::swap(mOffscreen, target.mOffscreen);
         std::swap(mProtected, target.mProtected);
-
-        std::swap(mAttachments, target.mAttachments);
-        std::swap(mRpKey, target.mRpKey);
-        std::swap(mFboInfo, target.mFboInfo);
-        std::swap(mFboAttachments, target.mFboAttachments);
+        std::swap(mInfo, target.mInfo);
     }
 
-    static constexpr int8_t UNDEFINED_INDEX = -1;
+    struct Auxiliary {
+        static constexpr int8_t UNDEFINED_INDEX = -1;
 
-    VkDevice mDevice = VK_NULL_HANDLE;  // 8 bytes
-    utils::bitset32 mColors;             // 4
-    int8_t mDepthIndex = UNDEFINED_INDEX;      // 1
-    int8_t mMsaaDepthIndex = UNDEFINED_INDEX;  // 1
-    int8_t mMsaaIndex = UNDEFINED_INDEX;       // 1
-    bool mOffscreen = false;                   // 1
+        explicit Auxiliary() noexcept = default;
 
-    struct FboData {
-        VkRenderPass renderpass;
-        VkFramebuffer framebuffer;
-        std::shared_ptr<VulkanCmdFence> fence;
+        VulkanFboCache::RenderPassKey rpkey = {};
+        VulkanFboCache::FboKey fbkey = {};
+        std::vector<VulkanAttachment> attachments;
+        utils::bitset32 colors;
+        int8_t depthIndex = UNDEFINED_INDEX;
+        int8_t msaaDepthIndex = UNDEFINED_INDEX;
+        int8_t msaaIndex = UNDEFINED_INDEX;
     };
+    bool mOffscreen;
+    bool mProtected;
 
-    std::vector<FboData> mVkFrameBuffers;
-    std::vector<VulkanAttachment> mAttachments; // 24 bytes
-    VulkanFboCache::RenderPassKey mRpKey = {};  // 56 bytes
-    VkFramebufferCreateInfo mFboInfo = {};      // 64 bytes
-    VkImageView mFboAttachments[
-            MRT::MAX_SUPPORTED_RENDER_TARGET_COUNT + MRT::MAX_SUPPORTED_RENDER_TARGET_COUNT + 1] = {};    // 136
-    bool mProtected = false;                    // 1
-    UTILS_UNUSED bool padding[3] = {};          // 3
+    std::unique_ptr<Auxiliary> mInfo;
 };
 
-static_assert(sizeof(VulkanRenderTarget) == 352);
-
 struct VulkanBufferObject;
 
 struct VulkanVertexBufferInfo : public HwVertexBufferInfo, fvkmemory::Resource {
@@ -605,19 +585,6 @@ struct VulkanRenderPrimitive : public HwRenderPrimitive, fvkmemory::Resource {
     fvkmemory::resource_ptr<VulkanIndexBuffer> indexBuffer;
 };
 
-struct VulkanRenderPass : public fvkmemory::Resource {
-    VulkanRenderPass(VkDevice device, VkRenderPass renderPass);
-    ~VulkanRenderPass();
-
-    inline VkRenderPass getVkRenderPass() const noexcept {
-        return mRenderPass;
-    }
-
-private:
-    VkDevice mDevice;
-    VkRenderPass mRenderPass;
-};
-
 } // namespace filament::backend
 
 #endif // TNT_FILAMENT_BACKEND_VULKANHANDLES_H

filament/backend/src/vulkan/VulkanPipelineCache.cpp

@@ -459,10 +459,8 @@ void VulkanPipelineCache::bindStencilState(StencilState const& stencilState) noe
     mPipelineRequirements.stencilState = stencilState;
 }
 
-void VulkanPipelineCache::bindRenderPass(
-        fvkmemory::resource_ptr<VulkanRenderPass> renderPass,
-        int subpassIndex) noexcept {
-    mPipelineRequirements.renderPass = renderPass->getVkRenderPass();
+void VulkanPipelineCache::bindRenderPass(VkRenderPass renderPass, int subpassIndex) noexcept {
+    mPipelineRequirements.renderPass = renderPass;
     mPipelineRequirements.subpassIndex = subpassIndex;
 }