Merge branch 'rc/1.71.3' into release

Author: bejado

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

@@ -10,7 +10,7 @@ runs:
     - name: Prerequisites
       if: runner.os == 'macOS'
       run: |
-        # Must have at least clang-16 for a webgpu/dawn build.
+        # Must have at least clang-17 for a webgpu/dawn build.
         sudo xcode-select -s /Applications/Xcode_16.2.app/Contents/Developer
         # this enforces the gltf_viewer build to use apple clang as oppose the brew clang used for get-mesa
         echo "CC=/usr/bin/clang" >> $GITHUB_ENV

.github/workflows/status-android.yml

@@ -0,0 +1,27 @@
+name: Android
+run-name: ${{ github.event.workflow_run.display_title }}
+
+on:
+  workflow_run:
+    workflows: ["Postsubmit CI"]
+    types: [completed]
+
+jobs:
+  status:
+    runs-on: ubuntu-latest
+    if: ${{ github.event.workflow_run.conclusion != 'skipped' }}
+    steps:
+      - uses: actions/github-script@v7
+        with:
+          script: |
+            const { data: { jobs } } = await github.rest.actions.listJobsForWorkflowRun({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              run_id: ${{ github.event.workflow_run.id }}
+            });
+            const job = jobs.find(j => j.name === 'build-android');
+            if (job && job.conclusion !== 'success') {
+              core.setFailed(`Android build failed: ${job.conclusion}`);
+            } else if (!job) {
+              core.warning(`Job build-android not found in the workflow run.`);
+            }

.github/workflows/status-ios.yml

@@ -0,0 +1,27 @@
+name: iOS
+run-name: ${{ github.event.workflow_run.display_title }}
+
+on:
+  workflow_run:
+    workflows: ["Postsubmit CI"]
+    types: [completed]
+
+jobs:
+  status:
+    runs-on: ubuntu-latest
+    if: ${{ github.event.workflow_run.conclusion != 'skipped' }}
+    steps:
+      - uses: actions/github-script@v7
+        with:
+          script: |
+            const { data: { jobs } } = await github.rest.actions.listJobsForWorkflowRun({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              run_id: ${{ github.event.workflow_run.id }}
+            });
+            const job = jobs.find(j => j.name === 'build-ios');
+            if (job && job.conclusion !== 'success') {
+              core.setFailed(`iOS build failed: ${job.conclusion}`);
+            } else if (!job) {
+              core.warning(`Job build-ios not found in the workflow run.`);
+            }

.github/workflows/status-linux.yml

@@ -0,0 +1,27 @@
+name: Linux
+run-name: ${{ github.event.workflow_run.display_title }}
+
+on:
+  workflow_run:
+    workflows: ["Postsubmit CI"]
+    types: [completed]
+
+jobs:
+  status:
+    runs-on: ubuntu-latest
+    if: ${{ github.event.workflow_run.conclusion != 'skipped' }}
+    steps:
+      - uses: actions/github-script@v7
+        with:
+          script: |
+            const { data: { jobs } } = await github.rest.actions.listJobsForWorkflowRun({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              run_id: ${{ github.event.workflow_run.id }}
+            });
+            const job = jobs.find(j => j.name === 'build-linux');
+            if (job && job.conclusion !== 'success') {
+              core.setFailed(`Linux build failed: ${job.conclusion}`);
+            } else if (!job) {
+              core.warning(`Job build-linux not found in the workflow run.`);
+            }

.github/workflows/status-macos.yml

@@ -0,0 +1,27 @@
+name: macOS
+run-name: ${{ github.event.workflow_run.display_title }}
+
+on:
+  workflow_run:
+    workflows: ["Postsubmit CI"]
+    types: [completed]
+
+jobs:
+  status:
+    runs-on: ubuntu-latest
+    if: ${{ github.event.workflow_run.conclusion != 'skipped' }}
+    steps:
+      - uses: actions/github-script@v7
+        with:
+          script: |
+            const { data: { jobs } } = await github.rest.actions.listJobsForWorkflowRun({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              run_id: ${{ github.event.workflow_run.id }}
+            });
+            const job = jobs.find(j => j.name === 'build-mac');
+            if (job && job.conclusion !== 'success') {
+              core.setFailed(`macOS build failed: ${job.conclusion}`);
+            } else if (!job) {
+              core.warning(`Job build-mac not found in the workflow run.`);
+            }

