Merge branch 'rc/1.75.0' into release

Author: poweifeng

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

@@ -6,6 +6,8 @@ outputs:
     value: ${{ steps.action_output.outputs.msg }}
   hash:
     value: ${{ steps.action_output.outputs.hash }}
+  hashes:
+    value: ${{ steps.action_output.outputs.hashes }}
 runs:
   using: "composite"
   steps:
@@ -25,6 +27,7 @@ runs:
         echo "" >> /tmp/commit_msg.txt
         echo "$COMMIT_MESSAGE" >> /tmp/commit_msg.txt
         echo "$HASH" > /tmp/commit_hash.txt
+        echo "$HASH" > /tmp/commit_hashes.txt
     - name: Find commit message (PR)
       shell: bash
       if: github.event_name == 'pull_request'
@@ -33,18 +36,22 @@ runs:
         # 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"
 
+        BASE_REF="${{ github.event.pull_request.base.ref }}"
+        git fetch origin "$BASE_REF"
+
         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)
+        COMMIT_MESSAGE=$(git log --no-merges "origin/$BASE_REF..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
+        git log --no-merges "origin/$BASE_REF..pr-head" --format=%H | tr '\n' ' ' > /tmp/commit_hashes.txt
     - shell: bash
       id: action_output
       run: |
@@ -54,4 +61,6 @@ 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"
+        # Get the commit hashes
+        echo "hashes=$(cat /tmp/commit_hashes.txt)" >> "$GITHUB_OUTPUT"

.github/workflows/presubmit.yml

@@ -17,18 +17,18 @@ concurrency:
 # 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.
+# 1. always() && !cancelled(): Ensures the job runs even if 'check-verification' is skipped
+#    (which happens normally on PRs), but aborts if the workflow was manually cancelled.
+# 2. !needs.check-verification.outputs.skip: Evaluates to true when the 'skip' output is empty.
+#    The 'skip' output is only set to 'true' if it's a push to main AND the commit is verified.
+#    In all other cases (including PRs where the job is skipped), it defaults to empty.
 
 jobs:
   check-verification:
     if: github.event_name == 'push'
     runs-on: ubuntu-latest
     outputs:
-      verified: ${{ steps.check.outputs.verified }}
+      skip: ${{ steps.check.outputs.skip }}
     steps:
       - name: Check commit verification
         id: check
@@ -40,22 +40,16 @@ jobs:
               repo: context.repo.repo,
               ref: context.sha
             });
-            core.setOutput('verified', data.commit.verification.verified);
+            if (data.commit.verification.verified) {
+              core.setOutput('skip', 'true');
+            }
 
   build-desktop-mac:
     name: build-mac
     runs-on: 'macos-14-xlarge'
+    timeout-minutes: 45
     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'
-        )
-      )
+    if: always() && !cancelled() && !needs.check-verification.outputs.skip
     steps:
       - uses: actions/checkout@v4.1.6
         with:
@@ -68,17 +62,9 @@ jobs:
   build-desktop-linux:
     name: build-linux
     runs-on: 'arm-ubuntu-24.04-16core'
+    timeout-minutes: 45
     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'
-        )
-      )
+    if: always() && !cancelled() && !needs.check-verification.outputs.skip
     steps:
       - uses: actions/checkout@v4.1.6
         with:
@@ -95,16 +81,7 @@ jobs:
     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'
-        )
-      )
+    if: always() && !cancelled() && !needs.check-verification.outputs.skip
     steps:
       - uses: actions/checkout@v4.1.6
         with:
@@ -117,17 +94,9 @@ jobs:
   build-android:
     name: build-android
     runs-on: 'ubuntu-24.04-8core'
+    timeout-minutes: 45
     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'
-        )
-      )
+    if: always() && !cancelled() && !needs.check-verification.outputs.skip
     steps:
       - uses: actions/checkout@v4.1.6
         with:
