Use MapAsync and AllowProcessEvents for callback

.github/actions/mac-prereq/action.yml

@@ -15,7 +15,7 @@ runs:
       uses: actions/cache@v4 # Use a specific version
       with:
         path: ~/Library/Caches/Homebrew
-        key: ${{ runner.os }}-brew-20251211
+        key: ${{ runner.os }}-brew-20250424
     - name: Install Mac Prerequisites
       shell: bash
       run: |

.github/workflows/postsubmit.yml

@@ -21,9 +21,8 @@ jobs:
       - name: Run update script
         env:
           GH_TOKEN: ${{ secrets.FILAMENTBOT_TOKEN }}
-          COMMIT_MESSAGE: ${{ steps.get_commit_msg.outputs.msg }}
         run: |
-          GOLDEN_BRANCH=$(echo "${COMMIT_MESSAGE}" | python3 test/renderdiff/src/commit_msg.py)
+          GOLDEN_BRANCH=$(echo "${{ steps.get_commit_msg.outputs.msg }}" | python3 test/renderdiff/src/commit_msg.py)
           COMMIT_HASH="${{ steps.get_commit_msg.outputs.hash }}"
           if [[ "${GOLDEN_BRANCH}" != "main" ]]; then
               git config --global user.email "filament.bot@gmail.com"

.github/workflows/presubmit.yml

@@ -134,17 +134,18 @@ jobs:
         env:
           COMMIT_MESSAGE: ${{ steps.get_commit_msg.outputs.msg }}
         run: |
+          ls ./gltf/Models
           TEST_DIR=test/renderdiff
           source ${TEST_DIR}/src/preamble.sh
-          set -eux
+          start_
           GOLDEN_BRANCH=$(echo "${COMMIT_MESSAGE}" | python3 ${TEST_DIR}/src/commit_msg.py)
-          bash ${TEST_DIR}/generate.sh
-          python3 ${TEST_DIR}/src/golden_manager.py \
+          bash ${TEST_DIR}/generate.sh && \
+              python3 ${TEST_DIR}/src/golden_manager.py \
                   --branch=${GOLDEN_BRANCH} \
                   --output=${GOLDEN_OUTPUT_DIR}
 
-          # Note that we need to upload the output even if comparison fails, so we undo `set -eux`
-          set +eux
+          # Note that we need to upload the output even if comparison fails, so we undo `set -ex`
+          end_
 
           python3 ${TEST_DIR}/src/compare.py \
               --src=${GOLDEN_OUTPUT_DIR} \
@@ -157,7 +158,6 @@ jobs:
              cat compare_output.txt >> "$GITHUB_OUTPUT"
              echo "$DELIMITER" >> "$GITHUB_OUTPUT"
           fi
-        shell: bash
       - uses: actions/upload-artifact@v4
         with:
           name: presubmit-renderdiff-result

BUILDING.md

@@ -242,12 +242,6 @@ foremost for `arm64-v8a`.
 
 To build Android on Windows machines, see [android/Windows.md](android/Windows.md).
 
-#### Important: SDK location
-
-Either ensure your `ANDROID_HOME` environment variable is set or make sure the root project
-contains a `local.properties` file with the `sdk.dir` property pointing to your installation of
-the Android SDK.
-
 #### Easy Android build
 
 The easiest way to build Filament for Android is to use `build.sh` and the