.github/workflows/status-web.yml

@@ -0,0 +1,27 @@
+name: Web
+run-name: ${{ github.event.workflow_run.display_title }}
+
+on:
+  workflow_run:
+    workflows: ["Postsubmit CI"]
+    types: [completed]
+
+jobs:
+  status:
+    runs-on: ubuntu-latest
+    if: ${{ github.event.workflow_run.conclusion != 'skipped' }}
+    steps:
+      - uses: actions/github-script@v7
+        with:
+          script: |
+            const { data: { jobs } } = await github.rest.actions.listJobsForWorkflowRun({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              run_id: ${{ github.event.workflow_run.id }}
+            });
+            const job = jobs.find(j => j.name === 'build-web');
+            if (job && job.conclusion !== 'success') {
+              core.setFailed(`Web build failed: ${job.conclusion}`);
+            } else if (!job) {
+              core.warning(`Job build-web not found in the workflow run.`);
+            }

.github/workflows/status-windows.yml

@@ -0,0 +1,27 @@
+name: Windows
+run-name: ${{ github.event.workflow_run.display_title }}
+
+on:
+  workflow_run:
+    workflows: ["Postsubmit CI"]
+    types: [completed]
+
+jobs:
+  status:
+    runs-on: ubuntu-latest
+    if: ${{ github.event.workflow_run.conclusion != 'skipped' }}
+    steps:
+      - uses: actions/github-script@v7
+        with:
+          script: |
+            const { data: { jobs } } = await github.rest.actions.listJobsForWorkflowRun({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              run_id: ${{ github.event.workflow_run.id }}
+            });
+            const job = jobs.find(j => j.name === 'build-windows');
+            if (job && job.conclusion !== 'success') {
+              core.setFailed(`Windows build failed: ${job.conclusion}`);
+            } else if (!job) {
+              core.warning(`Job build-windows not found in the workflow run.`);
+            }

BUILDING.md

@@ -5,7 +5,7 @@
 To build Filament, you must first install the following tools:
 
 - CMake 3.22.1 (or more recent)