@@ -150,7 +119,7 @@ jobs:
         run: |
           python3 test/sizeguard/dump_artifact_size.py out/*.aar > current_size.json
           BYPASS_ARG=""
-          if python3 test/sizeguard/check_bypass.py ${{ steps.get_commit_msg.outputs.hash }}; then
+          if python3 test/sizeguard/check_bypass.py ${{ steps.get_commit_msg.outputs.hashes }}; then
               BYPASS_ARG="--bypass"
           fi
           python3 test/sizeguard/check_size.py current_size.json \
@@ -162,17 +131,9 @@ jobs:
   build-ios:
     name: build-iOS
     runs-on: 'macos-14-xlarge'
+    timeout-minutes: 45
     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'
-        )
-      )
+    if: always() && !cancelled() && !needs.check-verification.outputs.skip
     steps:
       - uses: actions/checkout@v4.1.6
         with:
@@ -190,17 +151,9 @@ jobs:
   build-web:
     name: build-web
     runs-on: 'arm-ubuntu-24.04-16core'
+    timeout-minutes: 45
     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'
-        )
-      )
+    if: always() && !cancelled() && !needs.check-verification.outputs.skip
     steps:
       - uses: actions/checkout@v4.1.6
         with:
@@ -215,16 +168,7 @@ jobs:
     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'
-        )
-      )
+    if: always() && !cancelled() && !needs.check-verification.outputs.skip
     steps:
       - uses: actions/checkout@v4.1.6
         with:
@@ -233,22 +177,14 @@ jobs:
         uses: ./.github/actions/get-commit-msg
       - name: Check for manual edits to /docs
         run: |
-          bash docs_src/build/presubmit_check.sh ${{ steps.get_commit_msg.outputs.hash }}
+          bash docs_src/build/presubmit_check.sh ${{ steps.get_commit_msg.outputs.hashes }}
 
   test-renderdiff:
     name: test-renderdiff
     runs-on: 'macos-14-xlarge'
+    timeout-minutes: 45
     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'
-        )
-      )
+    if: always() && !cancelled() && !needs.check-verification.outputs.skip
     steps:
       - uses: actions/checkout@v4.1.6
         with:
@@ -319,17 +255,9 @@ jobs:
   build-wgsl-webgpu:
     name: build-wgsl-webgpu
     runs-on: 'arm-ubuntu-24.04-16core'
+    timeout-minutes: 45
     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'
-        )
-      )
+    if: always() && !cancelled() && !needs.check-verification.outputs.skip
     steps:
       - uses: actions/checkout@v4.1.6
         with:
@@ -343,17 +271,9 @@ jobs:
   test-code-correctness:
     name: test-code-correctness
     runs-on: 'arm-ubuntu-24.04-16core'
+    timeout-minutes: 45
     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'
-        )
-      )
+    if: always() && !cancelled() && !needs.check-verification.outputs.skip
     steps:
       - uses: actions/checkout@v4.1.6
         with:
@@ -371,7 +291,12 @@ jobs:
         run: bash test/code-correctness/clang-tidy-proxy.sh
       - name: Check - public header inclusion
         run: bash test/code-correctness/headers-inclusion.sh out/release/filament/include
+      - name: Get commit message
+        id: get_commit_msg
+        uses: ./.github/actions/get-commit-msg
       - name: Check - header organization
+        env:
+          COMMIT_MESSAGE: ${{ steps.get_commit_msg.outputs.msg }}
         run: |
           if [ "${{ github.event_name }}" = "pull_request" ]; then
             FILES=()
@@ -392,17 +317,9 @@ jobs:
   test-backend:
     name: test-backend
     runs-on: 'arm-ubuntu-24.04-16core'
+    timeout-minutes: 45
     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'
-        )
-      )
+    if: always() && !cancelled() && !needs.check-verification.outputs.skip
     steps:
       - uses: actions/checkout@v4.1.6
         with:

CMakeLists.txt

@@ -994,13 +994,14 @@ if (WASM)
     add_subdirectory(web/examples)
 endif()
 
+if (IS_HOST_PLATFORM OR ANDROID)
+   add_subdirectory(${LIBRARIES}/filamentapp)
+endif()
+
 if (IS_HOST_PLATFORM)
     if (FILAMENT_SUPPORTS_OPENGL)
         add_subdirectory(${LIBRARIES}/bluegl)
     endif()
-    if (NOT FILAMENT_SKIP_SDL2)
-      add_subdirectory(${LIBRARIES}/filamentapp)
-    endif()
     add_subdirectory(${LIBRARIES}/imageio)
     add_subdirectory(${LIBRARIES}/filament-matp)
 

README.md

@@ -31,7 +31,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'com.google.android.filament:filament-android:1.74.1'
+    implementation 'com.google.android.filament:filament-android:1.75.0'
 }
 ```
 
@@ -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.74.1'
+pod 'Filament', '~> 1.75.0'
 ```
 
 ## Documentation

RELEASE_NOTES.md

@@ -7,6 +7,12 @@ 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.75.0
+
+- web: expand JS bindings coverage for Fence, SkinningBuffer, MorphTargetBuffer, and other previously unbound APIs
+- variant: compile MNT variant for unlit materials by default. [⚠️ **Recompile Materials**]
+- materials: fix punctual-only shadow receivers selecting the SSR shader. [⚠️ **Recompile Materials**]
+
 ## v1.74.1
 
 

android/filament-android/build.gradle

@@ -1,3 +1,7 @@
+plugins {
+    id "org.jetbrains.dokka" version "1.9.20"
+}
+
 android {
     namespace 'com.google.android.filament'
 
@@ -25,3 +29,13 @@ afterEvaluate { project ->
         }
     }
 }
+
+dokkaGfm {
+    dokkaSourceSets {
+        // Use 'register' instead of 'configureEach' to force Dokka
+        // to create a new source set from scratch.
+        register("main") {
+            sourceRoots.from(file("src/main/java"))
+        }
+    }
+}