@@ -257,45 +251,8 @@ The easiest way to build Filament for Android is to use `build.sh` and the
 ./build.sh -p android release
 ```
 
-To build a sample (such as `android/samples/sample-hello-triangle`) for an ARM 64-bit phone, you would run
-```shell
-./build.sh -p android -q arm64-v8a -k sample-hello-triangle release
-```
-
-The output APK can be found in `android/samples/sample-hello-triangle/build/outputs/apk/release/sample-hello-triangle-release-unsigned.apk`
-
 Run `build.sh -h` for more information.
 
-#### Android Studio
-
-You must use the latest stable release of Android Studio.
-
-The Android build of filament is separated into java/kotlin client APIs, a layer of jni bindings
-that bridges java/kotlin with native code, and Filament and other component code that have been compiled
-into architecture-specific libraries. Our default Android Studio gradle setup can compile java/kotlin and
-the jni bindings for you, but it will treat the filament libraries as already compiled and present on
-the system.
-
-Therefore, before compiling the sample app or any other targets, you must
-make sure that the native filament libraries have been compiled and are located at a prescribed location
-so that the jni bindings can link against them. You can do so by using the easy build script
-
-```shell
-./build.sh -p android release -q arm64-v8a
-```
-
-Note that the above step will also install host machine tools into prescribed locations.  These tools are
-required for compiling Filament assets such as materials and environment maps.
-
-Now we are ready to compile the apps.  To open the project, point Studio to the `android` folder.
-After opening the project and syncing with Gradle, select the sample of your choice
-using the drop-down widget in the toolbar. Additionally, you will need to select a deployment target.
-By doing so, Android Studio will automatically try to compile the app only for that specific
-device's architecture. So if you are targeting a new Pixel phone, make sure that the step above
-(compiling the library) is targeting ARM 64-bit (`-q arm64-v8a` ), and if you are running the app on
-an emulator on a Linux machine with an x86 64-bit chipset, you would indicate (`-q x86_64`) in the above step.
-
-
 #### Manual builds
 
 Invoke CMake in a build directory of your choice, inside of filament's directory. The commands

CMakeLists.txt

@@ -872,9 +872,7 @@ add_subdirectory(${LIBRARIES}/utils)
 add_subdirectory(${LIBRARIES}/viewer)
 add_subdirectory(${FILAMENT}/shaders)
 add_subdirectory(${EXTERNAL}/abseil/tnt)
-# Add zstd before basisu to force it to use the external zstd target,
-# preventing a duplicate symbol conflict with its bundled version.
-add_subdirectory(${EXTERNAL}/zstd/tnt)
+add_subdirectory(${EXTERNAL}/basisu/tnt)
 add_subdirectory(${EXTERNAL}/civetweb/tnt)
 add_subdirectory(${EXTERNAL}/imgui/tnt)
 add_subdirectory(${EXTERNAL}/robin-map/tnt)
@@ -888,7 +886,7 @@ add_subdirectory(${EXTERNAL}/jsmn/tnt)
 add_subdirectory(${EXTERNAL}/stb/tnt)
 add_subdirectory(${EXTERNAL}/getopt)
 add_subdirectory(${EXTERNAL}/perfetto/tnt)
-add_subdirectory(${EXTERNAL}/basisu/tnt)
+add_subdirectory(${EXTERNAL}/zstd/tnt)
 
 
 # Note that this has to be placed after mikktspace in order for combine_static_libs to work.

NEW_RELEASE_NOTES.md

@@ -6,3 +6,7 @@
 appropriate header in [RELEASE_NOTES.md](./RELEASE_NOTES.md).
 
 ## Release notes for next branch cut
+
+- engine: add `View::getLastDynamicResolutionScale()` (b/457753622)
+
+- materials: Make Material Instances' UBO descriptor use dynamic offsets. [⚠️ **Recompile Materials**]

README.md

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

RELEASE_NOTES.md

@@ -7,23 +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.68.3
-
-- materials: added support for the glTF `KHR_materials_dispersion` extension, which adds dispersion for refractive objects
-
-## v1.68.2
-
-- Support `setPresentationTime` with the Metal backend.
-
-## v1.68.1
-
-
-## v1.68.0
-
-- engine: add `View::getLastDynamicResolutionScale()` (b/457753622)
-- Metal: report GPU errors to the platform via `debugUpdateStat` (b/431665753).
-- materials: Make Material Instances' UBO descriptor use dynamic offsets. [⚠️ **Recompile Materials**]
-
 ## v1.67.1
 
 - Metal: Add support for the `SwapChain::CONFIG_MSAA_4_SAMPLES` flag.

android/build.gradle

@@ -100,7 +100,7 @@ buildscript {
         'kotlin': '2.0.21',
         'kotlin_coroutines': '1.9.0',
         'buildTools': '35.0.0',
-        'ndk': '29.0.14206865',
+        'ndk': '27.0.11718014',
         'androidx_core': '1.13.1',
         'androidx_annotations': '1.9.0'
     ]
@@ -124,7 +124,6 @@ buildscript {
 
     ext.cmakeArgs = [
         "--no-warn-unused-cli",
-        "-DANDROID_WEAK_API_DEFS=ON",
         "-DANDROID_PIE=ON",
         "-DANDROID_PLATFORM=21",
         "-DANDROID_STL=c++_static",

android/filament-android/CMakeLists.txt

@@ -134,7 +134,6 @@ target_include_directories(filament-jni PRIVATE
         ../../filament/backend/include
         ../../third_party/robin-map
         ../../third_party/perfetto
-        ../../libs/bluevk/include
         ../../libs/utils/include)
 
 # Ordering is significant in the following list. The PRIVATE qualifier prevents transitive deps.
@@ -168,9 +167,3 @@ target_link_libraries(filament-jni
 
 # Force a relink when the version script is changed:
 set_target_properties(filament-jni PROPERTIES LINK_DEPENDS ${VERSION_SCRIPT})
-
-if (FILAMENT_SUPPORTS_VULKAN)
-    add_definitions(-DFILAMENT_SUPPORTS_VULKAN=1)
-else()
-    add_definitions(-DFILAMENT_SUPPORTS_VULKAN=0)
-endif()

android/filament-android/src/main/cpp/Material.cpp

@@ -25,7 +25,7 @@ using namespace filament;
 
 extern "C" JNIEXPORT jlong JNICALL
 Java_com_google_android_filament_Material_nBuilderBuild(JNIEnv *env, jclass,
-        jlong nativeEngine, jobject buffer_, jint size, jint shBandCount, jint shadowQuality, jint uboBatchingMode) {
+        jlong nativeEngine, jobject buffer_, jint size, jint shBandCount, jint shadowQuality) {
     Engine* engine = (Engine*) nativeEngine;
     AutoBuffer buffer(env, buffer_, size);
     auto builder = Material::Builder();
@@ -33,7 +33,6 @@ Java_com_google_android_filament_Material_nBuilderBuild(JNIEnv *env, jclass,
         builder.sphericalHarmonicsBandCount(shBandCount);
     }
     builder.shadowSamplingQuality((Material::Builder::ShadowSamplingQuality)shadowQuality);
-    builder.uboBatching((Material::UboBatchingMode)uboBatchingMode);
     Material* material = builder
             .package(buffer.getData(), buffer.getSize())
             .build(*engine);

android/filament-android/src/main/cpp/SkyBox.cpp

@@ -63,14 +63,6 @@ Java_com_google_android_filament_Skybox_nBuilderColor(JNIEnv *,  jclass,
     builder->color({r, g, b, a});
 }
 
-extern "C"
-JNIEXPORT void JNICALL
-Java_com_google_android_filament_Skybox_nBuilderPriority(JNIEnv *,  jclass,
-        jlong nativeSkyBoxBuilder, jint priority) {
-    Skybox::Builder *builder = (Skybox::Builder *) nativeSkyBoxBuilder;
-    builder->priority(uint8_t(priority));
-}
-
 extern "C" JNIEXPORT jlong JNICALL
 Java_com_google_android_filament_Skybox_nBuilderBuild(JNIEnv *env, jclass type,
         jlong nativeSkyBoxBuilder, jlong nativeEngine) {

android/filament-android/src/main/cpp/Texture.cpp

@@ -21,11 +21,6 @@
 
 #ifdef __ANDROID__
 #include <android/bitmap.h>
-#include <android/hardware_buffer_jni.h>
-#include <backend/platforms/PlatformEGLAndroid.h>
-#   if FILAMENT_SUPPORTS_VULKAN
-#       include <backend/platforms/VulkanPlatformAndroid.h>
-#   endif
 #endif
 
 #include <filament/Engine.h>
@@ -393,57 +388,6 @@ Java_com_google_android_filament_Texture_nSetExternalImage(JNIEnv*, jclass, jlon
     texture->setExternalImage(*engine, (void*)eglImage);
 }
 
-extern "C"
-JNIEXPORT jboolean JNICALL
-Java_com_google_android_filament_Texture_nSetExternalImageByAHB(JNIEnv *env, jclass clazz,
-        jlong nativeTexture, jlong nativeEngine, jobject ahb) {
-    Texture *texture = (Texture *) nativeTexture;
-    Engine *engine = (Engine *) nativeEngine;
-
-#ifdef __ANDROID__
-    Platform* platform = engine->getPlatform();
-    AHardwareBuffer* nativeBuffer = nullptr;
-    if (__builtin_available(android 26, *)) {
-        nativeBuffer = AHardwareBuffer_fromHardwareBuffer(env, ahb);
-    }
-    if (!nativeBuffer) {
-        // either we're not on Android 26, or ahb wasn't a AHardwareBuffer
-        return JNI_FALSE;
-    }
-
-    if (engine->getBackend() == Backend::OPENGL) {
-        // CAVEAT: we assume that Backend::OPENGL on Android implies PlatformEGLAndroid.
-#if UTILS_HAS_RTTI
-        if (!dynamic_cast<PlatformEGLAndroid*>(platform)) {
-            return JNI_FALSE;
-        }
-#endif
-        auto* eglPlatform = (PlatformEGLAndroid*) platform;
-        auto ref = eglPlatform->createExternalImage(nativeBuffer, false);
-        texture->setExternalImage(*engine, ref);
-    }
-
-#if FILAMENT_SUPPORTS_VULKAN
-    else if (engine->getBackend() == Backend::VULKAN) {
-        // CAVEAT: we assume that Backend::VULKAN on Android implies VulkanPlatformAndroid.
-#if UTILS_HAS_RTTI
-        if (!dynamic_cast<VulkanPlatformAndroid*>(platform)) {
-            return JNI_FALSE;
-        }
-#endif
-        auto* vulkanPlatform = (VulkanPlatformAndroid*) platform;
-        auto ref = vulkanPlatform->createExternalImage(nativeBuffer, false);
-        texture->setExternalImage(*engine, ref);
-    }
-#endif // FILAMENT_SUPPORTS_VULKAN
-    // success!
-    return JNI_TRUE;
-#else
-    // other platforms could come here
-    return JNI_FALSE;
-#endif // __ANDROID__
-}
-
 extern "C" JNIEXPORT void JNICALL
 Java_com_google_android_filament_Texture_nSetExternalStream(JNIEnv*, jclass,
         jlong nativeTexture, jlong nativeEngine, jlong nativeStream) {
@@ -663,4 +607,3 @@ Java_com_google_android_filament_android_TextureHelper_nSetBitmapWithCallback(JN
 }
 
 #endif
-

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

@@ -261,20 +261,6 @@ public class Material {
         LOW
     }
 
-    /**
-     * Defines whether a material instance should use UBO batching or not.
-     */
-    public enum UboBatchingMode {
-        /**
-         * For default, it follows the engine settings.
-         * If UBO batching is enabled on the engine and the material domain is SURFACE, it
-         * turns on the UBO batching. Otherwise, it turns off the UBO batching.
-        */
-        DEFAULT,
-        /** Disable the Ubo Batching for this material */
-        DISABLED
-    }
-
     public static class UserVariantFilterBit {
         /** Directional lighting */
         public static int DIRECTIONAL_LIGHTING = 0x01;
@@ -386,7 +372,6 @@ public class Material {
         private int mSize;
         private int mShBandCount = 0;
         private ShadowSamplingQuality mShadowSamplingQuality = ShadowSamplingQuality.LOW;
-        private UboBatchingMode mUboBatchingMode = UboBatchingMode.DEFAULT;
 
 
         /**
@@ -431,17 +416,6 @@ public class Material {
             return this;
         }
 
-        /**
-         * Set the batching mode of the instances created from this material.
-         * @param uboBatchingMode
-         * @return Reference to this Builder for chaining calls.
-         */
-        @NonNull
-        public Builder uboBatching(UboBatchingMode mode) {
-            mUboBatchingMode = mode;
-            return this;
-        }
-
         /**
          * Creates and returns the Material object.
          *
@@ -454,7 +428,7 @@ public class Material {
         @NonNull
         public Material build(@NonNull Engine engine) {
             long nativeMaterial = nBuilderBuild(engine.getNativeObject(),
-                mBuffer, mSize, mShBandCount, mShadowSamplingQuality.ordinal(), mUboBatchingMode.ordinal());
+                mBuffer, mSize, mShBandCount, mShadowSamplingQuality.ordinal());
             if (nativeMaterial == 0) throw new IllegalStateException("Couldn't create Material");
             return new Material(nativeMaterial);
         }
@@ -1120,7 +1094,7 @@ public class Material {
         mNativeObject = 0;
     }
 
-    private static native long nBuilderBuild(long nativeEngine, @NonNull Buffer buffer, int size, int shBandCount, int shadowQuality, int uboBatchingMode);
+    private static native long nBuilderBuild(long nativeEngine, @NonNull Buffer buffer, int size, int shBandCount, int shadowQuality);
     private static native long nCreateInstance(long nativeMaterial);
     private static native long nCreateInstanceWithName(long nativeMaterial, @NonNull String name);
     private static native long nGetDefaultInstance(long nativeMaterial);

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

@@ -155,24 +155,6 @@ public class Skybox {
             return this;
         }
 
-        /**
-         * Set the rendering priority of the Skybox. By default, it is set to the lowest
-         * priority (7) such that the Skybox is always rendered after the opaque objects,
-         * to reduce overdraw when depth culling is enabled.
-         *
-         * @param priority clamped to the range [0..7], defaults to 4; 7 is lowest priority
-         *                 (rendered last).
-         *
-         * @return Builder reference for chaining calls.
-         *
-         * @see RenderableManager.Builder#priority
-         */
-        @NonNull
-        public Builder priority(@IntRange(from = 0, to = 7) int priority) {
-            nBuilderPriority(mNativeBuilder, priority);
-            return this;
-        }
-
         /**
          * Creates a <code>Skybox</code> object
          *
@@ -280,7 +262,6 @@ public class Skybox {
     private static native void nBuilderShowSun(long nativeSkyboxBuilder, boolean show);
     private static native void nBuilderIntensity(long nativeSkyboxBuilder, float intensity);
     private static native void nBuilderColor(long nativeSkyboxBuilder, float r, float g, float b, float a);
-    private static native void nBuilderPriority(long nativeSkyboxBuilder, int priority);
     private static native long nBuilderBuild(long nativeSkyboxBuilder, long nativeEngine);
     private static native void nSetLayerMask(long nativeSkybox, int select, int value);
     private static native int  nGetLayerMask(long nativeSkybox);

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

@@ -71,16 +71,6 @@ import static com.google.android.filament.Texture.Type.COMPRESSED;
  * @see MaterialInstance#setParameter(String, Texture, TextureSampler)
  */
 public class Texture {
-
-    private static Class<?> HardwareBufferClass = null;
-
-    static {
-        try {
-            HardwareBufferClass = Class.forName("android.hardware.HardwareBuffer");
-        } catch (ClassNotFoundException ignored) {
-        }
-    }
-
     private static final Sampler[] sSamplerValues = Sampler.values();
     private static final InternalFormat[] sInternalFormatValues = InternalFormat.values();
 
@@ -1182,38 +1172,6 @@ public class Texture {
         nSetExternalImage(getNativeObject(), engine.getNativeObject(), eglImage);
     }
 
-    /**
-     * Specifies the external image to associate with this <code>Texture</code>.
-     *
-     * <p>Typically, the external image is OS specific, and can be a video or camera frame.
-     * There are many restrictions when using an external image as a texture, such as:</p>
-     * <ul>
-     *   <li> only the level of detail (lod) 0 can be specified</li>
-     *   <li> only nearest or linear filtering is supported</li>
-     *   <li> the size and format of the texture is defined by the external image</li>
-     *   <li> only the CLAMP_TO_EDGE wrap mode is supported</li>
-     * </ul>
-     *
-     * @param engine    {@link Engine} this texture is associated to. Must be the
-     *                  instance passed to {@link Builder#build Builder.build()}.
-     * @param externalImageRef An OS specific Object. On Android it must be a
-     *                         <code>android.hardware.HardwareBuffer</code>
-     */
-    public void setExternalImage(@NonNull Engine engine, Object externalImageRef) {
-        if (HardwareBufferClass != null) {
-            if (!HardwareBufferClass.isInstance(externalImageRef)) {
-                throw new IllegalArgumentException("externalImageRef must be a AHardwareBuffer");
-            }
-            if (!nSetExternalImageByAHB(getNativeObject(), engine.getNativeObject(), externalImageRef)) {
-                throw new IllegalStateException("Error setting AHardwareBuffer as external image");
-            }
-        } else {
-            throw new UnsupportedOperationException(
-                "setExternalImage(Engine, Object) not supported on this platform");
-        }
-    }
-
-
     /**
      * Specifies the external stream to associate with this <code>Texture</code>.
      *
@@ -1406,8 +1364,6 @@ public class Texture {
     private static native void nSetExternalImage(
             long nativeObject, long nativeEngine, long eglImage);
 
-    private static native boolean nSetExternalImageByAHB(long nativeTexture, long nativeObject, Object ahb);
-
     private static native void nSetExternalStream(long nativeTexture,
             long nativeEngine, long nativeStream);
 

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

@@ -16,9 +16,6 @@
 
 package com.google.android.filament.utils
 
-import android.graphics.Bitmap
-import android.os.Handler
-import android.os.Looper
 import android.view.MotionEvent
 import android.view.Surface
 import android.view.SurfaceView
@@ -29,7 +26,6 @@ import com.google.android.filament.android.UiHelper
 import com.google.android.filament.gltfio.*
 import kotlinx.coroutines.*
 import java.nio.Buffer
-import java.nio.ByteBuffer
 
 private const val kNearPlane = 0.05f     // 5 cm
 private const val kFarPlane = 1000.0f    // 1 km
@@ -123,8 +119,6 @@ class ModelViewer(
     private val target = DoubleArray(3)
     private val upward = DoubleArray(3)
 
-    private var debugFrameCallback: ((Bitmap) -> Unit)? = null
-
     init {
         renderer = engine.createRenderer()
         scene = engine.createScene()
@@ -311,39 +305,10 @@ class ModelViewer(
         // Render the scene, unless the renderer wants to skip the frame.
         if (renderer.beginFrame(swapChain!!, frameTimeNanos)) {
             renderer.render(view)
-
-            debugFrameCallback?.let {
-                val viewport = view.viewport
-                val bitmap = Bitmap.createBitmap(viewport.width, viewport.height,
-                        Bitmap.Config.ARGB_8888)
-                val buffer = ByteBuffer.allocateDirect(viewport.width * viewport.height * 4)
-
-                val handler = Handler(Looper.getMainLooper())
-                val pixelBufferDescriptor = Texture.PixelBufferDescriptor(buffer,
-                        Texture.Format.RGBA, Texture.Type.UBYTE, 1, 0, 0, 0, handler) {
-                    buffer.rewind()
-                    bitmap.copyPixelsFromBuffer(buffer)
-                    it(bitmap)
-                }
-                renderer.readPixels(viewport.left, viewport.bottom, viewport.width,
-                                    viewport.height, pixelBufferDescriptor)
-                debugFrameCallback = null
-            }
-
             renderer.endFrame()
         }
     }
 
-    /*
-     * Sets a callback that will be invoked with the next rendered frame as a Bitmap. Note that this
-     * is a one-time callback.
-     *
-     *  @param callback   callback to be invoked with a rendered frame as [Bitmap]
-     */
-    fun debugGetNextFrameCallback(callback: (Bitmap) -> Unit) {
-        debugFrameCallback = callback
-    }
-
     private fun populateScene(asset: FilamentAsset) {
         val rcm = engine.renderableManager
         var count = 0

android/gradle.properties

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

android/samples/README.md

@@ -80,12 +80,54 @@ frame and the external texture are perfectly synchronized.
 
 ![Stream Test](../../docs/images/samples/sample_stream_test.jpg)
 
-## Building Samples
+## Prerequisites
 
 Before you start, make sure to read [Filament's README](../../README.md). You need to be able to
 compile Filament's native library and Filament's AAR for this project. The easiest way to proceed
 is to install all the required dependencies and to run the following commands at the root of the
-source tree.
+source tree:
 
-To build the samples, please follow the steps described in [BUILDING.md](../../BUILDING.md#android)
+```shell
+./build.sh -p desktop -i release
+./build.sh -p android release
+```
 
+This will build all the native components and the AAR required by this sample application.
+
+If you do not use the build script, you must set the `filament_tools_dir` property when invoking
+Gradle, either from the command line or from `local.properties`. This property must point to the
+distribution/install directory for desktop (produced by make/ninja install). This directory must
+contain `bin/matc` and `bin/cmgen`.
+
+Example:
+```shell
+./gradlew -Pfilament_tools_dir=../../dist-release assembleDebug
+```
+
+## Important: SDK location
+
+Either ensure your `ANDROID_HOME` environment variable is set or make sure the root project
+contains a `local.properties` file with the `sdk.dir` property pointing to your installation of
+the Android SDK.
+
+## Compiling
+
+### Android Studio
+
+You must use the latest stable release of Android Studio. To open the project, point Studio to the
+`android` folder. After opening the project and syncing to gradle, select the sample of your choice
+using the drop-down widget in the toolbar.
+
+To compile and run each sample make sure you have selected the appropriate build variant
+(arm7, arm8, x86 or x86_64). If you are not sure you can simply select the "universal"
+variant which includes all the other ones.
+
+### Command Line
+
+From the `android` directory in the project root:
+
+```shell
+./gradlew :samples:sample-hello-triangle:installDebug
+```
+
+Replace `sample-hello-triangle` with your preferred project.

android/samples/sample-texture-target/.gitignore

@@ -1,12 +0,0 @@
-*.iml
-.gradle
-/local.properties
-/.idea/workspace.xml
-/.idea/libraries
-/.idea/caches
-/.idea/gradle.xml
-.DS_Store
-/build
-/captures
-/src/main/assets
-.externalNativeBuild

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

@@ -1,53 +0,0 @@
-plugins {
-    id 'com.android.application'
-    id 'kotlin-android'
-    id 'filament-tools-plugin'
-}
-
-project.ext.isSample = true
-
-kotlin {
-    jvmToolchain(versions.jdk)
-}
-
-filamentTools {
-    materialInputDir = project.layout.projectDirectory.dir("src/main/materials")
-    materialOutputDir = project.layout.projectDirectory.dir("src/main/assets/materials")
-}
-
-clean.doFirst {
-    delete "src/main/assets"
-}
-
-android {
-    namespace 'com.google.android.filament.texturetarget'
-
-    compileSdkVersion versions.compileSdk
-    defaultConfig {
-        applicationId "com.google.android.filament.texturetarget"
-        minSdkVersion 26
-        targetSdkVersion versions.targetSdk
-    }
-
-    // NOTE: This is a workaround required because the AGP task collectReleaseDependencies
-    //       is not configuration-cache friendly yet; this is only useful for Play publication
-    dependenciesInfo {
-        includeInApk = false
-    }
-
-    // We use the .filamat extension for materials compiled with matc
-    // Telling aapt to not compress them allows to load them efficiently
-    aaptOptions {
-        noCompress 'filamat', 'ktx'
-    }
-
-    compileOptions {
-        sourceCompatibility versions.jdk
-        targetCompatibility versions.jdk
-    }
-}
-
-dependencies {
-    implementation deps.kotlin
-    implementation project(':filament-android')
-}

android/samples/sample-texture-target/src/main/AndroidManifest.xml

@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
-
-  <application
-      android:allowBackup="true"
-      android:icon="@mipmap/ic_launcher"
-      android:label="@string/app_name"
-      android:roundIcon="@mipmap/ic_launcher_round"
-      android:supportsRtl="true"
-      android:theme="@style/AppTheme">
-    <activity
-        android:exported="true"
-        android:name=".MainActivity">
-      <intent-filter>
-        <action android:name="android.intent.action.MAIN"/>
-
-        <category android:name="android.intent.category.LAUNCHER"/>
-      </intent-filter>
-    </activity>
-  </application>
-
-</manifest>

android/samples/sample-texture-target/src/main/java/com/google/android/filament/texturetarget/MainActivity.kt

@@ -1,429 +0,0 @@
-/*
- * Copyright (C) 2024 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.google.android.filament.texturetarget
-
-import android.animation.ValueAnimator
-import android.app.Activity
-import android.hardware.HardwareBuffer
-import android.opengl.Matrix
-import android.os.Bundle
-import android.view.Choreographer
-import android.view.Surface
-import android.view.SurfaceView
-import android.view.animation.LinearInterpolator
-import com.google.android.filament.*
-import com.google.android.filament.RenderableManager.PrimitiveType
-import com.google.android.filament.VertexBuffer.AttributeType
-import com.google.android.filament.VertexBuffer.VertexAttribute
-import com.google.android.filament.android.DisplayHelper
-import com.google.android.filament.android.FilamentHelper
-import com.google.android.filament.android.UiHelper
-import java.nio.ByteBuffer
-import java.nio.ByteOrder
-import java.nio.channels.Channels
-import kotlin.math.PI
-import kotlin.math.cos
-import kotlin.math.sin
-
-class MainActivity : Activity() {
-    companion object {
-        init {
-            Filament.init()
-        }
-    }
-
-    private lateinit var surfaceView: SurfaceView
-    private lateinit var uiHelper: UiHelper
-    private lateinit var displayHelper: DisplayHelper
-    private lateinit var choreographer: Choreographer
-
-    private lateinit var engine: Engine
-    private lateinit var renderer: Renderer
-    private lateinit var scene: Scene
-    private lateinit var view: View
-    private lateinit var camera: Camera
-
-    private lateinit var triangleMaterial: Material
-    private lateinit var texturedMaterial: Material
-    private lateinit var triangleVertexBuffer: VertexBuffer
-    private lateinit var triangleIndexBuffer: IndexBuffer
-    private lateinit var quadVertexBuffer: VertexBuffer
-    private lateinit var quadIndexBuffer: IndexBuffer
-
-    @Entity private var triangleRenderable = 0
-    @Entity private var quadRenderable = 0
-
-    private var swapChain: SwapChain? = null
-
-    private val frameScheduler = FrameCallback()
-    private val animator = ValueAnimator.ofFloat(0.0f, 360.0f)
-
-    private var hardwareBuffer: HardwareBuffer? = null
-    private var texture: Texture? = null
-    private var renderTarget: RenderTarget? = null
-
-    private lateinit var offscreenView: View
-    private lateinit var offscreenCamera: Camera
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        surfaceView = SurfaceView(this)
-        setContentView(surfaceView)
-        choreographer = Choreographer.getInstance()
-        displayHelper = DisplayHelper(this)
-        setupSurfaceView()
-        setupFilament()
-        setupView()
-        setupScene()
-    }
-
-    private fun setupSurfaceView() {
-        uiHelper = UiHelper(UiHelper.ContextErrorPolicy.DONT_CHECK)
-        uiHelper.renderCallback = SurfaceCallback()
-        uiHelper.attachTo(surfaceView)
-    }
-
-    private fun setupFilament() {
-        engine = Engine.create()
-        renderer = engine.createRenderer()
-        scene = engine.createScene()
-        view = engine.createView()
-        camera = engine.createCamera(engine.entityManager.create())
-        offscreenView = engine.createView()
-        offscreenCamera = engine.createCamera(engine.entityManager.create())
-    }
-
-    private fun setupView() {
-        scene.skybox = Skybox.Builder()
-            .priority(0)
-            .color(0.0f, 0.0f, 1.0f, 1.0f).build(engine)
-
-        // This is the view that will be drawn on screen.
-        view.camera = camera
-        view.scene = scene
-        view.isPostProcessingEnabled = false
-
-        // This is the view that will be rendered off-screen.
-        offscreenView.camera = offscreenCamera
-        offscreenView.scene = scene
-        offscreenView.isPostProcessingEnabled = false
-    }
-
-    private fun setupScene() {
-        loadMaterials()
-        createTriangleMesh()
-        createQuadMesh()
-
-        // layer 1: skybox
-        // layer 2: triangle
-        // layer 3: quad
-
-        triangleMaterial.defaultInstance.cullingMode = Material.CullingMode.NONE;
-        texturedMaterial.defaultInstance.cullingMode = Material.CullingMode.NONE;
-
-        // The triangle is a regular renderable.
-        triangleRenderable = EntityManager.get().create()
-        RenderableManager.Builder(1)
-            .geometry(0, PrimitiveType.TRIANGLES, triangleVertexBuffer, triangleIndexBuffer, 0, 3)
-            .material(0, triangleMaterial.defaultInstance)
-            .culling(false)
-            .castShadows(false)
-            .receiveShadows(false)
-            .layerMask(7, 2)
-            .build(engine, triangleRenderable)
-
-        // The quad is a regular renderable.
-        quadRenderable = EntityManager.get().create()
-        RenderableManager.Builder(1)
-            .geometry(0, PrimitiveType.TRIANGLES, quadVertexBuffer, quadIndexBuffer, 0, 6)
-            .material(0, texturedMaterial.defaultInstance)
-            .culling(false)
-            .castShadows(false)
-            .receiveShadows(false)
-            .layerMask(7, 4)
-            .build(engine, quadRenderable)
-
-        // We only want to render the triangle in the offscreen view.
-        offscreenView.setVisibleLayers(7, 3)    // render skybox + triangle
-
-        // We only want to render the quad in the on-screen view.
-        view.setVisibleLayers(7, 4)             // render quad only
-
-        scene.addEntity(triangleRenderable)
-        scene.addEntity(quadRenderable)
-
-        startAnimation()
-    }
-
-    private fun loadMaterials() {
-        readUncompressedAsset("materials/baked_color.filamat").let {
-            triangleMaterial = Material.Builder().payload(it, it.remaining()).build(engine)
-        }
-        readUncompressedAsset("materials/textured.filamat").let {
-            texturedMaterial = Material.Builder().payload(it, it.remaining()).build(engine)
-        }
-    }
-
-    private fun createTriangleMesh() {
-        val intSize = 4
-        val floatSize = 4
-        val shortSize = 2
-        val vertexSize = 3 * floatSize + intSize
-
-        data class Vertex(val x: Float, val y: Float, val z: Float, val color: Int)
-        fun ByteBuffer.put(v: Vertex): ByteBuffer {
-            putFloat(v.x)
-            putFloat(v.y)
-            putFloat(v.z)
-            putInt(v.color)
-            return this
-        }
-
-        val vertexCount = 3
-        val a1 = PI * 2.0 / 3.0
-        val a2 = PI * 4.0 / 3.0
-
-        val vertexData = ByteBuffer.allocate(vertexCount * vertexSize)
-            .order(ByteOrder.nativeOrder())
-            .put(Vertex(1.0f, 0.0f, 0.0f, 0xffff0000.toInt()))
-            .put(Vertex(cos(a1).toFloat(), sin(a1).toFloat(), 0.0f, 0xff00ff00.toInt()))
-            .put(Vertex(cos(a2).toFloat(), sin(a2).toFloat(), 0.0f, 0xff0000ff.toInt()))
-            .flip()
-
-        triangleVertexBuffer = VertexBuffer.Builder()
-            .bufferCount(1)
-            .vertexCount(vertexCount)
-            .attribute(VertexAttribute.POSITION, 0, AttributeType.FLOAT3, 0, vertexSize)
-            .attribute(VertexAttribute.COLOR, 0, AttributeType.UBYTE4, 3 * floatSize, vertexSize)
-            .normalized(VertexAttribute.COLOR)
-            .build(engine)
-        triangleVertexBuffer.setBufferAt(engine, 0, vertexData)
-
-        val indexData = ByteBuffer.allocate(vertexCount * shortSize)
-            .order(ByteOrder.nativeOrder())
-            .putShort(0)
-            .putShort(1)
-            .putShort(2)
-            .flip()
-
-        triangleIndexBuffer = IndexBuffer.Builder()
-            .indexCount(3)
-            .bufferType(IndexBuffer.Builder.IndexType.USHORT)
-            .build(engine)
-        triangleIndexBuffer.setBuffer(engine, indexData)
-    }
-
-    private fun createQuadMesh() {
-        val floatSize = 4
-        val shortSize = 2
-        val vertexSize = (2 * floatSize) + (2 * floatSize) // position + UV
-
-        data class Vertex(val x: Float, val y: Float, val u: Float, val v: Float)
-        fun ByteBuffer.put(v: Vertex): ByteBuffer {
-            putFloat(v.x)
-            putFloat(v.y)
-            putFloat(v.u)
-            putFloat(v.v)
-            return this
-        }
-
-        val vertexCount = 4
-        val vertexData = ByteBuffer.allocate(vertexCount * vertexSize)
-            .order(ByteOrder.nativeOrder())
-            .put(Vertex(-1.0f, -1.0f, 0.0f, 0.0f))
-            .put(Vertex( 1.0f, -1.0f, 1.0f, 0.0f))
-            .put(Vertex( 1.0f,  1.0f, 1.0f, 1.0f))
-            .put(Vertex(-1.0f,  1.0f, 0.0f, 1.0f))
-            .flip()
-
-        quadVertexBuffer = VertexBuffer.Builder()
-            .bufferCount(1)
-            .vertexCount(vertexCount)
-            .attribute(VertexAttribute.POSITION, 0, AttributeType.FLOAT2, 0, vertexSize)
-            .attribute(VertexAttribute.UV0, 0, AttributeType.FLOAT2, 2 * floatSize, vertexSize)
-            .build(engine)
-        quadVertexBuffer.setBufferAt(engine, 0, vertexData)
-
-        val indexData = ByteBuffer.allocate(6 * shortSize)
-            .order(ByteOrder.nativeOrder())
-            .putShort(0).putShort(1).putShort(2)
-            .putShort(0).putShort(2).putShort(3)
-            .flip()
-
-        quadIndexBuffer = IndexBuffer.Builder()
-            .indexCount(6)
-            .bufferType(IndexBuffer.Builder.IndexType.USHORT)
-            .build(engine)
-        quadIndexBuffer.setBuffer(engine, indexData)
-    }
-
-    private fun startAnimation() {
-        animator.interpolator = LinearInterpolator()
-        animator.duration = 4000
-        animator.repeatMode = ValueAnimator.RESTART
-        animator.repeatCount = ValueAnimator.INFINITE
-        animator.addUpdateListener { a ->
-            val transformMatrix = FloatArray(16)
-            Matrix.setRotateM(transformMatrix, 0, -(a.animatedValue as Float), 0.0f, 0.0f, 1.0f)
-            val tcm = engine.transformManager
-            tcm.setTransform(tcm.getInstance(triangleRenderable), transformMatrix)
-        }
-        animator.start()
-    }
-
-    override fun onResume() {
-        super.onResume()
-        choreographer.postFrameCallback(frameScheduler)
-        animator.start()
-    }
-
-    override fun onPause() {
-        super.onPause()
-        choreographer.removeFrameCallback(frameScheduler)
-        animator.cancel()
-    }
-
-    override fun onDestroy() {
-        super.onDestroy()
-        choreographer.removeFrameCallback(frameScheduler)
-        animator.cancel()
-        uiHelper.detach()
-
-        // Destroy all renderables.
-        scene.remove(triangleRenderable)
-        scene.remove(quadRenderable)
-
-        // Destroy all resources.
-        engine.destroyEntity(triangleRenderable)
-        engine.destroyEntity(quadRenderable)
-        engine.destroyRenderer(renderer)
-        engine.destroyVertexBuffer(triangleVertexBuffer)
-        engine.destroyIndexBuffer(triangleIndexBuffer)
-        engine.destroyVertexBuffer(quadVertexBuffer)
-        engine.destroyIndexBuffer(quadIndexBuffer)
-        engine.destroyMaterial(triangleMaterial)
-        engine.destroyMaterial(texturedMaterial)
-        engine.destroyView(view)
-        engine.destroyView(offscreenView)
-        engine.destroyScene(scene)
-        engine.destroyCameraComponent(camera.entity)
-        engine.destroyCameraComponent(offscreenCamera.entity)
-        renderTarget?.let { engine.destroyRenderTarget(it) }
-        texture?.let { engine.destroyTexture(it) }
-        hardwareBuffer?.close()
-
-        val entityManager = EntityManager.get()
-        entityManager.destroy(triangleRenderable)
-        entityManager.destroy(quadRenderable)
-        entityManager.destroy(camera.entity)
-        entityManager.destroy(offscreenCamera.entity)
-
-        engine.destroy()
-    }
-
-    inner class FrameCallback : Choreographer.FrameCallback {
-        override fun doFrame(frameTimeNanos: Long) {
-            choreographer.postFrameCallback(this)
-            if (uiHelper.isReadyToRender) {
-                if (renderer.beginFrame(swapChain!!, frameTimeNanos)) {
-                    // Render the triangle to the texture.
-                    renderer.render(offscreenView)
-                    // Render the quad to the screen.
-                    renderer.render(view)
-                    renderer.endFrame()
-                }
-            }
-        }
-    }
-
-    inner class SurfaceCallback : UiHelper.RendererCallback {
-        override fun onNativeWindowChanged(surface: Surface) {
-            swapChain?.let { engine.destroySwapChain(it) }
-            swapChain = engine.createSwapChain(surface, uiHelper.swapChainFlags)
-            displayHelper.attach(renderer, surfaceView.display)
-        }
-
-        override fun onDetachedFromSurface() {
-            displayHelper.detach()
-            swapChain?.let {
-                engine.destroySwapChain(it)
-                engine.flushAndWait()
-                swapChain = null
-            }
-        }
-
-        override fun onResized(width: Int, height: Int) {
-            // On-screen camera
-            val zoom = 1.0
-            val aspect = width.toDouble() / height.toDouble()
-            camera.setProjection(Camera.Projection.ORTHO, -aspect * zoom, aspect * zoom, -zoom, zoom, 0.0, 10.0)
-            view.viewport = Viewport(0, 0, width, height)
-
-            // Off-screen camera
-            val offscreenZoom = 1.5
-            offscreenCamera.setProjection(Camera.Projection.ORTHO,
-                -aspect * offscreenZoom, aspect * offscreenZoom,
-                -offscreenZoom, offscreenZoom, 0.0, 10.0)
-            offscreenView.viewport = Viewport(0, 0, width, height)
-
-            // If we have a render target, destroy it.
-            renderTarget?.let { engine.destroyRenderTarget(it) }
-            texture?.let { engine.destroyTexture(it) }
-            hardwareBuffer?.close()
-
-            // Create a new render target.
-            hardwareBuffer = HardwareBuffer.create(width, height,
-                HardwareBuffer.RGBA_8888, 1,
-                HardwareBuffer.USAGE_GPU_SAMPLED_IMAGE or HardwareBuffer.USAGE_GPU_COLOR_OUTPUT)
-
-            texture = Texture.Builder()
-                .width(width)
-                .height(height)
-                .usage(Texture.Usage.COLOR_ATTACHMENT or Texture.Usage.SAMPLEABLE)
-                .sampler(Texture.Sampler.SAMPLER_EXTERNAL)
-                .format(Texture.InternalFormat.RGBA8)
-                .external()
-                .build(engine)
-
-            texture!!.setExternalImage(engine, hardwareBuffer!!)
-
-            renderTarget = RenderTarget.Builder()
-                .texture(RenderTarget.AttachmentPoint.COLOR, texture!!)
-                .build(engine)
-
-            offscreenView.renderTarget = renderTarget
-
-            // Set the texture on the quad material.
-            texturedMaterial.defaultInstance.setParameter("texture", texture!!,
-                TextureSampler(TextureSampler.MinFilter.LINEAR, TextureSampler.MagFilter.LINEAR,
-                    TextureSampler.WrapMode.CLAMP_TO_EDGE))
-
-            FilamentHelper.synchronizePendingFrames(engine)
-        }
-    }
-
-    private fun readUncompressedAsset(assetName: String): ByteBuffer {
-        assets.openFd(assetName).use { fd ->
-            val input = fd.createInputStream()
-            val dst = ByteBuffer.allocate(fd.length.toInt())
-            val src = Channels.newChannel(input)
-            src.read(dst)
-            src.close()
-            return dst.apply { rewind() }
-        }
-    }
-}

android/samples/sample-texture-target/src/main/materials/baked_color.mat

@@ -1,18 +0,0 @@
-material {
-    name : baked_color,
-    shadingModel : unlit,
-    requires : [
-        color
-    ]
-}
-
-fragment {
-    void material(inout MaterialInputs material) {
-        // You must always call the prepareMaterial() function
-        prepareMaterial(material);
-
-        // We set the material's color to the color interpolated from
-        // the model's vertices
-        material.baseColor = getColor();
-    }
-}

android/samples/sample-texture-target/src/main/materials/textured.mat

@@ -1,20 +0,0 @@
-material {
-    name : textured,
-    shadingModel : unlit,
-    parameters : [
-        {
-            type : samplerExternal,
-            name : texture
-        }
-    ],
-    requires: [
-        uv0
-    ]
-}
-
-fragment {
-    void material(inout MaterialInputs material) {
-        prepareMaterial(material);
-        material.baseColor = texture(materialParams_texture, getUV0());
-    }
-}

android/samples/sample-texture-target/src/main/res/drawable-v24/ic_launcher_foreground.xml

@@ -1,34 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:aapt="http://schemas.android.com/aapt"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportHeight="108"
-    android:viewportWidth="108">
-  <path
-      android:fillType="evenOdd"
-      android:pathData="M32,64C32,64 38.39,52.99 44.13,50.95C51.37,48.37 70.14,49.57 70.14,49.57L108.26,87.69L108,109.01L75.97,107.97L32,64Z"
-      android:strokeColor="#00000000"
-      android:strokeWidth="1">
-    <aapt:attr name="android:fillColor">
-      <gradient
-          android:endX="78.5885"
-          android:endY="90.9159"
-          android:startX="48.7653"
-          android:startY="61.0927"
-          android:type="linear">
-        <item
-            android:color="#44000000"
-            android:offset="0.0"/>
-        <item
-            android:color="#00000000"
-            android:offset="1.0"/>
-      </gradient>
-    </aapt:attr>
-  </path>
-  <path
-      android:fillColor="#FFFFFF"
-      android:fillType="nonZero"
-      android:pathData="M66.94,46.02L66.94,46.02C72.44,50.07 76,56.61 76,64L32,64C32,56.61 35.56,50.11 40.98,46.06L36.18,41.19C35.45,40.45 35.45,39.3 36.18,38.56C36.91,37.81 38.05,37.81 38.78,38.56L44.25,44.05C47.18,42.57 50.48,41.71 54,41.71C57.48,41.71 60.78,42.57 63.68,44.05L69.11,38.56C69.84,37.81 70.98,37.81 71.71,38.56C72.44,39.3 72.44,40.45 71.71,41.19L66.94,46.02ZM62.94,56.92C64.08,56.92 65,56.01 65,54.88C65,53.76 64.08,52.85 62.94,52.85C61.8,52.85 60.88,53.76 60.88,54.88C60.88,56.01 61.8,56.92 62.94,56.92ZM45.06,56.92C46.2,56.92 47.13,56.01 47.13,54.88C47.13,53.76 46.2,52.85 45.06,52.85C43.92,52.85 43,53.76 43,54.88C43,56.01 43.92,56.92 45.06,56.92Z"
-      android:strokeColor="#00000000"
-      android:strokeWidth="1"/>
-</vector>

android/samples/sample-texture-target/src/main/res/drawable/ic_launcher_background.xml

@@ -1,171 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportHeight="108"
-    android:viewportWidth="108">
-  <path
-      android:fillColor="#26A69A"
-      android:pathData="M0,0h108v108h-108z"/>
-  <path
-      android:fillColor="#00000000"
-      android:pathData="M9,0L9,108"
-      android:strokeColor="#33FFFFFF"
-      android:strokeWidth="0.8"/>
-  <path
-      android:fillColor="#00000000"
-      android:pathData="M19,0L19,108"
-      android:strokeColor="#33FFFFFF"
-      android:strokeWidth="0.8"/>
-  <path
-      android:fillColor="#00000000"
-      android:pathData="M29,0L29,108"
-      android:strokeColor="#33FFFFFF"
-      android:strokeWidth="0.8"/>
-  <path
-      android:fillColor="#00000000"
-      android:pathData="M39,0L39,108"
-      android:strokeColor="#33FFFFFF"
-      android:strokeWidth="0.8"/>
-  <path
-      android:fillColor="#00000000"
-      android:pathData="M49,0L49,108"
-      android:strokeColor="#33FFFFFF"
-      android:strokeWidth="0.8"/>
-  <path
-      android:fillColor="#00000000"
-      android:pathData="M59,0L59,108"
-      android:strokeColor="#33FFFFFF"
-      android:strokeWidth="0.8"/>
-  <path
-      android:fillColor="#00000000"
-      android:pathData="M69,0L69,108"
-      android:strokeColor="#33FFFFFF"
-      android:strokeWidth="0.8"/>
-  <path
-      android:fillColor="#00000000"
-      android:pathData="M79,0L79,108"
-      android:strokeColor="#33FFFFFF"
-      android:strokeWidth="0.8"/>
-  <path
-      android:fillColor="#00000000"
-      android:pathData="M89,0L89,108"
-      android:strokeColor="#33FFFFFF"
-      android:strokeWidth="0.8"/>
-  <path
-      android:fillColor="#00000000"
-      android:pathData="M99,0L99,108"
-      android:strokeColor="#33FFFFFF"
-      android:strokeWidth="0.8"/>
-  <path
-      android:fillColor="#00000000"
-      android:pathData="M0,9L108,9"
-      android:strokeColor="#33FFFFFF"
-      android:strokeWidth="0.8"/>
-  <path
-      android:fillColor="#00000000"
-      android:pathData="M0,19L108,19"
-      android:strokeColor="#33FFFFFF"
-      android:strokeWidth="0.8"/>
-  <path
-      android:fillColor="#00000000"
-      android:pathData="M0,29L108,29"
-      android:strokeColor="#33FFFFFF"
-      android:strokeWidth="0.8"/>
-  <path
-      android:fillColor="#00000000"
-      android:pathData="M0,39L108,39"
-      android:strokeColor="#33FFFFFF"
-      android:strokeWidth="0.8"/>
-  <path
-      android:fillColor="#00000000"
-      android:pathData="M0,49L108,49"
-      android:strokeColor="#33FFFFFF"
-      android:strokeWidth="0.8"/>
-  <path
-      android:fillColor="#00000000"
-      android:pathData="M0,59L108,59"
-      android:strokeColor="#33FFFFFF"
-      android:strokeWidth="0.8"/>
-  <path
-      android:fillColor="#00000000"
-      android:pathData="M0,69L108,69"
-      android:strokeColor="#33FFFFFF"
-      android:strokeWidth="0.8"/>
-  <path
-      android:fillColor="#00000000"
-      android:pathData="M0,79L108,79"
-      android:strokeColor="#33FFFFFF"
-      android:strokeWidth="0.8"/>
-  <path
-      android:fillColor="#00000000"
-      android:pathData="M0,89L108,89"
-      android:strokeColor="#33FFFFFF"
-      android:strokeWidth="0.8"/>
-  <path
-      android:fillColor="#00000000"
-      android:pathData="M0,99L108,99"
-      android:strokeColor="#33FFFFFF"
-      android:strokeWidth="0.8"/>
-  <path
-      android:fillColor="#00000000"
-      android:pathData="M19,29L89,29"
-      android:strokeColor="#33FFFFFF"
-      android:strokeWidth="0.8"/>
-  <path
-      android:fillColor="#00000000"
-      android:pathData="M19,39L89,39"
-      android:strokeColor="#33FFFFFF"
-      android:strokeWidth="0.8"/>
-  <path
-      android:fillColor="#00000000"
-      android:pathData="M19,49L89,49"
-      android:strokeColor="#33FFFFFF"
-      android:strokeWidth="0.8"/>
-  <path
-      android:fillColor="#00000000"
-      android:pathData="M19,59L89,59"
-      android:strokeColor="#33FFFFFF"
-      android:strokeWidth="0.8"/>
-  <path
-      android:fillColor="#00000000"
-      android:pathData="M19,69L89,69"
-      android:strokeColor="#33FFFFFF"
-      android:strokeWidth="0.8"/>
-  <path
-      android:fillColor="#00000000"
-      android:pathData="M19,79L89,79"
-      android:strokeColor="#33FFFFFF"
-      android:strokeWidth="0.8"/>
-  <path
-      android:fillColor="#00000000"
-      android:pathData="M29,19L29,89"
-      android:strokeColor="#33FFFFFF"
-      android:strokeWidth="0.8"/>
-  <path
-      android:fillColor="#00000000"
-      android:pathData="M39,19L39,89"
-      android:strokeColor="#33FFFFFF"
-      android:strokeWidth="0.8"/>
-  <path
-      android:fillColor="#00000000"
-      android:pathData="M49,19L49,89"
-      android:strokeColor="#33FFFFFF"
-      android:strokeWidth="0.8"/>
-  <path
-      android:fillColor="#00000000"
-      android:pathData="M59,19L59,89"
-      android:strokeColor="#33FFFFFF"
-      android:strokeWidth="0.8"/>
-  <path
-      android:fillColor="#00000000"
-      android:pathData="M69,19L69,89"
-      android:strokeColor="#33FFFFFF"
-      android:strokeWidth="0.8"/>
-  <path
-      android:fillColor="#00000000"
-      android:pathData="M79,19L79,89"
-      android:strokeColor="#33FFFFFF"
-      android:strokeWidth="0.8"/>
-</vector>

android/samples/sample-texture-target/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-  <background android:drawable="@drawable/ic_launcher_background"/>
-  <foreground android:drawable="@drawable/ic_launcher_foreground"/>
-</adaptive-icon>

android/samples/sample-texture-target/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-  <background android:drawable="@drawable/ic_launcher_background"/>
-  <foreground android:drawable="@drawable/ic_launcher_foreground"/>
-</adaptive-icon>

android/samples/sample-texture-target/src/main/res/values/colors.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-  <color name="colorPrimary">#3F51B5</color>
-  <color name="colorPrimaryDark">#303F9F</color>
-  <color name="colorAccent">#FF4081</color>
-</resources>

android/samples/sample-texture-target/src/main/res/values/strings.xml

@@ -1,3 +0,0 @@
-<resources>
-  <string name="app_name">Texture Target</string>
-</resources>

android/samples/sample-texture-target/src/main/res/values/styles.xml

@@ -1,8 +0,0 @@
-<resources>
-
-  <!-- Base application theme. -->
-  <style name="AppTheme" parent="android:Theme.Material.Light.DarkActionBar">
-    <!-- Customize your theme here. -->
-  </style>
-
-</resources>

android/settings.gradle

@@ -17,7 +17,6 @@ include ':samples:sample-multi-view'
 include ':samples:sample-page-curl'
 include ':samples:sample-stream-test'
 include ':samples:sample-texture-view'
-include ':samples:sample-texture-target'
 include ':samples:sample-textured-object'
 include ':samples:sample-transparent-view'
 

build.sh

@@ -158,7 +158,7 @@ function print_fgviewer_help {
 }
 
 # Unless explicitly specified, NDK version will be selected as highest available version within same major release chain
-FILAMENT_NDK_VERSION=$(cat `dirname $0`/build/common/versions | grep GITHUB_NDK_VERSION | sed s/GITHUB_NDK_VERSION=//g | cut -f 1 -d ".")
+FILAMENT_NDK_VERSION=${FILAMENT_NDK_VERSION:-$(cat `dirname $0`/build/common/versions | grep GITHUB_NDK_VERSION | sed s/GITHUB_NDK_VERSION=//g | cut -f 1 -d ".")}
 
 # Internal variables
 ISSUE_CLEAN=false
@@ -556,14 +556,11 @@ function build_android {
         archive_android "Release"
     fi
 
-    local root_dir=$(pwd)
-
     pushd android > /dev/null
 
     if [[ "${ISSUE_DEBUG_BUILD}" == "true" ]]; then
         ./gradlew \
             -Pcom.google.android.filament.dist-dir=../out/android-debug/filament \
-            -Pcom.google.android.filament.tools-dir=${root_dir}/out/debug/filament \
             -Pcom.google.android.filament.abis=${ABI_GRADLE_OPTION} \
             ${VULKAN_ANDROID_GRADLE_OPTION} \
             ${WEBGPU_ANDROID_GRADLE_OPTION} \
@@ -576,7 +573,6 @@ function build_android {
 
         ./gradlew \
             -Pcom.google.android.filament.dist-dir=../out/android-debug/filament \
-            -Pcom.google.android.filament.tools-dir=${root_dir}/out/debug/filament \
             -Pcom.google.android.filament.abis=${ABI_GRADLE_OPTION} \
             ${WEBGPU_ANDROID_GRADLE_OPTION} \
             :filamat-android:assembleDebug
@@ -585,7 +581,6 @@ function build_android {
             for sample in ${ANDROID_SAMPLES}; do
                 ./gradlew \
                     -Pcom.google.android.filament.dist-dir=../out/android-debug/filament \
-                   -Pcom.google.android.filament.tools-dir=${root_dir}/out/debug/filament \
                     -Pcom.google.android.filament.abis=${ABI_GRADLE_OPTION} \
                     ${MATOPT_GRADLE_OPTION} \
                     :samples:${sample}:assembleDebug
@@ -618,7 +613,6 @@ function build_android {
     if [[ "${ISSUE_RELEASE_BUILD}" == "true" ]]; then
         ./gradlew \
             -Pcom.google.android.filament.dist-dir=../out/android-release/filament \
-            -Pcom.google.android.filament.tools-dir=${root_dir}/out/release/filament \
             -Pcom.google.android.filament.abis=${ABI_GRADLE_OPTION} \
             ${VULKAN_ANDROID_GRADLE_OPTION} \
             ${WEBGPU_ANDROID_GRADLE_OPTION} \
@@ -631,7 +625,6 @@ function build_android {
 
         ./gradlew \
             -Pcom.google.android.filament.dist-dir=../out/android-release/filament \
-            -Pcom.google.android.filament.tools-dir=${root_dir}/out/release/filament \
             -Pcom.google.android.filament.abis=${ABI_GRADLE_OPTION} \
             ${WEBGPU_ANDROID_GRADLE_OPTION} \
             :filamat-android:assembleRelease
@@ -640,7 +633,6 @@ function build_android {
             for sample in ${ANDROID_SAMPLES}; do
                 ./gradlew \
                     -Pcom.google.android.filament.dist-dir=../out/android-release/filament \
-                    -Pcom.google.android.filament.tools-dir=${root_dir}/out/release/filament \
                     -Pcom.google.android.filament.abis=${ABI_GRADLE_OPTION} \
                     ${MATOPT_GRADLE_OPTION} \
                     :samples:${sample}:assembleRelease

build/android/build.sh

@@ -18,8 +18,8 @@ if [[ "$GITHUB_WORKFLOW" ]]; then
     fi
 fi
 
-# Unless explicitly specified, NDK version will be selected as highest available version within same major release chain
-FILAMENT_NDK_VERSION=$(cat `dirname $0`/../common/versions | grep GITHUB_NDK_VERSION | sed s/GITHUB_NDK_VERSION=//g)
+# Unless explicitly specified, NDK version will be set to match exactly the required one
+FILAMENT_NDK_VERSION=${GITHUB_NDK_VERSION:-27.0.11718014}
 
 (! grep "${FILAMENT_NDK_VERSION}" `dirname $0`/../../android/build.gradle > /dev/null) &&
     echo "Mismatch of NDK versions: want ${FILAMENT_NDK_VERSION} and not found in android/build.gradle" &&

build/common/test_list.txt

@@ -1,5 +1,6 @@
 libs/viewer/test_settings
 filament/test/test_filament --gtest_filter=-FilamentTest.FroxelData:FilamentExposureWithEngineTest.SetExposure:FilamentExposureWithEngineTest.ComputeEV100:RenderingTest.*
+filament/test/test_material_parser
 libs/math/test_math
 libs/image/test_image compare libs/image/tests/reference/
 libs/utils/test_utils

build/common/versions

@@ -3,7 +3,7 @@ GITHUB_CMAKE_VERSION=3.22.1
 GITHUB_NINJA_VERSION=1.10.2
 GITHUB_MESA_VERSION=24.2.1
 GITHUB_LLVM_VERSION=16
-GITHUB_NDK_VERSION=29.0.14206865
+GITHUB_NDK_VERSION=27.0.11718014
 GITHUB_EMSDK_VERSION=3.1.60
 GITHUB_VULKANSDK_VERSION=1.4.321.0
-GITHUB_GLTF_SAMPLE_ASSETS_COMMIT=d441dfdb87413ff412c620849a649d61789a470f
+GITHUB_GLTF_SAMPLE_ASSETS_COMMIT=d441dfdb87413ff412c620849a649d61789a470f

build/toolchain-aarch64-linux-android.cmake

@@ -75,7 +75,7 @@ set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
 #   C_FLAGS += -Wl,-pie
 #   CXX_FLAGS += -lstdc++
 
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIE -march=armv8-a -mtune=cortex-a78" CACHE STRING "Toolchain CFLAGS")
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIE -mcpu=cortex-a57" CACHE STRING "Toolchain CFLAGS")
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_C_FLAGS}" CACHE STRING "Toolchain CXXFLAGS")
 set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fPIE -pie -static-libstdc++" CACHE STRING "Toolchain LDFLAGS")
 set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -static-libstdc++" CACHE STRING "Toolchain LDFLAGS")

build/toolchain-arm7-linux-android.cmake

@@ -87,7 +87,7 @@ set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
 # for hardfp: CFLAGS must have -mhard-float
 #             LDFLAGS must have -Wl,--no-warn-mismatch
 #
-set(CMAKE_C_FLAGS   "${CMAKE_C_FLAGS} -mthumb -march=armv7-a -mfloat-abi=softfp -mfpu=neon-vfpv4 -fPIE" CACHE STRING "Toolchain CFLAGS")
+set(CMAKE_C_FLAGS   "${CMAKE_C_FLAGS} -mthumb -march=armv7-a -mcpu=cortex-a15 -mfloat-abi=softfp -mfpu=neon-vfpv4 -fPIE" CACHE STRING "Toolchain CFLAGS")
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_C_FLAGS}" CACHE STRING "Toolchain CXXFLAGS")
 set(CMAKE_EXE_LINKER_FLAGS    "${CMAKE_EXE_LINKER_FLAGS}    -march=armv7-a -Wl,--no-warn-mismatch -L${TOOLCHAIN}/arm-linux-androideabi/lib/armv7-a -static-libstdc++ -fPIE -pie" CACHE STRING "Toolchain LDFLAGS")
 set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -march=armv7-a -Wl,--no-warn-mismatch -L${TOOLCHAIN}/arm-linux-androideabi/lib/armv7-a -static-libstdc++" CACHE STRING "Toolchain LDFLAGS")

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.68.0'
+    implementation 'com.google.android.filament:filament-android:1.66.2'
 }
 </code></pre>
 <p>Here are all the libraries available in the group <code>com.google.android.filament</code>:</p>
@@ -196,7 +196,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.68.0'
+<pre><code class="language-shell">pod 'Filament', '~&gt; 1.66.2'
 </code></pre>
 <h2 id="documentation"><a class="header" href="#documentation">Documentation</a></h2>
 <ul>

docs_src/build/postsubmit.sh

@@ -16,8 +16,6 @@
 
 FILAMENT_BOT_TOKEN=$2
 
-set -ex
-
 function update_to_main() {
     python3 docs_src/build/run.py
     mkdir -p tmp
@@ -51,5 +49,3 @@ else
     echo "has edits (to /docs_src): ${HAS_EDITS}"
     echo "bypass: ${DO_BYPASS}"
 fi
-
-set +ex

docs_src/build/requirements.txt

@@ -10,6 +10,6 @@ sortedcontainers==2.4.0
 trio==0.31.0
 trio-websocket==0.12.2
 typing_extensions==4.15.0
-urllib3==2.6.0
+urllib3==2.5.0
 websocket-client==1.9.0
 wsproto==1.2.0

docs_src/build/run.py

@@ -81,28 +81,6 @@ def pull_markdeep_docs():
     def __init__(self, *args, **kwargs):
         super().__init__(*args, directory=MARKDEEP_DIR, **kwargs)
 
-    def do_GET(self):
-      print(f'================ {self.path}')
-      # Use the checked-in markdeep since its locked to a version
-      if self.path == '/third_party/markdeep/markdeep.min.js':
-        file_path = f'{ROOT_DIR}/third_party/markdeep/markdeep.min.js'
-        try:
-          with open(file_path, 'rb') as f:
-            content = f.read()
-
-          self.send_response(200)
-          self.send_header('Content-type', 'application/javascript')
-          self.send_header('Content-Length', len(content))
-          self.end_headers()
-
-          # Send the file content
-          self.wfile.write(content)
-        except FileNotFoundError:
-          self.send_error(404, 'File not found')
-      else:
-        # For all other paths, use the default behavior (serve from MARKDEEP_DIR)
-        super().do_GET()
-
   def start_server(port):
     """Starts the web server in a separate thread."""
     httpd = Server(("", port), Handler)
@@ -115,9 +93,6 @@ def pull_markdeep_docs():
   PORT = 12345
   httpd = start_server(PORT)
 
-  # Workaround for unknown dead-lock when the selenium tries to make request to the local server above.
-  time.sleep(3)
-
   # Set up Chrome options for headless mode
   chrome_options = Options()
   chrome_options.add_argument("--headless")
@@ -132,8 +107,7 @@ def pull_markdeep_docs():
     # Open the URL with ?export, which markdeep will export the resulting html.
     driver.get(f"http://localhost:{PORT}/{doc}.md.html?export")
 
-    time.sleep(1.5)
-
+    time.sleep(3)
     # We extract the html from the resulting "page" (an html output itself).
     text = driver.find_elements(By.TAG_NAME, "pre")[0].text
 

docs_src/src_markdeep/Materials.md.html

@@ -97,7 +97,6 @@ in table [standardProperties].
 **transmission**        | Defines how much of the diffuse light of a dielectric is transmitted through the object, in other words this defines how transparent an object is
 **ior**                 | Index of refraction, either for refractive objects or as an alternative to reflectance
 **microThickness**      | Thickness of the thin layer of refractive objects
-**dispersion**          | Strength of the dispersion effect for refractive objects, specified as 20/Abbe number
 **bentNormal**          | A normal pointing in the average unoccluded direction. Can be used to improve indirect lighting quality
 **shadowStrength**      | Strength factor between 0 and 1 for all shadows received by this material
 [Table [standardProperties]: Properties of the standard model]
@@ -127,7 +126,6 @@ The type and range of each property is described in table [standardPropertiesTyp
 **absorption**          | float3   |  [0..n]                  |
 **microThickness**      | float    |  [0..n]                  |
 **thickness**           | float    |  [0..n]                  |
-**dispersion**          | float    |  [0..n]                  | Realistic values are between [0, 1], with the exception of Rutile, which has a value of 2.04
 [Table [standardPropertiesTypes]: Range and type of the standard model's properties]
 
 
@@ -155,14 +153,13 @@ The type and range of each property is described in table [standardPropertiesTyp
     as-is, which can lead to physically impossible materials, however, this might be desirable
     for artistic reasons.
 
-!!! Note: About `thickness`, `microThickness` and `dispersion` for refraction
+!!! Note: About `thickness` and `microThickness` for refraction
     `thickness` represents the thickness of solid objects in the direction of the normal, for
     satisfactory results, this should be provided per fragment (e.g.: as a texture) or at least per
     vertex. `microThickness` represent the thickness of the thin layer of an object, and can
     generally be provided as a constant value. For example, a 1mm thin hollow sphere of radius 1m,
-    would have a `thickness` of 1 and a `microThickness` of 0.001. Dispersion controls the angular
-    separation of colors transmitting through a volume, and can be set by a contant value.
-    Currently `thickness` and `dispersion` are not used when `refractionType` is set to `thin`.
+    would have a `thickness` of 1 and a `microThickness` of 0.001. Currently `thickness` is not
+    used when `refractionType` is set to `thin`.
 
 ### Base color
 
@@ -654,23 +651,6 @@ the `refractionType` is set to `solid` and `absorption` coefficients are set.
 ![Figure [varyingThickness]: `thickness` varying from 0.0 at the top of the prism to 3.0 at the
 bottom of the prism](images/material_thickness.png)
 
-### Dispersion
-
-The dispersion property controls the angular separation of colors transmitting through a relatively
-clear volume. It can only be used when `refractionType` is set to `volume`.
-Its value is specified as 20/Abbe number. When the value is zero, no dispersion is used.
-
-Table [commonMatDispersion] describes acceptable dispersion values for various types of materials.
-
-Material                   |   Abbe Number (V)	|  Dispersion (20/V)
---------------------------:|:------------------:|:-----------------
-Rutile                     | 9.8                | 2.04
-Polycarbonate              | 32                 | 0.625
-Diamond                    | 55                 | 0.36
-Water                      | 55                 | 0.36
-Crown Glass                | 59                 | 0.33
-[Table [commonMatDispersion]: Dispersion of common materials]
-
 ## Subsurface model
 
 ### Thickness
@@ -2296,7 +2276,6 @@ struct MaterialInputs {
     float3 absorption;          // default float3(0.0, 0.0, 0.0)
     float ior;                  // default: 1.5
     float microThickness;       // default: 0.0, not available with refractionType "solid"
-    float dispersion;           // default: 0.0, not available with refractionType "thin"
 }
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 

filament/backend/CMakeLists.txt

@@ -36,7 +36,6 @@ set(SRCS
         src/Driver.cpp
         src/Handle.cpp
         src/HandleAllocator.cpp
-        src/JobQueue.cpp
         src/ostream.cpp
         src/noop/NoopDriver.cpp
         src/noop/PlatformNoop.cpp
@@ -60,7 +59,6 @@ set(PRIVATE_HDRS
         src/CompilerThreadPool.h
         src/DataReshaper.h
         src/DriverBase.h
-        src/JobQueue.h
 )
 
 # ==================================================================================================
@@ -208,8 +206,6 @@ if (FILAMENT_SUPPORTS_VULKAN)
             src/vulkan/VulkanDriverFactory.h
             src/vulkan/VulkanExternalImageManager.cpp
             src/vulkan/VulkanExternalImageManager.h
-            src/vulkan/VulkanStreamedImageManager.cpp
-            src/vulkan/VulkanStreamedImageManager.h
             src/vulkan/VulkanFboCache.cpp
             src/vulkan/VulkanFboCache.h
             src/vulkan/VulkanHandles.cpp
@@ -320,8 +316,6 @@ if (FILAMENT_SUPPORTS_WEBGPU)
             src/webgpu/WebGPURenderPrimitive.h
             src/webgpu/WebGPURenderTarget.cpp
             src/webgpu/WebGPURenderTarget.h
-            src/webgpu/WebGPUStagePool.cpp
-            src/webgpu/WebGPUStagePool.h
             src/webgpu/WebGPUStrings.h
             src/webgpu/WebGPUSwapChain.cpp
             src/webgpu/WebGPUSwapChain.h
@@ -335,25 +329,13 @@ if (FILAMENT_SUPPORTS_WEBGPU)
             src/webgpu/WebGPUVertexBufferInfo.h
     )
     if (WIN32)
-        list(APPEND SRCS
-            include/backend/platforms/WebGPUPlatformWindows.h
-            src/webgpu/platform/WebGPUPlatformWindows.cpp
-        )
+        list(APPEND SRCS src/webgpu/platform/WebGPUPlatformWindows.cpp)
     elseif (LINUX)
-        list(APPEND SRCS
-            include/backend/platforms/WebGPUPlatformLinux.h
-            src/webgpu/platform/WebGPUPlatformLinux.cpp
-        )
+        list(APPEND SRCS src/webgpu/platform/WebGPUPlatformLinux.cpp)
     elseif (APPLE OR IOS)
-        list(APPEND SRCS
-            include/backend/platforms/WebGPUPlatformApple.h
-            src/webgpu/platform/WebGPUPlatformApple.mm
-        )
+        list(APPEND SRCS src/webgpu/platform/WebGPUPlatformApple.mm)
     elseif (ANDROID)
-        list(APPEND SRCS
-            include/backend/platforms/WebGPUPlatformAndroid.h
-            src/webgpu/platform/WebGPUPlatformAndroid.cpp
-        )
+        list(APPEND SRCS src/webgpu/platform/WebGPUPlatformAndroid.cpp)
     endif()
 
     if (TNT_DEV)
@@ -582,7 +564,6 @@ if (APPLE OR LINUX)
         test/test_ReadPixels.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

filament/backend/include/backend/BufferObjectStreamDescriptor.h

@@ -0,0 +1,63 @@
+/*
+ * Copyright (C) 2025 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef TNT_FILAMENT_BACKEND_BUFFEROBJECTSTREAMDESCRIPTOR_H
+#define TNT_FILAMENT_BACKEND_BUFFEROBJECTSTREAMDESCRIPTOR_H
+
+#include <backend/Handle.h>
+
+#include <vector>
+
+namespace filament::backend {
+
+/**
+ * The type of association between a buffer object and a stream.
+ */
+ enum class BufferObjectStreamAssociationType { TRANSFORM_MATRIX };
+
+/**
+ * A descriptor for a buffer object to stream association.
+ */
+class UTILS_PUBLIC BufferObjectStreamDescriptor {
+public:
+    //! creates an empty descriptor
+    BufferObjectStreamDescriptor() noexcept = default;
+
+    BufferObjectStreamDescriptor(const BufferObjectStreamDescriptor& rhs) = delete;
+    BufferObjectStreamDescriptor& operator=(const BufferObjectStreamDescriptor& rhs) = delete;
+
+    BufferObjectStreamDescriptor(BufferObjectStreamDescriptor&& rhs) = default;
+    BufferObjectStreamDescriptor& operator=(BufferObjectStreamDescriptor&& rhs) = default;
+
+    // --------------------------------------------------------------------------------------------
+
+    struct StreamDataDescriptor {
+        uint32_t offset;
+        Handle<HwStream> stream;
+        BufferObjectStreamAssociationType associationType;
+    };
+
+    std::vector<StreamDataDescriptor> mStreams;
+};
+
+} // namespace filament::backend
+
+#if !defined(NDEBUG)
+utils::io::ostream& operator<<(utils::io::ostream& out,
+        const filament::backend::BufferObjectStreamDescriptor& b);
+#endif
+
+#endif // TNT_FILAMENT_BACKEND_BUFFEROBJECTSTREAMDESCRIPTOR_H

filament/backend/include/backend/DriverEnums.h

@@ -1713,8 +1713,6 @@ using FrameTimestamps = Platform::FrameTimestamps;
 
 using CompositorTiming = Platform::CompositorTiming;
 
-using AsynchronousMode = Platform::AsynchronousMode;
-
 } // namespace filament::backend
 
 template<> struct utils::EnableBitMaskOperators<filament::backend::ShaderStageFlags>

filament/backend/include/backend/Platform.h

@@ -19,17 +19,13 @@
 #ifndef TNT_FILAMENT_BACKEND_PLATFORM_H
 #define TNT_FILAMENT_BACKEND_PLATFORM_H
 
-#include <utils/CString.h>
 #include <utils/compiler.h>
 #include <utils/Invocable.h>
-#include <utils/Mutex.h>
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <atomic>
-#include <memory>
-#include <mutex>
 
 namespace filament::backend {
 
@@ -74,9 +70,6 @@ public:
         ExternalImageHandle& operator=(ExternalImageHandle const& rhs) noexcept;
         ExternalImageHandle& operator=(ExternalImageHandle&& rhs) noexcept;
 
-        bool operator==(const ExternalImageHandle& rhs) const noexcept {
-            return mTarget == rhs.mTarget;
-        }
         explicit operator bool() const noexcept { return mTarget != nullptr; }
 
         ExternalImage* UTILS_NULLABLE get() noexcept { return mTarget; }
@@ -255,28 +248,6 @@ public:
         REALTIME,
     };
 
-    /**
-     * Defines how asynchronous operations are handled by the engine.
-     */
-    enum class AsynchronousMode : uint8_t {
-        /**
-         * Asynchronous operations are disabled. This is the default.
-         */
-        NONE,
-
-        /**
-         * Attempts to use a dedicated worker thread for asynchronous tasks. If threading is not
-         * supported by the platform, it automatically falls back to using an amortization strategy.
-         */
-        THREAD_PREFERRED,
-
-        /**
-         * Uses an amortization strategy, processing a small number of asynchronous tasks during
-         * each engine update cycle.
-         */
-        AMORTIZATION,
-    };
-
     struct DriverConfig {
         /**
          * Size of handle arena in bytes. Setting to 0 indicates default value is to be used.
@@ -346,11 +317,6 @@ public:
          *      - VulkanPlatform
          */
         bool vulkanEnableStagingBufferBypass = false;
-
-        /**
-         * Asynchronous mode for the engine. Defines how asynchronous operations are handled.
-         */
-        AsynchronousMode asynchronousMode = AsynchronousMode::NONE;
     };
 
     Platform() noexcept;
@@ -542,22 +508,13 @@ public:
     // --------------------------------------------------------------------------------------------
     // Debugging APIs
 
-    using DebugUpdateStatFunc = utils::Invocable<void(const char* UTILS_NONNULL key,
-            uint64_t intValue, utils::CString stringValue)>;
+    using DebugUpdateStatFunc = utils::Invocable<void(const char* UTILS_NONNULL key, uint64_t value)>;
 
     /**
      * Sets the callback function that the backend can use to update backend-specific statistics
      * to aid with debugging. This callback is guaranteed to be called on the Filament driver
      * thread.
      *
-     * The callback signature is (key, intValue, stringValue). Note that for any given call,
-     * only one of the value parameters (intValue or stringValue) will be meaningful, depending on
-     * the specific key.
-     *
-     * IMPORTANT_NOTE: because the callback is called on the driver thread, only quick, non-blocking
-     * work should be done inside it. Furthermore, no graphics API calls (such as GL calls) should
-     * be made, which could interfere with Filament's driver state.
-     *
      * @param debugUpdateStat   an Invocable that updates debug statistics
      */
     void setDebugUpdateStatFunc(DebugUpdateStatFunc&& debugUpdateStat) noexcept;
@@ -576,32 +533,15 @@ public:
      * This function is guaranteed to be called only on a single thread, the Filament driver
      * thread.
      *
-     * @param key           a null-terminated C-string with the key of the debug statistic
-     * @param intValue      the updated integer value of key (the string value passed to the
-     *                      callback will be empty)
+     * @param key          a null-terminated C-string with the key of the debug statistic
+     * @param value        the updated value of key
      */
-    void debugUpdateStat(const char* UTILS_NONNULL key, uint64_t intValue);
-
-    /**
-     * To track backend-specific statistics, the backend implementation can call the
-     * application-provided callback function debugUpdateStatFunc to associate or update a value
-     * with a given key. It is possible for this function to be called multiple times with the
-     * same key, in which case newer values should overwrite older values.
-     *
-     * This function is guaranteed to be called only on a single thread, the Filament driver
-     * thread.
-     *
-     * @param key           a null-terminated C-string with the key of the debug statistic
-     * @param stringValue   the updated string value of key (the integer value passed to the
-     *                      callback will be 0)
-     */
-    void debugUpdateStat(const char* UTILS_NONNULL key, utils::CString stringValue);
+    void debugUpdateStat(const char* UTILS_NONNULL key, uint64_t value);
 
 private:
-    std::shared_ptr<InsertBlobFunc> mInsertBlob;
-    std::shared_ptr<RetrieveBlobFunc> mRetrieveBlob;
-    std::shared_ptr<DebugUpdateStatFunc> mDebugUpdateStat;
-    mutable utils::Mutex mMutex;
+    InsertBlobFunc mInsertBlob;
+    RetrieveBlobFunc mRetrieveBlob;
+    DebugUpdateStatFunc mDebugUpdateStat;
 };
 
 } // namespace filament

filament/backend/include/backend/platforms/PlatformEGLAndroid.h

@@ -17,6 +17,8 @@
 #ifndef TNT_FILAMENT_BACKEND_OPENGL_OPENGL_PLATFORM_EGL_ANDROID_H
 #define TNT_FILAMENT_BACKEND_OPENGL_OPENGL_PLATFORM_EGL_ANDROID_H
 
+#include "AndroidSwapChainHelper.h"
+#include "AndroidFrameCallback.h"
 #include "AndroidNdk.h"
 
 #include <backend/AcquiredImage.h>
@@ -30,6 +32,8 @@
 
 #include <math/mat3.h>
 
+#include "AndroidNativeWindow.h"
+
 #include <chrono>
 
 #include <stddef.h>
@@ -167,10 +171,19 @@ protected:
             SwapChain* drawSwapChain,
             SwapChain* readSwapChain) override;
 
-private:
-    struct SwapChainEGLAndroid;
-    struct AndroidDetails;
+    struct SwapChainEGLAndroid : public SwapChainEGL {
+        SwapChainEGLAndroid(PlatformEGLAndroid const& platform,
+                void* nativeWindow, uint64_t flags);
+        SwapChainEGLAndroid(PlatformEGLAndroid const& platform,
+                uint32_t width, uint32_t height, uint64_t flags);
+        void terminate(PlatformEGLAndroid& platform);
+        bool setPresentFrameId(uint64_t frameId) const noexcept;
+        uint64_t getFrameId(uint64_t frameId) const noexcept;
+    private:
+        AndroidSwapChainHelper mImpl{};
+    };
 
+private:
     // prevent derived classes' implementations to call through
     [[nodiscard]] SwapChain* createSwapChain(void* nativeWindow, uint64_t flags) override;
     [[nodiscard]] SwapChain* createSwapChain(uint32_t width, uint32_t height, uint64_t flags) override;
@@ -190,14 +203,17 @@ private:
 
     int mOSVersion;
     ExternalStreamManagerAndroid& mExternalStreamManager;
-    AndroidDetails& mAndroidDetails;
     InitializeJvmForPerformanceManagerIfNeeded const mInitializeJvmForPerformanceManagerIfNeeded;
     utils::PerformanceHintManager mPerformanceHintManager;
     utils::PerformanceHintManager::Session mPerformanceHintSession;
+    SwapChainEGLAndroid* mCurrentDrawSwapChain{};
+
     using clock = std::chrono::high_resolution_clock;
     clock::time_point mStartTimeOfActualWork;
-    SwapChainEGLAndroid* mCurrentDrawSwapChain{};
+    AndroidProducerThrottling mProducerThrottling;
     bool mAssertNativeWindowIsValid = false;
+
+    AndroidFrameCallback mAndroidFrameCallback;
 };
 
 } // namespace filament::backend

filament/backend/include/backend/platforms/PlatformWebGL.h

@@ -33,7 +33,8 @@ protected:
     // --------------------------------------------------------------------------------------------
     // Platform Interface
 
-    Driver* createDriver(void* sharedGLContext, const DriverConfig& driverConfig) override;
+    Driver* createDriver(void* sharedGLContext,
+            const Platform::DriverConfig& driverConfig) override;
 
     int getOSVersion() const noexcept override;
 
@@ -42,7 +43,7 @@ protected:
 
     void terminate() noexcept override;
 
-    SwapChain* createSwapChain(void* nativeWindow, uint64_t flags) noexcept override;
+    SwapChain* createSwapChain(void* nativewindow, uint64_t flags) noexcept override;
     SwapChain* createSwapChain(uint32_t width, uint32_t height, uint64_t flags) noexcept override;
     void destroySwapChain(SwapChain* swapChain) noexcept override;
     bool makeCurrent(ContextType type, SwapChain* drawSwapChain, SwapChain* readSwapChain) override;

filament/backend/include/backend/platforms/VulkanPlatformAndroid.h

@@ -17,13 +17,12 @@
 #ifndef TNT_FILAMENT_BACKEND_PLATFORMS_VULKAN_PLATFORM_ANDROID_H
 #define TNT_FILAMENT_BACKEND_PLATFORMS_VULKAN_PLATFORM_ANDROID_H
 
+#include "AndroidFrameCallback.h"
 #include "AndroidNdk.h"
 
 #include <backend/DriverEnums.h>
 #include <backend/platforms/VulkanPlatform.h>
 
-#include <utils/compiler.h>
-
 #include <android/hardware_buffer.h>
 
 namespace filament::backend {
@@ -92,8 +91,6 @@ protected:
     VkExternalFenceHandleTypeFlagBits getFenceExportFlags() const noexcept override;
 
 private:
-    struct AndroidDetails;
-
     struct ExternalImageVulkanAndroid : public ExternalImage {
         AHardwareBuffer* aHardwareBuffer = nullptr;
         bool sRGB = false;
@@ -102,7 +99,7 @@ private:
         ~ExternalImageVulkanAndroid() override;
     };
 
-    AndroidDetails& mAndroidDetails;
+    AndroidFrameCallback mAndroidFrameCallback;
     int mOSVersion{};
 };
 

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

@@ -54,9 +54,9 @@ public:
     //      a 3rd party library could be considered. However, this was a simple and
     //      quick change and works for now.
     // gets the size (height and width) of the surface/window
-    [[nodiscard]] virtual wgpu::Extent2D getSurfaceExtent(void* nativeWindow) const = 0;
+    [[nodiscard]] wgpu::Extent2D getSurfaceExtent(void* nativeWindow) const;
     // either returns a valid surface or panics
-    [[nodiscard]] virtual wgpu::Surface createSurface(void* nativeWindow, uint64_t flags) = 0;
+    [[nodiscard]] wgpu::Surface createSurface(void* nativeWindow, uint64_t flags);
     // either returns a valid adapter or panics
     [[nodiscard]] wgpu::Adapter requestAdapter(wgpu::Surface const& surface);
     // either returns a valid device or panics
@@ -74,9 +74,10 @@ protected:
     [[nodiscard]] Driver* createDriver(void* sharedContext,
             const Platform::DriverConfig& driverConfig) override;
 
+private:
     // returns adapter request option variations applicable for the particular
     // platform
-    [[nodiscard]] virtual std::vector<wgpu::RequestAdapterOptions> getAdapterOptions() = 0;
+    [[nodiscard]] static std::vector<wgpu::RequestAdapterOptions> getAdapterOptions();
 
     // we may consider having the driver own this in the future
     wgpu::Instance mInstance;

filament/backend/include/backend/platforms/WebGPUPlatformAndroid.h

@@ -1,35 +0,0 @@
-/*
-* Copyright (C) 2025 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef TNT_FILAMENT_BACKEND_PLATFORMS_WEBGPUPLATFORMANDROID_H
-#define TNT_FILAMENT_BACKEND_PLATFORMS_WEBGPUPLATFORMANDROID_H
-
-#include <backend/platforms/WebGPUPlatform.h>
-
-namespace filament::backend {
-
-class WebGPUPlatformAndroid : public WebGPUPlatform {
-public:
-    wgpu::Extent2D getSurfaceExtent(void* nativeWindow) const override;
-    wgpu::Surface createSurface(void* nativeWindow, uint64_t /*flags*/) override;
-
-protected:
-    std::vector<wgpu::RequestAdapterOptions> getAdapterOptions() override;
-};
-
-} // namespace filament::backend
-
-#endif // TNT_FILAMENT_BACKEND_PLATFORMS_WEBGPUPLATFORMANDROID_H

filament/backend/include/backend/platforms/WebGPUPlatformApple.h

@@ -1,35 +0,0 @@
-/*
- * Copyright (C) 2025 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef TNT_FILAMENT_BACKEND_PLATFORMS_WEBGPUPLATFORMAPPLE_H
-#define TNT_FILAMENT_BACKEND_PLATFORMS_WEBGPUPLATFORMAPPLE_H
-
-#include <backend/platforms/WebGPUPlatform.h>
-
-namespace filament::backend {
-
-class WebGPUPlatformApple : public WebGPUPlatform {
-public:
-    wgpu::Extent2D getSurfaceExtent(void* nativeWindow) const override;
-    wgpu::Surface createSurface(void* nativeWindow, uint64_t /*flags*/) override;
-
-protected:
-    std::vector<wgpu::RequestAdapterOptions> getAdapterOptions() override;
-};
-
-} // namespace filament::backend
-
-#endif // TNT_FILAMENT_BACKEND_PLATFORMS_WEBGPUPLATFORMAPPLE_H

filament/backend/include/backend/platforms/WebGPUPlatformLinux.h

@@ -1,35 +0,0 @@
-/*
-* Copyright (C) 2025 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef TNT_FILAMENT_BACKEND_PLATFORMS_WEBGPUPLATFORMLINUX_H
-#define TNT_FILAMENT_BACKEND_PLATFORMS_WEBGPUPLATFORMLINUX_H
-
-#include <backend/platforms/WebGPUPlatform.h>
-
-namespace filament::backend {
-
-class WebGPUPlatformLinux : public WebGPUPlatform {
-public:
-    wgpu::Extent2D getSurfaceExtent(void* nativeWindow) const override;
-    wgpu::Surface createSurface(void* nativeWindow, uint64_t /*flags*/) override;
-
-protected:
-    std::vector<wgpu::RequestAdapterOptions> getAdapterOptions() override;
-};
-
-} // namespace filament::backend
-
-#endif // TNT_FILAMENT_BACKEND_PLATFORMS_WEBGPUPLATFORMLINUX_H

filament/backend/include/backend/platforms/WebGPUPlatformWindows.h

@@ -1,35 +0,0 @@
-/*
-* Copyright (C) 2025 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef TNT_FILAMENT_BACKEND_PLATFORMS_WEBGPUPLATFORMWINDOWS_H
-#define TNT_FILAMENT_BACKEND_PLATFORMS_WEBGPUPLATFORMWINDOWS_H
-
-#include <backend/platforms/WebGPUPlatform.h>
-
-namespace filament::backend {
-
-class WebGPUPlatformWindows : public WebGPUPlatform {
-public:
-    wgpu::Extent2D getSurfaceExtent(void* nativeWindow) const override;
-    wgpu::Surface createSurface(void* nativeWindow, uint64_t /*flags*/) override;
-
-protected:
-    std::vector<wgpu::RequestAdapterOptions> getAdapterOptions() override;
-};
-
-} // namespace filament::backend
-
-#endif // TNT_FILAMENT_BACKEND_PLATFORMS_WEBGPUPLATFORMWINDOWS_H

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

@@ -22,6 +22,7 @@
 #include "private/backend/Driver.h"
 
 #include <backend/BufferDescriptor.h>
+#include <backend/BufferObjectStreamDescriptor.h>
 #include <backend/CallbackHandler.h>
 #include <backend/DriverEnums.h>
 #include <backend/Handle.h>

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

@@ -51,6 +51,7 @@
 namespace filament::backend {
 
 class BufferDescriptor;
+class BufferObjectStreamDescriptor;
 class CallbackHandler;
 class PixelBufferDescriptor;
 class Program;

filament/backend/include/private/backend/DriverAPI.inc

@@ -392,6 +392,10 @@ DECL_DRIVER_API_N(updateBufferObject,
         backend::BufferDescriptor&&, data,
         uint32_t, byteOffset)
 
+DECL_DRIVER_API_N(registerBufferObjectStreams,
+        backend::BufferObjectHandle, boh,
+        backend::BufferObjectStreamDescriptor&&, streams)
+
 DECL_DRIVER_API_N(updateBufferObjectUnsynchronized,
         backend::BufferObjectHandle, boh,
         backend::BufferDescriptor&&, data,

filament/backend/src/AndroidNativeWindow.cpp

@@ -61,16 +61,6 @@ int NativeWindow::enableFrameTimestamps(ANativeWindow* anw, bool enable) {
     return pWindow->perform(anw, ENABLE_FRAME_TIMESTAMPS, enable);
 }
 
-int NativeWindow::frameTimestampsSupportsPresent(ANativeWindow* anw, bool* outSupportsPresent) {
-    NativeWindow const* pWindow = reinterpret_cast<NativeWindow const*>(anw);
-    int value = 0;
-    bool const success = pWindow->perform(anw, FRAME_TIMESTAMPS_SUPPORTS_PRESENT, &value);
-    if (success) {
-        *outSupportsPresent = bool(value);
-    }
-    return success;
-}
-
 int NativeWindow::getCompositorTiming(ANativeWindow* anw,
         int64_t* compositeDeadline, int64_t* compositeInterval,
         int64_t* compositeToPresentLatency) {

filament/backend/src/AndroidNativeWindow.h

@@ -32,7 +32,6 @@ struct NativeWindow {
     // is valid query enum value
     enum {
         IS_VALID                = 17,
-        FRAME_TIMESTAMPS_SUPPORTS_PRESENT = 18,
         GET_NEXT_FRAME_ID       = 24,
         ENABLE_FRAME_TIMESTAMPS = 25,
         GET_COMPOSITOR_TIMING   = 26,
@@ -52,7 +51,6 @@ struct NativeWindow {
 
     static int getNextFrameId(ANativeWindow* anw, uint64_t* frameId);
     static int enableFrameTimestamps(ANativeWindow* anw, bool enable);
-    static int frameTimestampsSupportsPresent(ANativeWindow* anw, bool* outSupportsPresent);
     static int getCompositorTiming(ANativeWindow* anw,
             int64_t* compositeDeadline, int64_t* compositeInterval,
             int64_t* compositeToPresentLatency);

filament/backend/src/AndroidNdk.cpp

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include <backend/platforms/AndroidNdk.h>
+#include "AndroidNdk.h"
 
 #include <android/hardware_buffer.h>
 

filament/backend/src/AndroidSwapChainHelper.cpp

@@ -19,9 +19,6 @@
 
 #include <android/native_window.h>
 
-#include <utils/compiler.h>
-#include <utils/Logger.h>
-
 #include <cstddef>
 #include <cstdint>
 #include <limits>
@@ -39,23 +36,11 @@ bool AndroidSwapChainHelper::setPresentFrameId(
     int const status = NativeWindow::getNextFrameId(anw, &sysFrameId);
     if (status == 0) {
         std::lock_guard const lock(mLock);
-        // frameIds must be strictly monotonic, if that's not the case (i.e. the new frameId is
-        // less or equal to the last one in the map), we have to clear the map, because the
-        // map's find() assume sorted keys.
-        // This case can happen if two different filament::Renderer are used with the same
-        // ANativeWindow (the Renderer would have different frameIds). This is expected to
-        // be a rare case.
-        if (UTILS_UNLIKELY(!mFrameIdToSystemFrameId.empty() &&
-                frameId <= mFrameIdToSystemFrameId.back().first)) {
-            // this log is expected to happen very rarely
-            DLOG(INFO) << "clearing frame history anw=" << anw
-                    << ", frameId=" << frameId
-                    << ", previous=" << mFrameIdToSystemFrameId.back().first
-                    << ", sysFrameId=" << sysFrameId;
-            // clear the frame history
-            mFrameIdToSystemFrameId.clear();
+        auto const pos = mFrameIdToSystemFrameId.find(frameId);
+        if (pos && *pos != sysFrameId) {
+            // we're trying to associate the same frame id to a different frame!
+            return false;
         }
-
         // oldest entry is removed
         mFrameIdToSystemFrameId.insert(frameId, sysFrameId);
         return true;

filament/backend/src/JobQueue.cpp

@@ -1,247 +0,0 @@
-/*
- * Copyright (C) 2025 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "JobQueue.h"
-
-#include <utils/compiler.h>
-#include <utils/debug.h>
-#include <utils/Panic.h>
-
-namespace filament::backend {
-
-JobQueue::JobQueue(PassKey) {}
-
-JobQueue::JobId JobQueue::push(Job job, JobId const preIssuedJobId/* = InvalidJobId*/) {
-    JobId jobId = preIssuedJobId;
-    {
-        std::lock_guard<std::mutex> lock(mQueueMutex);
-        if (mIsStopping) {
-            return InvalidJobId;
-        }
-
-        if (jobId == InvalidJobId) {
-            jobId = genNextJobId();
-            mJobsMap[jobId] = std::move(job);
-        } else {
-            // Use the job ID previously issued by `issueJobId()`
-            auto it = mJobsMap.find(jobId);
-            if (it == mJobsMap.end()) {
-                // Pre-issued job does not exist, either users passed a wrong id (unlikely)
-                // or the job must have been canceled (likely)
-                return InvalidJobId;
-            }
-            FILAMENT_CHECK_PRECONDITION(!static_cast<bool>(it->second))
-                    << "pre-issued job has already been populated";
-            it->second = std::move(job);
-        }
-        mJobOrder.push(jobId);
-    }
-
-    // Always notify. A ThreadWorker might be waiting.
-    mQueueCondition.notify_one();
-
-    return jobId;
-}
-
-JobQueue::Job JobQueue::pop(bool shouldBlock) {
-    std::unique_lock<std::mutex> lock(mQueueMutex);
-
-    decltype(mJobsMap)::iterator it;
-
-    while (true) {
-        if (shouldBlock) {
-            // Wait only if we're in blocking mode and the queue is empty
-            mQueueCondition.wait(lock, [this] { return !mJobOrder.empty() || mIsStopping; });
-        }
-
-        if (mJobOrder.empty()) {
-            // When `shouldBlock` is true, this means the queue is stopping now.
-            // When `shouldBlock` is false, this means there's no job.
-            return nullptr;
-        }
-
-        JobId jobId = mJobOrder.front();
-        mJobOrder.pop();
-
-        it = mJobsMap.find(jobId);
-        if (it != mJobsMap.end()) {
-            break;
-        }
-
-        // If execution reaches this line, the job must have been canceled right after being added.
-        // Therefore, we should continue the loop and attempt to retrieve the next available job.
-    }
-
-    Job job = std::move(it->second);
-    mJobsMap.erase(it);
-    return job;
-}
-
-utils::FixedCapacityVector<JobQueue::Job> JobQueue::popBatch(int const maxJobsToPop) {
-    utils::FixedCapacityVector<Job> jobs;
-
-    if (UTILS_UNLIKELY(maxJobsToPop == 0)) {
-        return jobs;
-    }
-
-    std::lock_guard<std::mutex> lock(mQueueMutex);
-    if (mJobOrder.empty()) {
-        return jobs;
-    }
-
-    // Calculate jobs to take. If maxJobsToPop is negative, we take all jobs.
-    size_t jobsToTake = mJobOrder.size();
-    if (0 < maxJobsToPop && maxJobsToPop < static_cast<int>(jobsToTake)) {
-        jobsToTake = maxJobsToPop;
-    }
-    jobs.reserve(jobsToTake);
-
-    while (0 < jobsToTake && !mJobOrder.empty()) {
-        JobId jobId = mJobOrder.front();
-        mJobOrder.pop();
-
-        auto it = mJobsMap.find(jobId);
-        if (UTILS_UNLIKELY(it == mJobsMap.end())) {
-            // The job was probably canceled.
-            continue;
-        }
-
-        jobs.push_back(std::move(it->second));
-        --jobsToTake;
-        mJobsMap.erase(it);
-    }
-
-    return jobs;
-}
-
-JobQueue::JobId JobQueue::issueJobId() noexcept {
-    std::lock_guard<std::mutex> lock(mQueueMutex);
-    JobId const jobId = genNextJobId();
-    // Preallocate a job, which serves two main purposes. It provides a valid jobId that can be
-    // checked for integrity when passed to the `push` method, and it enables job cancellation for
-    // tasks that are yet to be pushed.
-    mJobsMap[jobId];
-    return jobId;
-}
-
-bool JobQueue::cancel(JobId const jobId) noexcept {
-    std::lock_guard<std::mutex> lock(mQueueMutex);
-
-    auto it = mJobsMap.find(jobId);
-    if (it == mJobsMap.end()) {
-        return false; // Job not found, must have been completed or canceled.
-    }
-
-    mJobsMap.erase(it);
-
-    return true;
-}
-
-void JobQueue::stop() noexcept {
-    {
-        std::lock_guard<std::mutex> lock(mQueueMutex);
-        mIsStopping = true;
-    }
-    mQueueCondition.notify_all(); // Wake up all waiting threads
-}
-
-JobQueue::JobId JobQueue::genNextJobId() noexcept {
-    // We assume this method is called within the critical section.
-    JobId newJobId = mNextJobId++;
-    // We assume the job ID won't overflow or wraps around to zero within the application's lifetime.
-    assert_invariant(newJobId != InvalidJobId);
-    return newJobId;
-}
-
-JobWorker::~JobWorker() = default;
-
-void JobWorker::terminate() {
-    // This is called from workers `terminate()`, which may hinder the concurrent use of multiple
-    // workers. Consider removing this line and require the owner/caller to explicitly invoke it to
-    // enable multiple worker instances.
-    if (mQueue) {
-        mQueue->stop();
-    }
-}
-
-AmortizationWorker::AmortizationWorker(JobQueue::Ptr queue, PassKey)
-    : JobWorker(std::move(queue)) {
-}
-
-AmortizationWorker::~AmortizationWorker() = default;
-
-void AmortizationWorker::process(int const jobCount) {
-    if (!mQueue || jobCount == 0) {
-        return;
-    }
-
-    if (jobCount == 1) {
-        // Handle single job without vector allocation.
-        if (auto job = mQueue->pop(false)) {
-            job();
-        }
-        return;
-    }
-
-    // Handle batch (jobCount > 1 or jobCount < 0 for "all pending jobs")
-    utils::FixedCapacityVector<JobQueue::Job> jobs = mQueue->popBatch(jobCount);
-    if (jobs.empty()) {
-        return;
-    }
-
-    for (auto& job: jobs) {
-        job();
-    }
-}
-
-void AmortizationWorker::terminate() {
-    JobWorker::terminate();
-
-    // Drain all pending jobs.
-    process(-1);
-}
-
-ThreadWorker::ThreadWorker(JobQueue::Ptr queue, Config config, PassKey)
-        : JobWorker(std::move(queue)), mConfig(std::move(config)) {
-    mThread = std::thread([this]() {
-        utils::JobSystem::setThreadName(mConfig.name.data());
-        utils::JobSystem::setThreadPriority(mConfig.priority);
-
-        if (mConfig.onBegin) {
-            mConfig.onBegin();
-        }
-
-        while (JobQueue::Job job = mQueue->pop(true)) {
-            job();
-        }
-
-        if (mConfig.onEnd) {
-            mConfig.onEnd();
-        }
-    });
-}
-
-ThreadWorker::~ThreadWorker() = default;
-
-void ThreadWorker::terminate() {
-    JobWorker::terminate();
-
-    if (mThread.joinable()) {
-        mThread.join();
-    }
-}
-
-} // namespace utils

filament/backend/src/JobQueue.h

@@ -1,275 +0,0 @@
-/*
- * Copyright (C) 2025 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef TNT_FILAMENT_BACKEND_PRIVATE_JOBQUEUE_H
-#define TNT_FILAMENT_BACKEND_PRIVATE_JOBQUEUE_H
-
-#include <utils/FixedCapacityVector.h>
-#include <utils/Invocable.h>
-#include <utils/JobSystem.h>
-
-#include <mutex>
-#include <condition_variable>
-#include <thread>
-#include <memory>
-#include <unordered_map>
-#include <limits>
-#include <queue>
-
-namespace filament::backend {
-
-/**
- * A thread-safe producer-consumer queue with batching capabilities.
- *
- * This class is thread-safe. All public methods can be called from any thread.
- *
- * This class is stateless regarding concurrency. The *caller* decides the blocking behavior and/or
- * batching when they call a 'pop' methods.
- *
- * A typical use case looks like this:
- *
- * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- * #include "private/backend/JobQueue.h"
- * using namespace filament::backend;
- *
- * JobQueue::Ptr queue = JobQueue::create();
- * JobWorker::Ptr worker = AmortizationWorker::create(queue);
- * [ or JobWorker::Ptr worker = ThreadWorker::create(queue, config); ]
- *
- * void loop() {
- *     worker->process(2); // for AmortizationWorker
- * }
- *
- * void cleanup() {
- *     worker->terminate();
- * }
- * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- * JobId id = queue->push([](){ ... });
- * queue->cancel(id);
- * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- * JobId preIssuedId = queue->issueJobId();
- * JobId id = queue->push([](){ ... }, preIssuedId);
- * assert(id == preIssuedId);
- * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- */
-class JobQueue {
-    struct PassKey {};
-public:
-    using Job = utils::Invocable<void()>;
-    using JobId = uint32_t;
-    using Ptr = std::shared_ptr<JobQueue>;
-    static constexpr JobId InvalidJobId = std::numeric_limits<JobId>::max();
-
-    /**
-     * Creates an instance of JobQueue. Users should call this to create one.
-     * @return An instance of JobQueue
-     */
-    static Ptr create() {
-        return std::make_shared<JobQueue>(PassKey{});
-    }
-
-    explicit JobQueue(PassKey); // This can be created only via `create()`
-
-    /**
-     * Pushes a new job into queue.
-     *
-     * If the queue is in the process of shutting down (via a call to `stop`), this method does
-     * nothing (a no-op) and returns an invalid job ID.
-     *
-     * @param job The function/lambda to be executed.
-     * @param preIssuedJobId The previously issued job ID where this job is assigned to.
-     *  If the value is `InvalidJobId`, a new job ID is generated internally.
-     * @return A new job ID. If a `preIssuedJobId` is provided, that specific ID is returned instead.
-     */
-    JobId push(Job job, JobId preIssuedJobId = InvalidJobId);
-
-    /**
-     * Retrieves the next job from queue.
-     *
-     * This method returns a valid job ID if there are pending jobs in the queue, even if the queue
-     * is currently in the process of shutting down (via a call to `stop`).
-     *
-     * @param shouldBlock If true (typically used by ThreadWorker), waits for a job and returns it.
-     *  If false (typically used by AmortizationWorker), tries retrieving a job. But may return an
-     *  empty job if there's no pending job.
-     * @return The next job. If an empty job is returned, it has different meaning depending on the
-     *  `shouldBlock` value:
-     *    - true: Stop processing (shutting down).
-     *    - false: No jobs currently in queue.
-     */
-    Job pop(bool shouldBlock);
-
-    /**
-     * Retrieves a batch of next jobs from queue. Always non-blocking.
-     *
-     * This method returns a valid job ID if there are pending jobs in the queue, even if the queue
-     * is currently in the process of shutting down (via a call to `stop`).
-     *
-     * @param maxJobsToPop The maximum number of jobs to retrieve.
-     *  If < 0, retrieves all pending jobs.
-     * @return A FixedCapacityVector<Job> containing the retrieved jobs.
-     * Returns an empty vector if the queue is empty.
-     */
-    utils::FixedCapacityVector<Job> popBatch(int maxJobsToPop);
-
-    /**
-     * Generate a new job ID. This newly generated ID is meant to be used for the `preIssuedJobId`
-     * parameter of `push` method.
-     *
-     * @return A new job ID.
-     */
-    JobId issueJobId() noexcept;
-
-    /**
-     * Cancels a job by its ID.
-     *
-     * @param jobId The job ID to cancel.
-     * @return true if the job was found and cancelled, false otherwise.
-     */
-    bool cancel(JobId jobId) noexcept;
-
-    /**
-     * Signals the queue to shut down, after which no further jobs can be added using the `push`
-     * method. but all jobs already pushed can still be processed using `pop`.
-     */
-    void stop() noexcept;
-
-private:
-    JobQueue(const JobQueue&) = delete;
-    JobQueue& operator=(const JobQueue&) = delete;
-
-    JobId genNextJobId() noexcept;
-
-    std::mutex mQueueMutex;
-    std::condition_variable mQueueCondition;
-    std::unordered_map<JobId, Job> mJobsMap;
-    std::queue<JobId> mJobOrder;
-    JobId mNextJobId = 0;
-    bool mIsStopping = false;
-};
-
-/**
- * Abstract base class for all worker types.
- */
-class JobWorker {
-public:
-    using Ptr = std::unique_ptr<JobWorker>;
-
-    virtual ~JobWorker();
-
-    /**
-     * Processes a batch of jobs. (For non-threaded workers)
-     * @param jobCount Max jobs to process (<= 0 for all).
-     */
-    virtual void process(int jobCount) {}
-
-    /**
-     * Terminates the worker.
-     */
-    virtual void terminate();
-
-protected:
-    explicit JobWorker(JobQueue::Ptr queue) : mQueue(std::move(queue)) {}
-
-    JobQueue::Ptr mQueue;
-
-private:
-    JobWorker(const JobWorker&) = delete;
-    JobWorker& operator=(const JobWorker&) = delete;
-};
-
-
-/**
- * A non-threaded worker that consumes jobs in batches.
- */
-class AmortizationWorker final : public JobWorker {
-    struct PassKey {};
-public:
-    /**
-     * Creates an instance of AmortizationWorker. Users should call this to create one.
-     * @return An instance of AmortizationWorker
-     */
-    static Ptr create(JobQueue::Ptr queue) {
-        return std::make_unique<AmortizationWorker>(std::move(queue), PassKey{});
-    }
-
-    explicit AmortizationWorker(JobQueue::Ptr queue, PassKey); // This can be created only via `create()`
-
-    ~AmortizationWorker() override;
-
-    /**
-     * Polls the queue and executes a batch of jobs.
-     *
-     * @param jobCount The max number of jobs to process.
-     *  0 = do nothing.
-     *  1 = pop one (optimized).
-     *  > 1 = pop batch.
-     *  <= -1 = pop all.
-     */
-    void process(int jobCount) override;
-
-    /**
-     * Signals the queue to stop and drain all pending jobs.
-     * This is safe to call multiple times.
-     */
-    void terminate() override;
-};
-
-
-/**
- * A threaded worker that consumes jobs one by one, blocking when empty.
- */
-class ThreadWorker final : public JobWorker {
-    struct PassKey {};
-public:
-    using Priority = utils::JobSystem::Priority;
-
-    /**
-     * Config settings for the worker
-     */
-    struct Config {
-        std::string_view name = "";
-        Priority priority = Priority::NORMAL;
-        utils::Invocable<void()> onBegin;  // Executed when the thread worker begins
-        utils::Invocable<void()> onEnd;    // Executed when the thread worker ends
-    };
-
-    /**
-     * Creates an instance of ThreadWorker. Users should call this to create one.
-     * @return An instance of ThreadWorker
-     */
-    static Ptr create(JobQueue::Ptr queue, Config config) {
-        return std::make_unique<ThreadWorker>(std::move(queue), std::move(config), PassKey{});
-    }
-
-    ThreadWorker(JobQueue::Ptr queue, Config config, PassKey); // This can be created only via `create()`
-
-    ~ThreadWorker() override;
-
-    /**
-     * Signals the queue to stop and joins the worker thread.
-     * This is safe to call multiple times.
-     */
-    void terminate() override;
-
-private:
-    Config mConfig;
-    std::thread mThread;
-};
-
-} // namespace filament::backend
-
-#endif // TNT_FILAMENT_BACKEND_PRIVATE_JOBQUEUE_H

filament/backend/src/Platform.cpp

@@ -139,73 +139,42 @@ bool Platform::queryFrameTimestamps(SwapChain const*, uint64_t, FrameTimestamps*
 }
 
 void Platform::setBlobFunc(InsertBlobFunc&& insertBlob, RetrieveBlobFunc&& retrieveBlob) noexcept {
-    std::lock_guard<decltype(mMutex)> lock(mMutex);
-    mInsertBlob = std::make_shared<InsertBlobFunc>(std::move(insertBlob));
-    mRetrieveBlob = std::make_shared<RetrieveBlobFunc>(std::move(retrieveBlob));
+    mInsertBlob = std::move(insertBlob);
+    mRetrieveBlob = std::move(retrieveBlob);
 }
 
 bool Platform::hasInsertBlobFunc() const noexcept {
-    std::lock_guard<decltype(mMutex)> lock(mMutex);
-    return mInsertBlob && bool(*mInsertBlob);
+    return bool(mInsertBlob);
 }
 
 bool Platform::hasRetrieveBlobFunc() const noexcept {
-    std::lock_guard<decltype(mMutex)> lock(mMutex);
-    return mRetrieveBlob && bool(*mRetrieveBlob);
+    return bool(mRetrieveBlob);
 }
 
 void Platform::insertBlob(void const* key, size_t keySize, void const* value, size_t valueSize) {
-    std::shared_ptr<InsertBlobFunc> callback;
-    {
-        std::unique_lock<decltype(mMutex)> lock(mMutex);
-        callback = mInsertBlob;
-    }
-    if (callback) {
-        (*callback)(key, keySize, value, valueSize);
+    if (mInsertBlob) {
+        mInsertBlob(key, keySize, value, valueSize);
     }
 }
 
 size_t Platform::retrieveBlob(void const* key, size_t keySize, void* value, size_t valueSize) {
-    std::shared_ptr<RetrieveBlobFunc> callback;
-    {
-        std::unique_lock<decltype(mMutex)> lock(mMutex);
-        callback = mRetrieveBlob;
-    }
-    if (callback) {
-        return (*callback)(key, keySize, value, valueSize);
+    if (mRetrieveBlob) {
+        return mRetrieveBlob(key, keySize, value, valueSize);
     }
     return 0;
 }
 
 void Platform::setDebugUpdateStatFunc(DebugUpdateStatFunc&& debugUpdateStat) noexcept {
-    std::lock_guard<decltype(mMutex)> lock(mMutex);
-    mDebugUpdateStat = std::make_shared<DebugUpdateStatFunc>(std::move(debugUpdateStat));
+    mDebugUpdateStat = std::move(debugUpdateStat);
 }
 
 bool Platform::hasDebugUpdateStatFunc() const noexcept {
-    std::lock_guard<decltype(mMutex)> lock(mMutex);
-    return mDebugUpdateStat && bool(*mDebugUpdateStat);
+    return bool(mDebugUpdateStat);
 }
 
-void Platform::debugUpdateStat(const char* key, uint64_t intValue) {
-    std::shared_ptr<DebugUpdateStatFunc> callback;
-    {
-        std::unique_lock<decltype(mMutex)> lock(mMutex);
-        callback = mDebugUpdateStat;
-    }
-    if (callback) {
-        (*callback)(key, intValue, "");
-    }
-}
-
-void Platform::debugUpdateStat(const char* key, utils::CString stringValue) {
-    std::shared_ptr<DebugUpdateStatFunc> callback;
-    {
-        std::unique_lock<decltype(mMutex)> lock(mMutex);
-        callback = mDebugUpdateStat;
-    }
-    if (callback) {
-        (*callback)(key, 0, stringValue);
+void Platform::debugUpdateStat(const char* key, uint64_t value) {
+    if (mDebugUpdateStat) {
+        mDebugUpdateStat(key, value);
     }
 }
 

filament/backend/src/PlatformFactory.cpp

@@ -22,15 +22,7 @@
 
 // We need to keep this up top for the linux (X11) name collisions.
 #if defined(FILAMENT_SUPPORTS_WEBGPU)
-    #if defined(__ANDROID__)
-        #include "backend/platforms/WebGPUPlatformAndroid.h"
-    #elif defined(__APPLE__)
-        #include "backend/platforms/WebGPUPlatformApple.h"
-    #elif defined(__linux__)
-        #include "backend/platforms/WebGPUPlatformLinux.h"
-    #elif defined(WIN32)
-        #include "backend/platforms/WebGPUPlatformWindows.h"
-    #endif
+    #include "backend/platforms/WebGPUPlatform.h"
 #endif
 
 #if defined(__ANDROID__)
@@ -144,17 +136,7 @@ Platform* PlatformFactory::create(Backend* backend) noexcept {
     }
     if (*backend == Backend::WEBGPU) {
         #if defined(FILAMENT_SUPPORTS_WEBGPU)
-            #if defined(__ANDROID__)
-                return new WebGPUPlatformAndroid();
-            #elif defined(__APPLE__)
-                return new WebGPUPlatformApple();
-            #elif defined(__linux__)
-                return new WebGPUPlatformLinux();
-            #elif defined(WIN32)
-                return new WebGPUPlatformWindows();
-            #else
-                 return nullptr;
-            #endif
+            return new WebGPUPlatform();
         #else
             return nullptr;
         #endif

filament/backend/src/metal/MetalBuffer.h

@@ -165,7 +165,7 @@ public:
          size_t size, bool forceGpuBuffer = false);
     ~MetalBuffer();
 
-    [[nodiscard]] bool wasAllocationSuccessful() const noexcept { return mBuffer; }
+    [[nodiscard]] bool wasAllocationSuccessful() const noexcept { return mBuffer || mCpuBuffer; }
 
     MetalBuffer(const MetalBuffer& rhs) = delete;
     MetalBuffer& operator=(const MetalBuffer& rhs) = delete;
@@ -185,12 +185,14 @@ public:
      * Denotes that this buffer is used for a draw call ensuring that its allocation remains valid
      * until the end of the current frame.
      *
-     * @return The MTLBuffer representing the current state of the buffer to bind, it never returns
-     * nil.
+     * @return The MTLBuffer representing the current state of the buffer to bind, or nil if there
+     * is no device allocation.
      *
      */
     id<MTLBuffer> getGpuBufferForDraw() noexcept;
 
+    void* getCpuBuffer() const noexcept { return mCpuBuffer; }
+
     void setLabel(const utils::ImmutableCString& label) {
 #if FILAMENT_METAL_DEBUG_LABELS
         if (label.empty()) {
@@ -233,6 +235,7 @@ private:
     UploadStrategy mUploadStrategy;
     TrackedMetalBuffer mBuffer;
     size_t mBufferSize = 0;
+    void* mCpuBuffer = nullptr;
     MetalContext& mContext;
 };
 

filament/backend/src/metal/MetalBuffer.mm

@@ -39,30 +39,34 @@ MetalBuffer::MetalBuffer(MetalContext& context, BufferObjectBinding bindingType,
         mUploadStrategy = UploadStrategy::POOL;
     }
 
-    MTLResourceOptions options = MTLResourceStorageModePrivate;
+    // If the buffer is less than 4K in size and is updated frequently, we don't use an explicit
+    // buffer. Instead, we use immediate command encoder methods like setVertexBytes:length:atIndex:.
+    // This won't work for SSBOs, since they are read/write.
 
-    // The buffer will be memory mapped for write operations.
-    if (any(usage & BufferUsage::SHARED_WRITE_BIT)) {
-#if defined(FILAMENT_IOS) || defined(__arm64__) || defined(__aarch64__)
-        // iOS and Apple Silicon devices use UMA (Unified Memory Architecture), so we use Shared memory.
-        options = MTLResourceStorageModeShared;
-#else
-        // Intel Macs require Managed memory for CPU/GPU synchronization.
-        options = MTLResourceStorageModeManaged;
-#endif
+    /*
+    if (size <= 4 * 1024 && bindingType != BufferObjectBinding::SHADER_STORAGE &&
+            usage == BufferUsage::DYNAMIC && !forceGpuBuffer) {
+        mBuffer = nil;
+        mCpuBuffer = malloc(size);
+        return;
     }
+    */
 
+    // Otherwise, we allocate a private GPU buffer.
     {
         ScopedAllocationTimer timer("generic");
-        mBuffer = { [context.device newBufferWithLength:size options:options],
+        mBuffer = { [context.device newBufferWithLength:size options:MTLResourceStorageModePrivate],
             TrackedMetalBuffer::Type::GENERIC };
     }
-
     // mBuffer might fail to be allocated. Clients can check for this by calling
     // wasAllocationSuccessful().
 }
 
-MetalBuffer::~MetalBuffer() = default;
+MetalBuffer::~MetalBuffer() {
+    if (mCpuBuffer) {
+        free(mCpuBuffer);
+    }
+}
 
 void MetalBuffer::copyIntoBuffer(
         void* src, size_t size, size_t byteOffset, TagResolver&& getHandleTag) {
@@ -79,6 +83,12 @@ void MetalBuffer::copyIntoBuffer(
     FILAMENT_CHECK_PRECONDITION(!(byteOffset & 0x3))
             << "byteOffset must be a multiple of 4, tag=" << getHandleTag();
 
+    // If we have a cpu buffer, we can directly copy into it.
+    if (mCpuBuffer) {
+        memcpy(static_cast<uint8_t*>(mCpuBuffer) + byteOffset, src, size);
+        return;
+    }
+
     switch (mUploadStrategy) {
         case UploadStrategy::BUMP_ALLOCATOR:
             uploadWithBumpAllocator(src, size, byteOffset, std::move(getHandleTag));
@@ -96,6 +106,11 @@ void MetalBuffer::copyIntoBufferUnsynchronized(
 }
 
 id<MTLBuffer> MetalBuffer::getGpuBufferForDraw() noexcept {
+    // If there's a CPU buffer, then we return nil here, as the CPU-side buffer will be bound
+    // separately.
+    if (mCpuBuffer) {
+        return nil;
+    }
     assert_invariant(mBuffer);
     return mBuffer.get();
 }
@@ -156,6 +171,41 @@ void MetalBuffer::bindBuffers(id<MTLCommandBuffer> cmdBuffer, id<MTLCommandEncod
                                                    offsets:metalOffsets.data()
                                                  withRange:bufferRange];
     }
+
+    for (size_t b = 0; b < count; b++) {
+        MetalBuffer* const buffer = buffers[b];
+        if (!buffer) {
+            continue;
+        }
+
+        const void* cpuBuffer = buffer->getCpuBuffer();
+        if (!cpuBuffer) {
+            continue;
+        }
+
+        const size_t bufferIndex = bufferStart + b;
+        const size_t offset = offsets[b];
+        auto* bytes = static_cast<const uint8_t*>(cpuBuffer);
+
+        if (stages & Stage::VERTEX) {
+            [(id<MTLRenderCommandEncoder>) encoder setVertexBytes:(bytes + offset)
+                                                           length:(buffer->getSize() - offset)
+                                                          atIndex:bufferIndex];
+        }
+        if (stages & Stage::FRAGMENT) {
+            [(id<MTLRenderCommandEncoder>) encoder setFragmentBytes:(bytes + offset)
+                                                             length:(buffer->getSize() - offset)
+                                                            atIndex:bufferIndex];
+        }
+        if (stages & Stage::COMPUTE) {
+            // TODO: using setBytes means the data is read-only, which currently isn't enforced.
+            // In practice this won't be an issue since MetalBuffer ensures all SSBOs are realized
+            // through actual id<MTLBuffer> allocations.
+            [(id<MTLComputeCommandEncoder>) encoder setBytes:(bytes + offset)
+                                                      length:(buffer->getSize() - offset)
+                                                     atIndex:bufferIndex];
+        }
+    }
 }
 
 void MetalBuffer::uploadWithPoolBuffer(

filament/backend/src/metal/MetalContext.h

@@ -17,7 +17,6 @@
 #ifndef TNT_METALCONTEXT_H
 #define TNT_METALCONTEXT_H
 
-#include "MetalErrorQueue.h"
 #include "MetalResourceTracker.h"
 #include "MetalShaderCompiler.h"
 #include "MetalState.h"
@@ -130,7 +129,6 @@ struct MetalContext {
     id<MTLCommandBuffer> pendingCommandBuffer = nil;
     id<MTLRenderCommandEncoder> currentRenderPassEncoder = nil;
     uint32_t currentFrame = 0;
-    MetalErrorQueue commandBufferErrors;
 
     std::atomic<bool> memorylessLimitsReached = false;
 

filament/backend/src/metal/MetalContext.mm

@@ -153,7 +153,6 @@ id<MTLCommandBuffer> getPendingCommandBuffer(MetalContext* context) {
 
         if (UTILS_UNLIKELY(errorCode != MTLCommandBufferErrorNone)) {
             logMTLCommandBufferError(errorCode);
-            context->commandBufferErrors.push(buffer.error);
         }
     }];
     FILAMENT_CHECK_POSTCONDITION(context->pendingCommandBuffer)

filament/backend/src/metal/MetalDriver.h

@@ -61,8 +61,6 @@ public:
 
     MetalContext* getContext() { return mContext; }
 
-    using DriverBase::scheduleDestroy;
-
 private:
 
     friend class MetalSwapChain;

filament/backend/src/metal/MetalDriver.mm

@@ -254,18 +254,6 @@ MetalDriver::~MetalDriver() noexcept {
 void MetalDriver::tick(int) {
     executeTickOps();
     executeDeferredOps();
-
-    // Notify platform of GPU errors.
-    auto& platform = mPlatform;
-    if (UTILS_UNLIKELY(!mContext->commandBufferErrors.isEmpty())) {
-        mContext->commandBufferErrors.flush([&platform](NSError* error) {
-            if (UTILS_VERY_UNLIKELY(!error)) {
-                return;
-            }
-            const utils::CString errorString(error.localizedDescription.UTF8String);
-            platform.debugUpdateStat("filament.metal.command_buffer_error", errorString);
-        });
-    }
 }
 
 void MetalDriver::beginFrame(int64_t monotonic_clock_ns,
@@ -312,8 +300,6 @@ void MetalDriver::execute(std::function<void(void)> const& fn) noexcept {
 }
 
 void MetalDriver::setPresentationTime(int64_t monotonic_clock_ns) {
-    assert_invariant(mContext->currentDrawSwapChain);
-    mContext->currentDrawSwapChain->setPresentationTime(monotonic_clock_ns);
 }
 
 void MetalDriver::endFrame(uint32_t frameId) {
@@ -1146,12 +1132,8 @@ bool MetalDriver::isRenderTargetFormatSupported(TextureFormat format) {
 bool MetalDriver::isFrameBufferFetchSupported() {
     // FrameBuffer fetch is achievable via "programmable blending" in Metal, and only supported on
     // Apple GPUs with readWriteTextureSupport.
-    // On macOS, framebuffer fetch requires MSL 2.3, which is only available with macOS 11.0.
-    if (@available(macOS 11.0, *)) {
-        return mContext->highestSupportedGpuFamily.apple >= 1 &&
-               mContext->device.readWriteTextureSupport;
-    }
-    return false;
+    return mContext->highestSupportedGpuFamily.apple >= 1 &&
+            mContext->device.readWriteTextureSupport;
 }
 
 bool MetalDriver::isFrameBufferFetchMultiSampleSupported() {
@@ -1292,6 +1274,10 @@ void MetalDriver::updateIndexBuffer(Handle<HwIndexBuffer> ibh, BufferDescriptor&
     scheduleDestroy(std::move(data));
 }
 
+void MetalDriver::registerBufferObjectStreams(Handle<HwBufferObject> boh, BufferObjectStreamDescriptor&& streams) {
+    // Noop
+}
+
 void MetalDriver::updateBufferObject(Handle<HwBufferObject> boh, BufferDescriptor&& data,
         uint32_t byteOffset) {
     FILAMENT_CHECK_PRECONDITION(!isInRenderPass(mContext))
@@ -2277,10 +2263,7 @@ MemoryMappedBufferHandle MetalDriver::mapBufferS() noexcept {
 void MetalDriver::mapBufferR(MemoryMappedBufferHandle mmbh,
         BufferObjectHandle boh, size_t offset,
         size_t size, MapBufferAccessFlags access, utils::ImmutableCString&& tag) {
-    assert_invariant(boh);
-    MetalBufferObject* bo = mHandleAllocator.handle_cast<MetalBufferObject*>(boh);
-    assert_invariant(bo);
-    construct_handle<MetalMemoryMappedBuffer>(mmbh, bo, offset, size, access);
+    construct_handle<MetalMemoryMappedBuffer>(mmbh, boh, offset, size, access);
     mHandleAllocator.associateTagToHandle(mmbh.getId(), std::move(tag));
 }
 
@@ -2288,16 +2271,21 @@ void MetalDriver::unmapBuffer(MemoryMappedBufferHandle mmbh) {
     if (UTILS_UNLIKELY(!mmbh)) {
         return;
     }
-
-    auto* mmb = handle_cast<MetalMemoryMappedBuffer>(mmbh);
-    mmb->unmap();
     destruct_handle<MetalMemoryMappedBuffer>(mmbh);
 }
 
 void MetalDriver::copyToMemoryMappedBuffer(MemoryMappedBufferHandle mmbh, size_t offset,
         BufferDescriptor&& data) {
-    auto* mmb = handle_cast<MetalMemoryMappedBuffer>(mmbh);
-    mmb->copy(*this, offset, std::move(data));
+    auto mmb = handle_cast<MetalMemoryMappedBuffer>(mmbh);
+
+    assert_invariant(any(mmb->access & MapBufferAccessFlags::WRITE_BIT));
+    assert_invariant(offset + data.size <= mmb->size);
+
+    // TODO: this isa zero-effort implementation of copyToMemoryMappedBuffer(), where we just
+    //       call updateBufferObject(). This could be a fallback implementation for when
+    //       shared memory is not available.
+    //       On UMA systems, this should just be a memcpy into the memory-mapped buffer.
+    updateBufferObject(mmb->boh, std::move(data), mmb->offset + offset);
 }
 
 // explicit instantiation of the Dispatcher

filament/backend/src/metal/MetalErrorQueue.h

@@ -1,66 +0,0 @@
-/*
- * Copyright (C) 2025 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef TNT_FILAMENT_DRIVER_METALERRORQUEUE_H
-#define TNT_FILAMENT_DRIVER_METALERRORQUEUE_H
-
-#import <Foundation/Foundation.h>
-
-#include <utils/compiler.h>
-
-#include <atomic>
-#include <functional>
-#include <mutex>
-#include <vector>
-
-class MetalErrorQueue {
-public:
-    bool isEmpty() const {
-        return !mHasErrors.load(std::memory_order_relaxed);
-    }
-
-    void push(NSError* error) {
-        std::lock_guard<std::mutex> lock(mMutex);
-        mErrors.push_back(error);
-        mHasErrors.store(true, std::memory_order_relaxed);
-    }
-
-    void flush(const std::function<void(NSError*)>& callback) {
-        if (UTILS_LIKELY(isEmpty())) {
-            return;
-        }
-        std::vector<NSError*> errors;
-        {
-            std::lock_guard<std::mutex> lock(mMutex);
-            std::swap(mErrors, errors);
-            mHasErrors.store(false, std::memory_order_relaxed);
-        }
-
-        for (const auto& error: errors) {
-            callback(error);
-        }
-    }
-
-private:
-    std::vector<NSError*> mErrors;
-    std::mutex mMutex;
-
-    // Optimization to avoid locking the mutex at each call to flush.
-    std::atomic<bool> mHasErrors;
-};
-
-
-#endif // TNT_FILAMENT_DRIVER_METALERRORQUEUE_H

filament/backend/src/metal/MetalHandles.h

@@ -141,8 +141,6 @@ public:
     // FrameScheduledCallback.
     void present();
 
-    void setPresentationTime(int64_t timeNs) { presentationTimeNs = timeNs; }
-
     NSUInteger getSurfaceWidth() const;
     NSUInteger getSurfaceHeight() const;
     NSUInteger getSampleCount() const;
@@ -161,7 +159,7 @@ private:
     bool isCaMetalLayer() const { return type == SwapChainType::CAMETALLAYER; }
     bool isHeadless() const { return type == SwapChainType::HEADLESS; }
 
-    void scheduleFrameScheduledCallback(int64_t presentationTimeNs);
+    void scheduleFrameScheduledCallback();
     void scheduleFrameCompletedCallback();
 
     MetalAttachment acquireBaseDrawable();
@@ -194,11 +192,6 @@ private:
 
     int64_t abandonedUntilFrame = -1;
 
-    // If zero, the next presentation should happen as soon as possible.
-    // Otherwise, this is the timestamp when the present should happen.
-    // Resets to 0 after the present.
-    int64_t presentationTimeNs = 0;
-
     // These fields store a callback to notify the client that a frame is ready for presentation. If
     // !frameScheduled.callback, then the Metal backend automatically calls presentDrawable when the
     // frame is committed. Otherwise, the Metal backend will not automatically present the frame.
@@ -576,22 +569,14 @@ struct MetalDescriptorSet : public HwDescriptorSet {
 
 
 struct MetalMemoryMappedBuffer : public HwMemoryMappedBuffer {
+    MetalMemoryMappedBuffer(BufferObjectHandle boh, size_t const offset,
+            size_t const size, MapBufferAccessFlags const access)
+        : boh(boh), access(access), size(size), offset(offset) {
+    }
+    BufferObjectHandle boh{};
     MapBufferAccessFlags access{};
-    struct {
-        MetalBufferObject* bo;
-        void* vaddr = nullptr;
-        uint32_t size = 0;
-        uint32_t offset = 0;
-    } mtl;
-
-    MetalMemoryMappedBuffer(MetalBufferObject* bo, size_t offset, size_t size,
-            MapBufferAccessFlags access) noexcept;
-
-    ~MetalMemoryMappedBuffer();
-
-    void unmap();
-
-    void copy(MetalDriver& mtld, size_t offset, BufferDescriptor&& data) const;
+    uint32_t size = 0;
+    uint32_t offset = 0;
 };
 
 } // namespace backend

filament/backend/src/metal/MetalHandles.mm

@@ -325,19 +325,11 @@ void MetalSwapChain::present() {
     if (frameCompleted.callback) {
         scheduleFrameCompletedCallback();
     }
-    const auto timeNs = presentationTimeNs;
-    presentationTimeNs = 0;
     if (drawable) {
         if (frameScheduled.callback) {
-            scheduleFrameScheduledCallback(timeNs);
+            scheduleFrameScheduledCallback();
         } else  {
-            if (presentationTimeNs) {
-                const CFTimeInterval timeSeconds =
-                        (CFTimeInterval) presentationTimeNs / 1000000000.0;
-                [getPendingCommandBuffer(&context) presentDrawable:drawable atTime:timeSeconds];
-            } else {
-                [getPendingCommandBuffer(&context) presentDrawable:drawable];
-            }
+            [getPendingCommandBuffer(&context) presentDrawable:drawable];
         }
     }
 }
@@ -349,22 +341,15 @@ public:
     PresentDrawableData& operator=(const PresentDrawableData&) = delete;
 
     static PresentDrawableData* create(id<CAMetalDrawable> drawable,
-            std::shared_ptr<std::mutex> drawableMutex, MetalDriver* driver, uint64_t flags,
-            int64_t presentationTimeNs) {
+            std::shared_ptr<std::mutex> drawableMutex, MetalDriver* driver, uint64_t flags) {
         assert_invariant(drawableMutex);
         assert_invariant(driver);
-        return new PresentDrawableData(drawable, drawableMutex, driver, flags, presentationTimeNs);
+        return new PresentDrawableData(drawable, drawableMutex, driver, flags);
     }
 
     static void maybePresentAndDestroyAsync(PresentDrawableData* that, bool shouldPresent) {
         if (shouldPresent) {
-            if (that->mPresentationTimeNs) {
-                const CFTimeInterval timeSeconds =
-                        (CFTimeInterval) that->mPresentationTimeNs / 1000000000.0;
-                [that->mDrawable presentAtTime:timeSeconds];
-            } else {
-                [that->mDrawable present];
-            }
+           [that->mDrawable present];
         }
 
         if (that->mFlags & SwapChain::CALLBACK_DEFAULT_USE_METAL_COMPLETION_HANDLER) {
@@ -382,12 +367,8 @@ public:
 
 private:
     PresentDrawableData(id<CAMetalDrawable> drawable, std::shared_ptr<std::mutex> drawableMutex,
-            MetalDriver* driver, uint64_t flags, int64_t presentationTimeNs)
-            : mDrawable(drawable),
-              mDrawableMutex(drawableMutex),
-              mDriver(driver),
-              mFlags(flags),
-              mPresentationTimeNs(presentationTimeNs) {}
+            MetalDriver* driver, uint64_t flags)
+        : mDrawable(drawable), mDrawableMutex(drawableMutex), mDriver(driver), mFlags(flags) {}
 
     static void cleanupAndDestroy(PresentDrawableData *that) {
         if (that->mDrawable) {
@@ -403,7 +384,6 @@ private:
     std::shared_ptr<std::mutex> mDrawableMutex;
     MetalDriver* mDriver = nullptr;
     uint64_t mFlags = 0;
-    int64_t mPresentationTimeNs = 0;
 };
 
 void presentDrawable(bool presentFrame, void* user) {
@@ -411,7 +391,7 @@ void presentDrawable(bool presentFrame, void* user) {
     PresentDrawableData::maybePresentAndDestroyAsync(presentDrawableData, presentFrame);
 }
 
-void MetalSwapChain::scheduleFrameScheduledCallback(int64_t presentationTimeNs) {
+void MetalSwapChain::scheduleFrameScheduledCallback() {
     if (!frameScheduled.callback) {
         return;
     }
@@ -420,11 +400,8 @@ void MetalSwapChain::scheduleFrameScheduledCallback(int64_t presentationTimeNs)
 
     struct Callback {
         Callback(std::shared_ptr<FrameScheduledCallback> callback, id<CAMetalDrawable> drawable,
-                std::shared_ptr<std::mutex> drawableMutex, MetalDriver* driver, uint64_t flags,
-                int64_t presentationTimeNs)
-                : f(callback),
-                  data(PresentDrawableData::create(drawable, drawableMutex, driver, flags,
-                          presentationTimeNs)) {}
+                 std::shared_ptr<std::mutex> drawableMutex, MetalDriver* driver, uint64_t flags)
+            : f(callback), data(PresentDrawableData::create(drawable, drawableMutex, driver, flags)) {}
         std::shared_ptr<FrameScheduledCallback> f;
         // PresentDrawableData* is destroyed by maybePresentAndDestroyAsync() later.
         std::unique_ptr<PresentDrawableData> data;
@@ -442,7 +419,7 @@ void MetalSwapChain::scheduleFrameScheduledCallback(int64_t presentationTimeNs)
     uint64_t const flags = frameScheduled.flags;
     ReleasablePointer* callback = [[ReleasablePointer alloc]
             initWithPointer:new Callback(frameScheduled.callback, drawable, layerDrawableMutex,
-                                    context.driver, flags, presentationTimeNs)];
+                                    context.driver, flags)];
 
     backend::CallbackHandler* handler = frameScheduled.handler;
     MetalDriver* driver = context.driver;
@@ -1687,44 +1664,5 @@ id<MTLBuffer> MetalDescriptorSet::finalizeAndGetBuffer(MetalDriver* driver, Shad
     return buffer.get();
 }
 
-MetalMemoryMappedBuffer::MetalMemoryMappedBuffer(MetalBufferObject* bo, size_t offset, size_t size,
-    MapBufferAccessFlags access) noexcept : access(access) {
-    MetalBuffer* buffer = bo->getBuffer();
-    assert_invariant(buffer);
-    id<MTLBuffer> mtlBuffer = buffer->getGpuBufferForDraw();
-
-    assert_invariant(offset + size <= bo->byteCount);
-    assert_invariant(mtlBuffer.storageMode != MTLStorageModePrivate);
-
-    mtl.bo = bo;
-    mtl.vaddr = static_cast<char*>(mtlBuffer.contents) + offset;
-    mtl.size = size;
-    mtl.offset = offset;
-}
-
-MetalMemoryMappedBuffer::~MetalMemoryMappedBuffer() = default;
-
-void MetalMemoryMappedBuffer::unmap() {
-#if !defined(FILAMENT_IOS) && defined(__x86_64__)
-    // Managed memory requires didModifyRange to synchronize changes to the GPU. This is specific to Intel Macs.
-    MetalBuffer* buffer = mtl.bo->getBuffer();
-    id<MTLBuffer> mtlBuffer = buffer->getGpuBufferForDraw();
-    if (mtlBuffer && mtlBuffer.storageMode == MTLStorageModeManaged) {
-        [mtlBuffer didModifyRange:NSMakeRange(mtl.offset, mtl.size)];
-    }
-#endif
-    // Shared memory on UMA systems is coherent; no explicit synchronization is required.
-}
-
-void MetalMemoryMappedBuffer::copy(MetalDriver& mtld, size_t offset, BufferDescriptor&& data) const {
-    assert_invariant(any(access & MapBufferAccessFlags::WRITE_BIT));
-    assert_invariant(offset + data.size <= mtl.size);
-    assert_invariant(mtl.vaddr);
-
-    memcpy(static_cast<char*>(mtl.vaddr) + offset, data.buffer, data.size);
-
-    mtld.scheduleDestroy(std::move(data));
-}
-
 } // namespace backend
 } // namespace filament

filament/backend/src/noop/NoopDriver.cpp

@@ -291,6 +291,8 @@ void NoopDriver::updateBufferObject(Handle<HwBufferObject> ibh, BufferDescriptor
     scheduleDestroy(std::move(p));
 }
 
+void NoopDriver::registerBufferObjectStreams(Handle<HwBufferObject> boh, BufferObjectStreamDescriptor&& streams) { }
+
 void NoopDriver::updateBufferObjectUnsynchronized(Handle<HwBufferObject> ibh, BufferDescriptor&& p,
         uint32_t byteOffset) {
     scheduleDestroy(std::move(p));

filament/backend/src/opengl/OpenGLContext.h

@@ -142,18 +142,6 @@ public:
 #endif
     }
 
-    bool hasFences() const noexcept {
-#if defined(BACKEND_OPENGL_VERSION_GLES) && !defined(FILAMENT_IOS) && !defined(__EMSCRIPTEN__)
-#   ifndef BACKEND_OPENGL_LEVEL_GLES30
-        return false;
-#   else
-        return mFeatureLevel > FeatureLevel::FEATURE_LEVEL_0;
-#   endif
-#else
-        return true;
-#endif
-    }
-
     constexpr        inline size_t getIndexForCap(GLenum cap) noexcept;
     constexpr static inline size_t getIndexForBufferTarget(GLenum target) noexcept;
 
@@ -747,7 +735,7 @@ void OpenGLContext::bindVertexArray(RenderPrimitive const* p) noexcept {
         // - the nameVersion is out of date *and* we're on the protected context, in this case:
         //      - the name must be stale from a previous use of this context because we always
         //        destroy the protected context when we're done with it.
-        bool const recreateVaoName = vao != &mDefaultVAO &&
+        bool const recreateVaoName = p != &mDefaultVAO &&
                 ((vao->vao[contextIndex] == 0) ||
                         (vao->nameVersion != state.age && contextIndex == 1));
         if (UTILS_UNLIKELY(recreateVaoName)) {

filament/backend/src/opengl/OpenGLDriver.cpp

@@ -39,6 +39,7 @@
 #include <backend/Platform.h>
 #include <backend/Program.h>
 #include <backend/TargetBufferInfo.h>
+#include <backend/BufferObjectStreamDescriptor.h>
 
 #include "private/backend/CommandStream.h"
 #include "private/backend/Dispatcher.h"
@@ -1344,6 +1345,7 @@ void OpenGLDriver::framebufferTexture(TargetBufferInfo const& binfo,
     GLTexture* t = handle_cast<GLTexture*>(binfo.handle);
 
     assert_invariant(t);
+    assert_invariant(t->target != SamplerType::SAMPLER_EXTERNAL);
     assert_invariant(rt->width  <= valueForLevel(binfo.level, t->width) &&
            rt->height <= valueForLevel(binfo.level, t->height));
 
@@ -1417,7 +1419,6 @@ void OpenGLDriver::framebufferTexture(TargetBufferInfo const& binfo,
             case SamplerType::SAMPLER_3D:
             case SamplerType::SAMPLER_2D_ARRAY:
             case SamplerType::SAMPLER_CUBEMAP_ARRAY:
-            case SamplerType::SAMPLER_EXTERNAL:
                 // this could be GL_TEXTURE_2D_MULTISAMPLE or GL_TEXTURE_2D_ARRAY
                 target = t->gl.target;
                 // note: multi-sampled textures can't have mipmaps
@@ -1426,6 +1427,10 @@ void OpenGLDriver::framebufferTexture(TargetBufferInfo const& binfo,
                 target = getCubemapTarget(binfo.layer);
                 // note: cubemaps can't be multi-sampled
                 break;
+            case SamplerType::SAMPLER_EXTERNAL:
+                // This is an error. We have asserted in debug build.
+                target = t->gl.target;
+                break;
         }
     }
 
@@ -1454,7 +1459,6 @@ void OpenGLDriver::framebufferTexture(TargetBufferInfo const& binfo,
             case GL_TEXTURE_CUBE_MAP_POSITIVE_Z:
             case GL_TEXTURE_CUBE_MAP_NEGATIVE_Z:
             case GL_TEXTURE_2D:
-            case GL_TEXTURE_EXTERNAL_OES:
 #if defined(BACKEND_OPENGL_LEVEL_GLES31)
             case GL_TEXTURE_2D_MULTISAMPLE:
 #endif
@@ -1462,9 +1466,7 @@ void OpenGLDriver::framebufferTexture(TargetBufferInfo const& binfo,
                     glFramebufferTexture2D(GL_FRAMEBUFFER, attachment,
                             target, t->gl.id, binfo.level);
                 } else {
-                    // in principle, it's possible to have a renderbuffer that's external
-                    // (it filament this never happens, currently)
-                    assert_invariant(target == GL_TEXTURE_2D || target == GL_TEXTURE_EXTERNAL_OES);
+                    assert_invariant(target == GL_TEXTURE_2D);
                     glFramebufferRenderbuffer(GL_FRAMEBUFFER, attachment,
                             GL_RENDERBUFFER, t->gl.id);
                 }
@@ -1789,16 +1791,16 @@ void OpenGLDriver::createFenceR(Handle<HwFence> fh, ImmutableCString&& tag) {
     GLFence* const f = handle_cast<GLFence*>(fh);
     assert_invariant(f->state);
 
-    if (mPlatform.canCreateFence()) {
-        std::lock_guard const lock(f->state->lock);
-        f->fence = mPlatform.createFence();
-        f->state->cond.notify_all();
-        return;
-    }
+    bool const platformCanCreateFence = mPlatform.canCreateFence();
 
-    if (!mContext.hasFences()) {
-        // this would happen on ES2
-        f->state->status = FenceStatus::ERROR;
+    if (mContext.isES2() || platformCanCreateFence) {
+        std::lock_guard const lock(f->state->lock);
+        if (platformCanCreateFence) {
+            f->fence = mPlatform.createFence();
+            f->state->cond.notify_all();
+        } else {
+            f->state->status = FenceStatus::ERROR;
+        }
         return;
     }
 
@@ -1813,8 +1815,6 @@ void OpenGLDriver::createFenceR(Handle<HwFence> fh, ImmutableCString&& tag) {
             state->cond.notify_all();
         }
     });
-#else
-    f->state->status = FenceStatus::ERROR;
 #endif
 }
 
@@ -2290,7 +2290,7 @@ mat3f OpenGLDriver::getStreamTransformMatrix(Handle<HwStream> sh) {
 void OpenGLDriver::destroyFence(Handle<HwFence> fh) {
     if (fh) {
         GLFence const* const f = handle_cast<GLFence*>(fh);
-        if (mPlatform.canCreateFence()) {
+        if (mPlatform.canCreateFence() || mContext.isES2()) {
             mPlatform.destroyFence(f->fence);
         }
         // note: it's invalid to call this during a fenceWait(fh) on another thread. For this
@@ -2299,7 +2299,7 @@ void OpenGLDriver::destroyFence(Handle<HwFence> fh) {
     }
 }
 
-void OpenGLDriver::fenceCancel(Handle<HwFence> fh) {
+void OpenGLDriver::fenceCancel(FenceHandle fh) {
     // Even though this is a synchronous call, the fence handle must be (and stay) valid
     assert_invariant(fh);
     GLFence const* const f = handle_cast<GLFence*>(fh);
@@ -2332,30 +2332,30 @@ FenceStatus OpenGLDriver::fenceWait(FenceHandle fh, uint64_t const timeout) {
     // we don't need to acquire a reference to f->state here because `f` already has one, and
     // `f` is not supposed to become invalid while we wait.
 
-    if (mPlatform.canCreateFence()) {
-        std::unique_lock lock(f->state->lock);
-        if (f->fence == nullptr) {
-            // we've been called before the fence was created asynchronously,
-            // so we need to wait for that, before using the real fence.
-            // By construction, "f" can't be destroyed while we wait, because its
-            // construction call is in the queue and a destroy call will have to come later.
-            f->state->cond.wait_until(lock, until, [f] {
-                return f->fence != nullptr;
-            });
+    bool const platformCanCreateFence = mPlatform.canCreateFence();
+    if (mContext.isES2() || platformCanCreateFence) {
+        if (platformCanCreateFence) {
+            std::unique_lock lock(f->state->lock);
             if (f->fence == nullptr) {
-                // the only possible choice here is that we timed out
-                assert_invariant(f->state->status == FenceStatus::TIMEOUT_EXPIRED);
-                return FenceStatus::TIMEOUT_EXPIRED;
+                // we've been called before the fence was created asynchronously,
+                // so we need to wait for that, before using the real fence.
+                // By construction, "f" can't be destroyed while we wait, because its
+                // construction call is in the queue and a destroy call will have to come later.
+                f->state->cond.wait_until(lock, until, [f] {
+                    return f->fence != nullptr;
+                });
+                if (f->fence == nullptr) {
+                    // the only possible choice here is that we timed out
+                    assert_invariant(f->state->status == FenceStatus::TIMEOUT_EXPIRED);
+                    return FenceStatus::TIMEOUT_EXPIRED;
+                }
             }
+            lock.unlock();
+            // here we know that we have the platform fence
+            assert_invariant(f->fence);
+            return mPlatform.waitFence(f->fence, timeout);
         }
-        lock.unlock();
-        // here we know that we have the platform fence
-        assert_invariant(f->fence);
-        return mPlatform.waitFence(f->fence, timeout);
-    }
-
-    if (!mContext.hasFences()) {
-        // this would be the case on ES2
+        // platform doesn't support fences -- nothing we can do.
         return FenceStatus::ERROR;
     }
 
@@ -2366,8 +2366,6 @@ FenceStatus OpenGLDriver::fenceWait(FenceHandle fh, uint64_t const timeout) {
         return f->state->status != FenceStatus::TIMEOUT_EXPIRED;
     });
     return f->state->status;
-#else
-    return FenceStatus::ERROR;
 #endif
 }
 
@@ -2839,6 +2837,38 @@ void OpenGLDriver::updateIndexBuffer(
     CHECK_GL_ERROR()
 }
 
+void OpenGLDriver::registerBufferObjectStreams(Handle<HwBufferObject> boh, BufferObjectStreamDescriptor&& streams) {
+    DEBUG_MARKER()
+
+    GLBufferObject const* bo = handle_cast<GLBufferObject*>(boh);
+    mStreamUniformDescriptors[bo->gl.id] = std::move(streams);
+}
+
+
+// specialization for mat3f (which has a different alignment, see std140 layout rules)
+static void copyMat3f(void* addr, size_t const offset, const mat3f& v) noexcept {
+    struct mat43 {
+        float v[3][4];
+    };
+
+    addr = static_cast<char*>(addr) + offset;
+    mat43& temp = *static_cast<mat43*>(addr);
+
+    temp.v[0][0] = v[0][0];
+    temp.v[0][1] = v[0][1];
+    temp.v[0][2] = v[0][2];
+
+    temp.v[1][0] = v[1][0];
+    temp.v[1][1] = v[1][1];
+    temp.v[1][2] = v[1][2];
+
+    temp.v[2][0] = v[2][0];
+    temp.v[2][1] = v[2][1];
+    temp.v[2][2] = v[2][2];
+
+    // don't store anything in temp.v[][3] because there could be uniforms packed there
+}
+
 void OpenGLDriver::updateBufferObject(
         Handle<HwBufferObject> boh, BufferDescriptor&& bd, uint32_t const byteOffset) {
     DEBUG_MARKER()
@@ -2852,6 +2882,19 @@ void OpenGLDriver::updateBufferObject(
         gl.bindVertexArray(nullptr);
     }
 
+    if (UTILS_UNLIKELY(!mStreamUniformDescriptors.empty())) {
+        auto const streamDescriptors = mStreamUniformDescriptors.find(bo->gl.id);
+        if (streamDescriptors != mStreamUniformDescriptors.end()) {
+            for (auto const& [offset, stream, associationType] : streamDescriptors->second.mStreams) {
+                if (associationType == BufferObjectStreamAssociationType::TRANSFORM_MATRIX) {
+                    auto transform = getStreamTransformMatrix(stream);
+                    copyMat3f(bd.buffer, offset, transform);
+                }
+            }
+            mStreamUniformDescriptors.erase(streamDescriptors);
+        }
+    }
+
     if (UTILS_UNLIKELY(bo->bindingType == BufferObjectBinding::UNIFORM && gl.isES2())) {
         assert_invariant(bo->gl.buffer);
         memcpy(static_cast<uint8_t*>(bo->gl.buffer) + byteOffset, bd.buffer, bd.size);

filament/backend/src/opengl/OpenGLDriver.h

@@ -36,6 +36,7 @@
 #include <backend/Platform.h>
 #include <backend/Program.h>
 #include <backend/TargetBufferInfo.h>
+#include <backend/BufferObjectStreamDescriptor.h>
 
 #include "private/backend/Driver.h"
 #include "private/backend/HandleAllocator.h"
@@ -393,6 +394,8 @@ private:
     // the must be accessed from the user thread only
     std::vector<GLStream*> mStreamsWithPendingAcquiredImage;
 
+    std::unordered_map<GLuint, BufferObjectStreamDescriptor> mStreamUniformDescriptors;
+
     void attachStream(GLTexture* t, GLStream* stream);
     void detachStream(GLTexture* t) noexcept;
     void replaceStream(GLTexture* t, GLStream* stream) noexcept;

filament/backend/src/opengl/OpenGLProgram.cpp

@@ -39,7 +39,6 @@
 #include <new>
 #include <string_view>
 #include <utility>
-#include <vector>
 
 #include <stddef.h>
 #include <stdint.h>
@@ -329,40 +328,9 @@ void OpenGLProgram::updateUniforms(
                 glUniform4iv(loc, u.size, bi);
                 break;
 
-            case UniformType::MAT3: {
-                // glUniformMatrix3fv expect a packed mat3, but the UBO is in std140
-                // also, the GLES spec says:
-                // Locations for sequential array indices are not required to be sequential.
-                // The location for "a[1]" may or may not be equal to the location for "a[0]" + 1.
-                // Furthermore, since unused elements at the end of uniform arrays may be trimmed
-                // the location of the i + 1 array element may not be valid even if the location of
-                // the i element is valid. As a direct consequence, the value of the location of
-                // "a[0]" + 1 may refer to a different uniform entirely. Applications that wish to
-                // set individual array elements should query the locations of each element
-                // separately.
-
-                struct std140 {
-                    struct mat3 : public std::array<std::array<GLfloat, 4>, 3> {
-                    };
-                };
-                std140::mat3 const* const b = reinterpret_cast<std140::mat3 const*>(bf);
-
-                struct mat3 : public std::array<std::array<GLfloat, 3>, 3> {
-                    explicit mat3(std140::mat3 const& other) noexcept
-                        : std::array<std::array<GLfloat, 3>, 3>{ {
-                            { { other[0][0], other[0][1], other[0][2] } },
-                            { { other[1][0], other[1][1], other[1][2] } },
-                            { { other[2][0], other[2][1], other[2][2] } }
-                        } } {
-                    }
-                };
-
-                std::vector<mat3> const temp{ b, b + u.size };
-                glUniformMatrix3fv(loc, u.size, GL_FALSE,
-                        reinterpret_cast<GLfloat const*>(temp.data()));
+            case UniformType::MAT3:
+                glUniformMatrix3fv(loc, u.size, GL_FALSE, bf);
                 break;
-            }
-
             case UniformType::MAT4:
                 glUniformMatrix4fv(loc, u.size, GL_FALSE, bf);
                 break;

filament/backend/src/opengl/gl_headers.h

@@ -37,7 +37,7 @@
  */
 
 
-#if defined(__ANDROID__) || defined(FILAMENT_USE_EXTERNAL_GLES3) || defined(__EMSCRIPTEN__) || defined(FILAMENT_SUPPORTS_EGL_ON_LINUX)
+#if defined(__ANDROID__) || defined(FILAMENT_USE_EXTERNAL_GLES3) || defined(__EMSCRIPTEN__)
 
     #if defined(__EMSCRIPTEN__)
     #   include <GLES3/gl3.h>

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

@@ -28,13 +28,14 @@
 #include <private/backend/VirtualMachineEnv.h>
 
 #include "AndroidNativeWindow.h"
-#include "AndroidFrameCallback.h"
 #include "AndroidSwapChainHelper.h"
 #include "ExternalStreamManagerAndroid.h"
 
 #include <android/api-level.h>
 #include <android/native_window.h>
 #include <android/hardware_buffer.h>
+#include <android/choreographer.h>
+#include <android/looper.h>
 
 #include <utils/android/PerformanceHintManager.h>
 #include <utils/compiler.h>
@@ -98,27 +99,6 @@ using namespace glext;
 
 // ---------------------------------------------------------------------------------------------
 
-struct PlatformEGLAndroid::SwapChainEGLAndroid : public SwapChainEGL {
-    SwapChainEGLAndroid(PlatformEGLAndroid const& platform,
-            void* nativeWindow, uint64_t flags);
-    SwapChainEGLAndroid(PlatformEGLAndroid const& platform,
-            uint32_t width, uint32_t height, uint64_t flags);
-    void terminate(PlatformEGLAndroid& platform);
-    bool setPresentFrameId(uint64_t frameId) const noexcept;
-    uint64_t getFrameId(uint64_t frameId) const noexcept;
-    bool compositorTimingSupported = false;
-    bool frameTimestampsSupported = false;
-private:
-    AndroidSwapChainHelper mImpl{};
-};
-
-struct PlatformEGLAndroid::AndroidDetails {
-    AndroidProducerThrottling producerThrottling;
-    AndroidFrameCallback androidFrameCallback;
-};
-
-// ---------------------------------------------------------------------------------------------
-
 PlatformEGLAndroid::InitializeJvmForPerformanceManagerIfNeeded::InitializeJvmForPerformanceManagerIfNeeded() {
     // PerformanceHintManager() needs the calling thread to be a Java thread; so we need
     // to attach this thread to the JVM before we initialize PerformanceHintManager.
@@ -132,20 +112,17 @@ PlatformEGLAndroid::InitializeJvmForPerformanceManagerIfNeeded::InitializeJvmFor
 // ---------------------------------------------------------------------------------------------
 
 PlatformEGLAndroid::PlatformEGLAndroid() noexcept
-        : mExternalStreamManager(ExternalStreamManagerAndroid::create()),
-          mAndroidDetails(*(new(std::nothrow) AndroidDetails{})) {
+        : mExternalStreamManager(ExternalStreamManagerAndroid::create()) {
     mOSVersion = android_get_device_api_level();
     if (mOSVersion < 0) {
         mOSVersion = __ANDROID_API_FUTURE__;
     }
 }
 
-PlatformEGLAndroid::~PlatformEGLAndroid() noexcept {
-    delete &mAndroidDetails;
-}
+PlatformEGLAndroid::~PlatformEGLAndroid() noexcept = default;
 
 void PlatformEGLAndroid::terminate() noexcept {
-    mAndroidDetails.androidFrameCallback.terminate();
+    mAndroidFrameCallback.terminate();
     ExternalStreamManagerAndroid::destroy(&mExternalStreamManager);
     PlatformEGL::terminate();
 }
@@ -178,30 +155,20 @@ void PlatformEGLAndroid::beginFrame(
         int64_t const monotonic_clock_ns,
         int64_t refreshIntervalNs,
         uint32_t const frameId) noexcept {
-    // if frameId is 0, it means we're not associated to a particular frame, which is the case
-    // for standalone views. And in this case we skip the performance hint (since we wouldn't get
-    // the right timing anyway as well as the frame info timing collections)
+    // associate the user frameid with the system frame id
+    setPresentFrameId(mCurrentDrawSwapChain, frameId);
 
-    // associate the user frameid with the system frame id.
-    if (frameId && mCurrentDrawSwapChain) {
-        // mCurrentDrawSwapChain could be null if we're called from renderStandaloneView
-        setPresentFrameId(mCurrentDrawSwapChain, frameId);
-    }
-
-    if (frameId && mPerformanceHintSession.isValid()) {
+    if (mPerformanceHintSession.isValid()) {
         if (refreshIntervalNs <= 0) {
             // we're not provided with a target time, use the display period, if everything fails,
             // assume 16.67ms
             refreshIntervalNs = 16'666'667;
 
-            if (mCurrentDrawSwapChain) {
-                // mCurrentDrawSwapChain could be null if we're called from renderStandaloneView
-                CompositorTiming compositorTiming{};
-                bool const hasCompositorTiming =
-                        queryCompositorTiming(mCurrentDrawSwapChain, &compositorTiming);
-                if (hasCompositorTiming && compositorTiming.compositeInterval > 0) {
-                    refreshIntervalNs = compositorTiming.compositeInterval;
-                }
+            CompositorTiming compositorTiming{};
+            bool const hasCompositorTiming =
+                    queryCompositorTiming(mCurrentDrawSwapChain, &compositorTiming);
+            if (hasCompositorTiming && compositorTiming.compositeInterval > 0) {
+                refreshIntervalNs = compositorTiming.compositeInterval;
             }
         }
         mStartTimeOfActualWork = clock::time_point(std::chrono::nanoseconds(monotonic_clock_ns));
@@ -240,9 +207,9 @@ Driver* PlatformEGLAndroid::createDriver(void* sharedContext,
                     "eglGetNativeClientBufferANDROID"));
 
     if (ext.egl.ANDROID_presentation_time) {
-        eglPresentationTimeANDROID =
-                PFNEGLPRESENTATIONTIMEANDROIDPROC(eglGetProcAddress(
-                        "eglPresentationTimeANDROID"));
+        eglGetNativeClientBufferANDROID =
+                PFNEGLGETNATIVECLIENTBUFFERANDROIDPROC(eglGetProcAddress(
+                        "eglGetNativeClientBufferANDROID"));
     }
 
     if (ext.egl.ANDROID_get_frame_timestamps) {
@@ -273,7 +240,7 @@ Driver* PlatformEGLAndroid::createDriver(void* sharedContext,
 
     mAssertNativeWindowIsValid = driverConfig.assertNativeWindowIsValid;
 
-    mAndroidDetails.androidFrameCallback.init();
+    mAndroidFrameCallback.init();
 
     return driver;
 }
@@ -297,25 +264,15 @@ bool PlatformEGLAndroid::queryCompositorTiming(SwapChain const* swapchain,
     }
 
     AndroidFrameCallback::Timeline const preferredTimeline{
-            mAndroidDetails.androidFrameCallback.getPreferredTimeline() };
+            mAndroidFrameCallback.getPreferredTimeline() };
     outCompositorTiming->frameTime = preferredTimeline.frameTime;
     outCompositorTiming->expectedPresentTime = preferredTimeline.expectedPresentTime;
     outCompositorTiming->frameTimelineDeadline = preferredTimeline.frameTimelineDeadline;
-    outCompositorTiming->compositeDeadline = CompositorTiming::INVALID;
-    outCompositorTiming->compositeInterval = CompositorTiming::INVALID;
-    outCompositorTiming->compositeToPresentLatency = CompositorTiming::INVALID;
-
-    // From this point on, we always return "success" because some timings were returned.
-
-    if (!static_cast<SwapChainEGLAndroid const *>(swapchain)->compositorTimingSupported) {
-        // if this surface doesn't support it, don't attempt to query the values.
-        return true;
-    }
 
     if (UTILS_LIKELY(ext.egl.ANDROID_get_frame_timestamps)) {
         EGLSurface const sur = static_cast<SwapChainEGL const *>(swapchain)->sur;
         if (sur == EGL_NO_SURFACE) {
-            return true;
+            return false;
         }
 
         std::array<EGLnsecsANDROID, 3> values;
@@ -326,16 +283,26 @@ bool PlatformEGLAndroid::queryCompositorTiming(SwapChain const* swapchain,
         };
         EGLBoolean const success = eglGetCompositorTimingANDROID(getEglDisplay(), sur,
                 names.size(), names.data(), values.data());
-        if (UTILS_UNLIKELY(!success)) {
-            // reset current error to EGL_SUCCESS
-            eglGetError();
-        } else {
-            outCompositorTiming->compositeDeadline = values[0];
-            outCompositorTiming->compositeInterval = values[1];
-            outCompositorTiming->compositeToPresentLatency = values[2];
+        if (!success) {
+            return false;
         }
+        outCompositorTiming->compositeDeadline = values[0];
+        outCompositorTiming->compositeInterval = values[1];
+        outCompositorTiming->compositeToPresentLatency = values[2];
+        return true;
     }
-    return true;
+
+    // fallback to private APIs
+    auto const anw = static_cast<SwapChainEGL const *>(swapchain)->nativeWindow;
+    int const status = NativeWindow::getCompositorTiming(anw,
+            &outCompositorTiming->compositeDeadline,
+            &outCompositorTiming->compositeInterval,
+            &outCompositorTiming->compositeToPresentLatency);
+    if (status == 0) {
+        return true;
+    }
+
+    return PlatformEGL::queryCompositorTiming(swapchain, outCompositorTiming);
 }
 
 bool PlatformEGLAndroid::setPresentFrameId(SwapChain const* swapchain,
@@ -360,10 +327,6 @@ bool PlatformEGLAndroid::queryFrameTimestamps(SwapChain const* swapchain, uint64
         return false;
     }
 
-    if (!static_cast<SwapChainEGLAndroid const *>(swapchain)->frameTimestampsSupported) {
-        return false;
-    }
-
     if (UTILS_LIKELY(ext.egl.ANDROID_get_frame_timestamps)) {
         EGLSurface const sur = sc->sur;
         if (sur == EGL_NO_SURFACE) {
@@ -384,9 +347,7 @@ bool PlatformEGLAndroid::queryFrameTimestamps(SwapChain const* swapchain, uint64
         };
         EGLBoolean const success = eglGetFrameTimestampsANDROID(getEglDisplay(), sur, hwFrameId,
                 names.size(), names.data(), values.data());
-        if (UTILS_UNLIKELY(!success)) {
-            // reset current error to EGL_SUCCESS
-            eglGetError();
+        if (!success) {
             return false;
         }
         outFrameTimestamps->requestedPresentTime = values[0];
@@ -400,44 +361,28 @@ bool PlatformEGLAndroid::queryFrameTimestamps(SwapChain const* swapchain, uint64
         outFrameTimestamps->releaseTime = values[8];
         return true;
     }
+
+    // fallback to private APIs
+    auto const anw = sc->nativeWindow;
+    int const status = NativeWindow::getFrameTimestamps(anw, hwFrameId,
+            &outFrameTimestamps->requestedPresentTime,
+            &outFrameTimestamps->acquireTime,
+            &outFrameTimestamps->latchTime,
+            &outFrameTimestamps->firstCompositionStartTime,
+            &outFrameTimestamps->lastCompositionStartTime,
+            &outFrameTimestamps->gpuCompositionDoneTime,
+            &outFrameTimestamps->displayPresentTime,
+            &outFrameTimestamps->dequeueReadyTime,
+            &outFrameTimestamps->releaseTime);
+    if (status == 0) {
+        return true;
+    }
+
     return PlatformEGL::queryFrameTimestamps(swapchain, frameId, outFrameTimestamps);
 }
 
 Platform::SwapChain* PlatformEGLAndroid::createSwapChain(void* nativeWindow, uint64_t const flags) {
     auto* const sc = new(std::nothrow) SwapChainEGLAndroid(*this, nativeWindow, flags);
-    if (UTILS_LIKELY(ext.egl.ANDROID_get_frame_timestamps)) {
-        EGLDisplay const dpy = getEglDisplay();
-        sc->compositorTimingSupported =
-                eglGetCompositorTimingSupportedANDROID(dpy, sc->sur,
-                        EGL_COMPOSITE_DEADLINE_ANDROID) &&
-                eglGetCompositorTimingSupportedANDROID(dpy, sc->sur,
-                        EGL_COMPOSITE_INTERVAL_ANDROID) &&
-                eglGetCompositorTimingSupportedANDROID(dpy, sc->sur,
-                        EGL_COMPOSITE_TO_PRESENT_LATENCY_ANDROID);
-        sc->frameTimestampsSupported =
-                eglGetFrameTimestampSupportedANDROID(dpy, sc->sur,
-                        EGL_REQUESTED_PRESENT_TIME_ANDROID) &&
-                eglGetFrameTimestampSupportedANDROID(dpy, sc->sur,
-                        EGL_RENDERING_COMPLETE_TIME_ANDROID) &&
-                eglGetFrameTimestampSupportedANDROID(dpy, sc->sur,
-                        EGL_COMPOSITION_LATCH_TIME_ANDROID) &&
-                eglGetFrameTimestampSupportedANDROID(dpy, sc->sur,
-                        EGL_FIRST_COMPOSITION_START_TIME_ANDROID) &&
-                eglGetFrameTimestampSupportedANDROID(dpy, sc->sur,
-                        EGL_LAST_COMPOSITION_START_TIME_ANDROID) &&
-                eglGetFrameTimestampSupportedANDROID(dpy, sc->sur,
-                        EGL_FIRST_COMPOSITION_GPU_FINISHED_TIME_ANDROID) &&
-                eglGetFrameTimestampSupportedANDROID(dpy, sc->sur,
-                        EGL_DISPLAY_PRESENT_TIME_ANDROID) &&
-                eglGetFrameTimestampSupportedANDROID(dpy, sc->sur,
-                        EGL_DEQUEUE_READY_TIME_ANDROID) &&
-                eglGetFrameTimestampSupportedANDROID(dpy, sc->sur,
-                        EGL_READS_DONE_TIME_ANDROID);
-    }
-    // This is expected to be a low frequency log, only turned on in debug builds
-    DLOG(INFO) << "anw: " << nativeWindow
-            << ", compositorTimingSupported=" << sc->compositorTimingSupported
-            << ", frameTimestampsSupported=" << sc->frameTimestampsSupported;
     return sc;
 }
 
@@ -450,10 +395,6 @@ Platform::SwapChain* PlatformEGLAndroid::createSwapChain(
 void PlatformEGLAndroid::destroySwapChain(SwapChain* swapChain) noexcept {
     if (swapChain) {
         SwapChainEGLAndroid* const sc = static_cast<SwapChainEGLAndroid*>(swapChain);
-        if (mCurrentDrawSwapChain == sc) {
-            // don't keep a dangling pointer around
-            mCurrentDrawSwapChain = nullptr;
-        }
         sc->terminate(*this);
         delete sc;
     }
@@ -734,12 +675,12 @@ AcquiredImage PlatformEGLAndroid::transformAcquiredImage(AcquiredImage const sou
 
 
 bool PlatformEGLAndroid::isProducerThrottlingControlSupported() const {
-    return mAndroidDetails.producerThrottling.isSupported();
+    return mProducerThrottling.isSupported();
 }
 
 int32_t PlatformEGLAndroid::setProducerThrottlingEnabled(
     EGLNativeWindowType const nativeWindow, bool const enabled) const {
-    return mAndroidDetails.producerThrottling.setProducerThrottlingEnabled(nativeWindow, enabled);
+    return mProducerThrottling.setProducerThrottlingEnabled(nativeWindow, enabled);
 }
 
 // ---------------------------------------------------------------------------------------------
@@ -763,6 +704,8 @@ PlatformEGLAndroid::SwapChainEGLAndroid::SwapChainEGLAndroid(PlatformEGLAndroid
             // we ignore the result, it doesn't matter much if it fails
             eglSurfaceAttrib(platform.getEglDisplay(), sur, EGL_TIMESTAMPS_ANDROID, EGL_TRUE);
         }
+    } else {
+        NativeWindow::enableFrameTimestamps(EGLNativeWindowType(nativeWindow), true);
     }
 }
 

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

@@ -16,7 +16,7 @@
 
 #include <backend/platforms/PlatformEGLHeadless.h>
 
-#include <bluegl/BlueGL.h>
+#include "opengl/GLUtils.h"
 
 #include <EGL/egl.h>
 #include <EGL/eglext.h>
@@ -35,31 +35,16 @@ PlatformEGLHeadless::PlatformEGLHeadless() noexcept
 }
 
 bool PlatformEGLHeadless::isOpenGL() const noexcept {
-#if defined(BACKEND_OPENGL_VERSION_GL)
-    return true;
-#else
-    return false;
-#endif  // defined(BACKEND_OPENGL_VERSION_GL)
+    return  true;
 }
 
 backend::Driver* PlatformEGLHeadless::createDriver(void* sharedContext,
         const Platform::DriverConfig& driverConfig) {
-    auto bindApiHelper = [](EGLenum api, const char* errorString) -> bool {
-        EGLBoolean bindAPI = eglBindAPI(api);
-        if (UTILS_UNLIKELY(bindAPI == EGL_FALSE || bindAPI == EGL_BAD_PARAMETER)) {
-            logEglError(errorString);
-            eglReleaseThread();
-            return false;
-        };
-        return true;
-    };
-
-    EGLenum api = isOpenGL() ? EGL_OPENGL_API : EGL_OPENGL_ES_API;
-    const char* apiString = isOpenGL() ? "eglBindAPI EGL_OPENGL_API" : "eglBindAPI EGL_OPENGL_ES_API";
-    if (!bindApiHelper(api, apiString)) {
+    EGLBoolean bindAPI = eglBindAPI(EGL_OPENGL_API);
+    if (UTILS_UNLIKELY(!bindAPI)) {
+        LOG(ERROR) << "eglBindAPI EGL_OPENGL_API failed";
         return nullptr;
     }
-
     int bindBlueGL = bluegl::bind();
     if (UTILS_UNLIKELY(bindBlueGL != 0)) {
         LOG(ERROR) << "bluegl bind failed";

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

@@ -14,19 +14,15 @@
  * limitations under the License.
  */
 
-#include <backend/Platform.h>
-
 #include <backend/platforms/PlatformWebGL.h>
 
-#include <cstdint>
-
 namespace filament::backend {
 
 using namespace backend;
 
 Driver* PlatformWebGL::createDriver(void* sharedGLContext,
-        const DriverConfig& driverConfig) {
-    return createDefaultDriver(this, sharedGLContext, driverConfig);
+        const Platform::DriverConfig& driverConfig) {
+    return OpenGLPlatform::createDefaultDriver(this, sharedGLContext, driverConfig);
 }
 
 int PlatformWebGL::getOSVersion() const noexcept {
@@ -38,7 +34,7 @@ void PlatformWebGL::terminate() noexcept {
 
 Platform::SwapChain* PlatformWebGL::createSwapChain(
         void* nativeWindow, uint64_t flags) noexcept {
-    return static_cast<SwapChain*>(nativeWindow);
+    return (SwapChain*)nativeWindow;
 }
 
 Platform::SwapChain* PlatformWebGL::createSwapChain(
@@ -47,7 +43,7 @@ Platform::SwapChain* PlatformWebGL::createSwapChain(
     return nullptr;
 }
 
-void PlatformWebGL::destroySwapChain(SwapChain* swapChain) noexcept {
+void PlatformWebGL::destroySwapChain(Platform::SwapChain* swapChain) noexcept {
 }
 
 bool PlatformWebGL::makeCurrent(ContextType type, SwapChain* drawSwapChain,
@@ -55,7 +51,7 @@ bool PlatformWebGL::makeCurrent(ContextType type, SwapChain* drawSwapChain,
     return true;
 }
 
-void PlatformWebGL::commit(SwapChain* swapChain) noexcept {
+void PlatformWebGL::commit(Platform::SwapChain* swapChain) noexcept {
 }
 
 } // namespace filament::backend