-- clang 16.0 (or more recent) (Required for Linux and macOS; see [Windows](#windows) section for MSVC support)
+- clang 17.0 (or more recent) (Required for Linux and macOS; see [Windows](#windows) section for MSVC support)
 - [ninja 1.10](https://github.com/ninja-build/ninja/wiki/Pre-built-Ninja-packages) (or more recent)
 
 Additional dependencies may be required for your operating system. Please refer to the appropriate
@@ -79,6 +79,10 @@ The following CMake options are boolean options specific to Filament:
 - `FILAMENT_INSTALL_BACKEND_TEST`: Install the backend test library so it can be consumed on iOS
 - `FILAMENT_USE_EXTERNAL_GLES3`:   Experimental: Compile Filament against OpenGL ES 3
 - `FILAMENT_SKIP_SAMPLES`:         Don't build sample apps
+- `FILAMENT_ENABLE_EXCEPTIONS`:    Enable C++ exceptions (default: ON, OFF for iOS). Required for JNI bindings.
+- `FILAMENT_ENABLE_RTTI`:          Enable C++ RTTI (default: OFF).
+
+Note: If you intend to use the JNI library (Android/Java build), you need to have `FILAMENT_ENABLE_EXCEPTIONS` enabled. If you are using Filament on Android as a pure native library and want to save space, you can disable it (e.g., using `./build.sh -E`).
 
 To turn an option on or off:
 
@@ -93,17 +97,17 @@ Options can also be set with the CMake GUI.
 
 Make sure you've installed the following dependencies:
 
-- `clang-16` or higher
+- `clang-17` or higher
 - `libglu1-mesa-dev`
-- `libc++-16-dev` (`libcxx-devel` and `libcxx-static` on Fedora) or higher
-- `libc++abi-16-dev` (`libcxxabi-static` on Fedora) or higher
+- `libc++-17-dev` (`libcxx-devel` and `libcxx-static` on Fedora) or higher
+- `libc++abi-17-dev` (`libcxxabi-static` on Fedora) or higher
 - `ninja-build`
 - `libxi-dev`
 - `libxcomposite-dev` (`libXcomposite-devel` on Fedora)
 - `libxxf86vm-dev` (`libXxf86vm-devel` on Fedora)
 
 ```shell
-sudo apt install clang-16 libglu1-mesa-dev libc++-16-dev libc++abi-16-dev ninja-build libxi-dev libxcomposite-dev libxxf86vm-dev -y
+sudo apt install clang-17 libglu1-mesa-dev libc++-17-dev libc++abi-17-dev ninja-build libxi-dev libxcomposite-dev libxxf86vm-dev -y
 ```
 
 After dependencies have been installed, we highly recommend using the [easy build](#easy-build)
@@ -124,7 +128,7 @@ Your Linux distribution might default to `gcc` instead of `clang`, if that's the
 ```shell
 mkdir out/cmake-release
 cd out/cmake-release
-# Or use a specific version of clang, for instance /usr/bin/clang-16
+# Or use a specific version of clang, for instance /usr/bin/clang-17
 CC=/usr/bin/clang CXX=/usr/bin/clang++ CXXFLAGS=-stdlib=libc++ \
   cmake -G Ninja -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=../release/filament ../..
 ```
@@ -134,8 +138,8 @@ solution is to use `update-alternatives` to both change the default compiler, an
 specific version of clang:
 
 ```shell
-update-alternatives --install /usr/bin/clang clang /usr/bin/clang-16 100
-update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-16 100
+update-alternatives --install /usr/bin/clang clang /usr/bin/clang-17 100
+update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-17 100
 update-alternatives --install /usr/bin/cc cc /usr/bin/clang 100
 update-alternatives --install /usr/bin/c++ c++ /usr/bin/clang++ 100
 ```
@@ -408,7 +412,7 @@ same version that our continuous builds use.
 
 ```shell
 cd <your chosen parent folder for the emscripten SDK>
-curl -L https://github.com/emscripten-core/emsdk/archive/refs/tags/3.1.60.zip > emsdk.zip
+curl -L https://github.com/emscripten-core/emsdk/archive/refs/tags/5.0.4.zip > emsdk.zip
 unzip emsdk.zip ; mv emsdk-* emsdk ; cd emsdk
 python ./emsdk.py install latest
 python ./emsdk.py activate latest

CMakeLists.txt

@@ -19,13 +19,34 @@ endif()
 # ==================================================================================================
 # Project declaration
 # ==================================================================================================
-project(TNT)
+set(EXTRA_LANGS)
+
+# This is only needed for the webgpu on MacOS build.
+if (APPLE AND NOT IOS)
+    set(EXTRA_LANGS OBJC OBJCXX)
+endif()
+
+project(TNT C CXX ${EXTRA_LANGS})
 
 # ==================================================================================================
 # Options
 # ==================================================================================================
 option(FILAMENT_USE_EXTERNAL_GLES3 "Experimental: Compile Filament against OpenGL ES 3" OFF)
 
+# Note: If you intend to use the JNI library (Android/Java build), you need to have
+# exceptions enabled (the default). If you are using Filament on Android as a pure
+# native library and want to save space, you can disable them.
+# We disable exceptions on iOS by default. This fixes an availability error we see when using
+# std::visit and std::get, which are not supported on iOS 11.0 when exceptions are enabled.
+if (IOS)
+    set(FILAMENT_ENABLE_EXCEPTIONS_DEFAULT OFF)
+else()
+    set(FILAMENT_ENABLE_EXCEPTIONS_DEFAULT ON)
+endif()
+option(FILAMENT_ENABLE_EXCEPTIONS "Enable C++ exceptions" ${FILAMENT_ENABLE_EXCEPTIONS_DEFAULT})
+
+option(FILAMENT_ENABLE_RTTI "Enable C++ RTTI" OFF)
+
 option(FILAMENT_ENABLE_LTO "Enable link-time optimizations if supported by the compiler" OFF)
 option(FILAMENT_SKIP_SAMPLES "Don't build samples" OFF)
 
@@ -100,6 +121,15 @@ set(FILAMENT_OSMESA_PATH "" CACHE STRING
 # Enable exceptions by default in spirv-cross.
 set(SPIRV_CROSS_EXCEPTIONS_TO_ASSERTIONS OFF)
 
+if (NOT FILAMENT_ENABLE_EXCEPTIONS)
+    add_compile_options(-fno-exceptions)
+    set(SPIRV_CROSS_EXCEPTIONS_TO_ASSERTIONS ON)
+endif()
+
+if (NOT FILAMENT_ENABLE_RTTI)
+    add_compile_options(-fno-rtti)
+endif()
+
 # ==================================================================================================
 # CMake policies
 # ==================================================================================================
@@ -337,6 +367,14 @@ endif()
 # ==================================================================================================
 # General compiler flags
 # ==================================================================================================
+
+# This is only needed for the webgpu on MacOS build.
+# Don't enable for iOS because we need to support ios min target 11.0
+if (APPLE AND NOT IOS)
+    set(CMAKE_OBJCXX_STANDARD 20)
+    set(CMAKE_OBJCXX_STANDARD_REQUIRED ON)
+endif()
+
 set(CXX_STANDARD "-std=c++20")
 if (WIN32)
     set(CXX_STANDARD "/std:c++20")
@@ -353,6 +391,7 @@ else()
     endif()
     if (APPLE)
         set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-nullability-extension")
+        set(CMAKE_OBJCXX_FLAGS "${CMAKE_CXX_FLAGS}")
     endif()
 endif()
 
@@ -400,8 +439,7 @@ if (ANDROID)
 endif()
 
 if (CYGWIN)
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-exceptions -fno-rtti")
-    set(SPIRV_CROSS_EXCEPTIONS_TO_ASSERTIONS ON)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-rtti")
 endif()
 
 if (MSVC)
@@ -435,30 +473,17 @@ if (NOT MSVC)
     set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -ffunction-sections -fdata-sections")
 endif()
 
-# On Android RELEASE builds, we disable exceptions and RTTI to save some space (about 75 KiB
-# saved by -fno-exception and 10 KiB saved by -fno-rtti).
-if (ANDROID OR IOS OR WEBGL)
-    set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -fno-exceptions -fno-rtti")
-    set(SPIRV_CROSS_EXCEPTIONS_TO_ASSERTIONS ON)
-
-    if (ANDROID OR WEBGL)
-        # Omitting unwind info prevents the generation of readable stack traces in crash reports on iOS
-        set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -fno-unwind-tables -fno-asynchronous-unwind-tables")
-    endif()
-endif()
-
-# Turn off exceptions on iOS debug as well. This fixes an availability error we see when using
-# std::visit, which is not supported on iOS 11.0 when exceptions are enabled.
-if (IOS)
-    set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -fno-exceptions")
-    set(SPIRV_CROSS_EXCEPTIONS_TO_ASSERTIONS ON)
+if (ANDROID OR WEBGL)
+    # On Android and WebGL RELEASE builds, we omit unwind info to save space.
+    # (We keep unwind info on iOS to allow readable stack traces in crash reports.)
+    set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -fno-unwind-tables -fno-asynchronous-unwind-tables")
 endif()
 
-# With WebGL, we disable RTTI even for debug builds because we pass emscripten::val back and forth
+# With WebGL, we disable RTTI because we pass emscripten::val back and forth
 # between C++ and JavaScript in order to efficiently access typed arrays, which are unbound.
 # NOTE: This is not documented in emscripten so we should consider a different approach.
 if (WEBGL)
-    set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -fno-rtti")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-rtti")
 endif()
 
 if (WEBGL_PTHREADS)
@@ -659,7 +684,6 @@ if (FILAMENT_SUPPORTS_METAL)
     set(MATC_API_FLAGS ${MATC_API_FLAGS} -a metal)
 endif()
 
-# With WebGPU, push constants are not supported. Skinning uses them.
 # WebGPU has a proposal to add push constants at https://github.com/gpuweb/gpuweb/blob/main/proposals/push-constants.md
 # With WebGPU, Tint does not support ClipDistance which is used in Stereo.  Mentioned in comment
 # https://github.com/google/dawn/blob/855d17b08abdf02f9142bf5a8f14d0ea088810a4/src/tint/lang/spirv/reader/ast_parser/function.cc#L4434