matc: initialize CustomVariable

The default values were not provided via default construction.
Caused matc to crash on Linux.

.github/actions/android-continuous/action.yml

@@ -1,17 +0,0 @@
-name: 'Android Continuous'
-inputs:
-  build-abi:
-    description: 'The target platform ABI'
-    required: true
-    default: 'armeabi-v7a'
-runs:
-  using: "composite"
-  steps:
-    - uses: actions/setup-java@v3
-      with:
-        distribution: 'temurin'
-        java-version: '17'
-    - name: Run build script
-      run: |
-        cd build/android && printf "y" | ./build.sh continuous ${{ inputs.build-abi }}
-      shell: bash

.github/workflows/android-continuous.yml

@@ -8,35 +8,32 @@ on:
       - rc/**
 
 jobs:
-  build-android-armv7:
-    name: build-android-armv7
+  build-android:
+    name: build-android
     runs-on: macos-14
 
     steps:
       - uses: actions/checkout@v4.1.6
-      - name: Run Android Continuous
-        uses: ./.github/actions/android-continuous
+      - uses: actions/setup-java@v3
         with:
-          build-abi: armeabi-v7a
-
-  build-android-armv8a:
-    name: build-android-armv8a
-    runs-on: macos-14
-
-    steps:
-      - uses: actions/checkout@v4.1.6
-      - name: Run Android Continuous
-        uses: ./.github/actions/android-continuous
+          distribution: 'temurin'
+          java-version: '17'
+      - name: Run build script
+        run: |
+          cd build/android && printf "y" | ./build.sh continuous
+      - uses: actions/upload-artifact@v1.0.0
         with:
-          build-abi: arm64-v8a
-
-  build-android-x86_64:
-    name: build-android-x86_64
-    runs-on: macos-14
-
-    steps:
-      - uses: actions/checkout@v4.1.6
-      - name: Run Android Continuous
-        uses: ./.github/actions/android-continuous
+          name: filament-android
+          path: out/filament-android-release.aar
+      - uses: actions/upload-artifact@v1.0.0
         with:
-          build-abi: x86_64
+          name: filamat-android-full
+          path: out/filamat-android-release.aar
+      - uses: actions/upload-artifact@v1.0.0
+        with:
+          name: gltfio-android-release
+          path: out/gltfio-android-release.aar
+      - uses: actions/upload-artifact@v1.0.0
+        with:
+          name: filament-utils-android-release
+          path: out/filament-utils-android-release.aar

.github/workflows/presubmit.yml

@@ -49,10 +49,8 @@ jobs:
           distribution: 'temurin'
           java-version: '17'
       - name: Run build script
-        # Only build 1 64 bit target during presubmit to cut down build times during presubmit
-        # Continuous builds will build everything
         run: |
-          cd build/android && printf "y" | ./build.sh presubmit arm64-v8a
+          cd build/android && printf "y" | ./build.sh presubmit
 
   build-ios:
     name: build-iOS

.github/workflows/release.yml

@@ -120,7 +120,7 @@ jobs:
         env:
           TAG: ${{ steps.git_ref.outputs.tag }}
         run: |
-          cd build/android && printf "y" | ./build.sh release armeabi-v7a,arm64-v8a,x86,x86_64
+          cd build/android && printf "y" | ./build.sh release
           cd ../..
           mv out/filament-android-release.aar out/filament-${TAG}-android.aar
           mv out/filamat-android-release.aar out/filamat-${TAG}-android.aar

README.md

@@ -31,7 +31,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'com.google.android.filament:filament-android:1.54.4'
+    implementation 'com.google.android.filament:filament-android:1.54.0'
 }
 ```
 
@@ -51,9 +51,19 @@ Here are all the libraries available in the group `com.google.android.filament`:
 iOS projects can use CocoaPods to install the latest release:
 
 ```shell
-pod 'Filament', '~> 1.54.4'
+pod 'Filament', '~> 1.54.0'
 ```
 
+### Snapshots
+
+If you prefer to live on the edge, you can download a continuous build by following the following
+steps:
+
+1. Find the [commit](https://github.com/google/filament/commits/main) you're interested in.
+2. Click the green check mark under the commit message.
+3. Click on the _Details_ link for the platform you're interested in.
+4. On the top left click _Summary_, then in the _Artifacts_ section choose the desired artifact.
+
 ## Documentation
 
 - [Filament](https://google.github.io/filament/Filament.html), an in-depth explanation of

RELEASE_NOTES.md

@@ -7,17 +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.54.4
-
-- Add support for multi-layered render target with array textures.
-
-## v1.54.3
-
-
-## v1.54.2
-
-- Add a `name` API to Filament objects for debugging handle use-after-free assertions
-
 ## v1.54.1
 
 

android/gradle.properties

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

build/android/build.sh

@@ -60,7 +60,13 @@ if [[ ! -d "${ANDROID_HOME}/ndk/$FILAMENT_NDK_VERSION" ]]; then
     yes | ${ANDROID_HOME}/cmdline-tools/latest/bin/sdkmanager --licenses
     ${ANDROID_HOME}/cmdline-tools/latest/bin/sdkmanager "ndk;$FILAMENT_NDK_VERSION"
 fi
+
+# Only build 1 64 bit target during presubmit to cut down build times during presubmit
+# Continuous builds will build everything
 ANDROID_ABIS=
+if [[ "$TARGET" == "presubmit" ]]; then
+  ANDROID_ABIS="-q arm64-v8a"
+fi
 
 # Build the Android sample-gltf-viewer APK during release.
 BUILD_SAMPLES=
@@ -68,19 +74,5 @@ if [[ "$TARGET" == "release" ]]; then
     BUILD_SAMPLES="-k sample-gltf-viewer"
 fi
 
-function build_android() {
-    local ABI=$1
-
-    # Do the following in two steps so that we do not run out of space
-    if [[ -n "${BUILD_DEBUG}" ]]; then
-        FILAMENT_NDK_VERSION=${FILAMENT_NDK_VERSION} ./build.sh -p android -q ${ABI} -c ${BUILD_SAMPLES} ${GENERATE_ARCHIVES} ${BUILD_DEBUG}
-        rm -rf out/cmake-android-debug-*
-    fi
-    if [[ -n "${BUILD_RELEASE}" ]]; then
-        FILAMENT_NDK_VERSION=${FILAMENT_NDK_VERSION} ./build.sh -p android -q ${ABI} -c ${BUILD_SAMPLES} ${GENERATE_ARCHIVES} ${BUILD_RELEASE}
-        rm -rf out/cmake-android-release-*
-    fi
-}
-
 pushd `dirname $0`/../.. > /dev/null
-build_android $2
+FILAMENT_NDK_VERSION=${FILAMENT_NDK_VERSION} ./build.sh -p android $ANDROID_ABIS -c $BUILD_SAMPLES $GENERATE_ARCHIVES $BUILD_DEBUG $BUILD_RELEASE

filament/CMakeLists.txt

@@ -61,7 +61,6 @@ set(SRCS
         src/Engine.cpp
         src/Exposure.cpp
         src/Fence.cpp
-        src/FilamentBuilder.cpp
         src/FrameInfo.cpp
         src/FrameSkipper.cpp
         src/Froxelizer.cpp

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

@@ -162,10 +162,6 @@ DECL_DRIVER_API_0(finish)
 // reset state tracking, if the driver does any state tracking (e.g. GL)
 DECL_DRIVER_API_0(resetState)
 
-DECL_DRIVER_API_N(setDebugTag,
-        backend::HandleBase::HandleId, handleId,
-        utils::CString, tag)
-
 /*
  * Creating driver objects
  * -----------------------
@@ -444,10 +440,12 @@ DECL_DRIVER_API_N(setPushConstant,
         backend::PushConstantVariant, value)
 
 DECL_DRIVER_API_N(insertEventMarker,
-        const char*, string)
+        const char*, string,
+        uint32_t, len = 0)
 
 DECL_DRIVER_API_N(pushGroupMarker,
-        const char*, string)
+        const char*, string,
+        uint32_t, len = 0)
 
 DECL_DRIVER_API_0(popGroupMarker)
 

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

@@ -20,12 +20,11 @@
 #include <backend/Handle.h>
 
 #include <utils/Allocator.h>
-#include <utils/CString.h>
 #include <utils/Log.h>
-#include <utils/Panic.h>
 #include <utils/compiler.h>
 #include <utils/debug.h>
 #include <utils/ostream.h>
+#include <utils/Panic.h>
 
 #include <tsl/robin_map.h>
 
@@ -174,10 +173,8 @@ public:
                 uint8_t const age = (tag & HANDLE_AGE_MASK) >> HANDLE_AGE_SHIFT;
                 auto const pNode = static_cast<typename Allocator::Node*>(p);
                 uint8_t const expectedAge = pNode[-1].age;
-                // getHandleTag() is only called if the check fails.
-                FILAMENT_CHECK_POSTCONDITION(expectedAge == age)
-                        << "use-after-free of Handle with id=" << handle.getId()
-                        << ", tag=" << getHandleTag(handle.getId()).c_str_safe();
+                FILAMENT_CHECK_POSTCONDITION(expectedAge == age) <<
+                        "use-after-free of Handle with id=" << handle.getId();
             }
         }
 
@@ -204,29 +201,6 @@ public:
         return handle_cast<Dp>(const_cast<Handle<B>&>(handle));
     }
 
-    void associateTagToHandle(HandleBase::HandleId id, utils::CString&& tag) noexcept {
-        // TODO: for now, only pool handles check for use-after-free, so we only keep tags for
-        // those
-        if (isPoolHandle(id)) {
-            // Truncate the age to get the debug tag
-            uint32_t const key = id & ~(HANDLE_DEBUG_TAG_MASK ^ HANDLE_AGE_MASK);
-            // This line is the costly part. In the future, we could potentially use a custom
-            // allocator.
-            mDebugTags[key] = std::move(tag);
-        }
-    }
-
-    utils::CString getHandleTag(HandleBase::HandleId id) const noexcept {
-        if (!isPoolHandle(id)) {
-            return "(no tag)";
-        }
-        uint32_t const key = id & ~(HANDLE_DEBUG_TAG_MASK ^ HANDLE_AGE_MASK);
-        if (auto pos = mDebugTags.find(key); pos != mDebugTags.end()) {
-            return pos->second;
-        }
-        return "(no tag)";
-    }
-
 private:
 
     template<typename D>
@@ -344,24 +318,12 @@ private:
         }
     }
 
-    // number if bits allotted to the handle's age (currently 4 max)
-    static constexpr uint32_t HANDLE_AGE_BIT_COUNT = 4;
-    // number if bits allotted to the handle's debug tag (HANDLE_AGE_BIT_COUNT max)
-    static constexpr uint32_t HANDLE_DEBUG_TAG_BIT_COUNT = 2;
-    // bit shift for both the age and debug tag
-    static constexpr uint32_t HANDLE_AGE_SHIFT = 27;
-    // mask for the heap (vs pool) flag
-    static constexpr uint32_t HANDLE_HEAP_FLAG = 0x80000000u;
-    // mask for the age
-    static constexpr uint32_t HANDLE_AGE_MASK =
-            ((1 << HANDLE_AGE_BIT_COUNT) - 1) << HANDLE_AGE_SHIFT;
-    // mask for the debug tag
-    static constexpr uint32_t HANDLE_DEBUG_TAG_MASK =
-            ((1 << HANDLE_DEBUG_TAG_BIT_COUNT) - 1) << HANDLE_AGE_SHIFT;
-    // mask for the index
-    static constexpr uint32_t HANDLE_INDEX_MASK = 0x07FFFFFFu;
-
-    static_assert(HANDLE_DEBUG_TAG_BIT_COUNT <= HANDLE_AGE_BIT_COUNT);
+    // we handle a 4 bits age per address
+    static constexpr uint32_t HANDLE_HEAP_FLAG      = 0x80000000u;      // pool vs heap handle
+    static constexpr uint32_t HANDLE_AGE_MASK       = 0x78000000u;      // handle's age
+    static constexpr uint32_t HANDLE_INDEX_MASK     = 0x07FFFFFFu;      // handle index
+    static constexpr uint32_t HANDLE_TAG_MASK       = HANDLE_AGE_MASK;
+    static constexpr uint32_t HANDLE_AGE_SHIFT      = 27;
 
     static bool isPoolHandle(HandleBase::HandleId id) noexcept {
         return (id & HANDLE_HEAP_FLAG) == 0u;
@@ -376,7 +338,7 @@ private:
         // a non-pool handle.
         if (UTILS_LIKELY(isPoolHandle(id))) {
             char* const base = (char*)mHandleArena.getArea().begin();
-            uint32_t const tag = id & HANDLE_AGE_MASK;
+            uint32_t const tag = id & HANDLE_TAG_MASK;
             size_t const offset = (id & HANDLE_INDEX_MASK) * Allocator::getAlignment();
             return { static_cast<void*>(base + offset), tag };
         }
@@ -391,7 +353,7 @@ private:
         size_t const offset = (char*)p - base;
         assert_invariant((offset % Allocator::getAlignment()) == 0);
         auto id = HandleBase::HandleId(offset / Allocator::getAlignment());
-        id |= tag & HANDLE_AGE_MASK;
+        id |= tag & HANDLE_TAG_MASK;
         assert_invariant((id & HANDLE_HEAP_FLAG) == 0);
         return id;
     }
@@ -401,7 +363,6 @@ private:
     // Below is only used when running out of space in the HandleArena
     mutable utils::Mutex mLock;
     tsl::robin_map<HandleBase::HandleId, void*> mOverflowMap;
-    tsl::robin_map<HandleBase::HandleId, utils::CString> mDebugTags;
     HandleBase::HandleId mId = 0;
     bool mUseAfterFreeCheckDisabled = false;
 };

filament/backend/src/CircularBuffer.cpp

@@ -24,7 +24,7 @@
 #include <utils/debug.h>
 #include <utils/ostream.h>
 
-#if !defined(WIN32) && !defined(__EMSCRIPTEN__)
+#if !defined(WIN32) && !defined(__EMSCRIPTEN__) && !defined(IOS)
 #    include <sys/mman.h>
 #    include <unistd.h>
 #    define HAS_MMAP 1

filament/backend/src/CommandStream.cpp

@@ -20,16 +20,11 @@
 #include <utils/CallStack.h>
 #endif
 
-#include <utils/compiler.h>
 #include <utils/Log.h>
-#include <utils/ostream.h>
 #include <utils/Profiler.h>
 #include <utils/Systrace.h>
 
-#include <cstddef>
 #include <functional>
-#include <string>
-#include <utility>
 
 #ifdef __ANDROID__
 #include <sys/system_properties.h>
@@ -79,8 +74,8 @@ CommandStream::CommandStream(Driver& driver, CircularBuffer& buffer) noexcept
 }
 
 void CommandStream::execute(void* buffer) {
-    // NOTE: we can't use SYSTRACE_CALL() or similar here because, execute() below, also
-    // uses systrace BEGIN/END and the END is not guaranteed to be happening in this scope.
+    SYSTRACE_CALL();
+    SYSTRACE_CONTEXT();
 
     Profiler profiler;
 
@@ -105,7 +100,6 @@ void CommandStream::execute(void* buffer) {
             // we want to remove all this when tracing is completely disabled
             profiler.stop();
             UTILS_UNUSED Profiler::Counters const counters = profiler.readCounters();
-            SYSTRACE_CONTEXT();
             SYSTRACE_VALUE32("GLThread (I)", counters.getInstructions());
             SYSTRACE_VALUE32("GLThread (C)", counters.getCpuCycles());
             SYSTRACE_VALUE32("GLThread (CPI x10)", counters.getCPI() * 10);

filament/backend/src/HandleAllocator.cpp

@@ -80,9 +80,6 @@ HandleAllocator<P0, P1, P2>::HandleAllocator(const char* name, size_t size,
         bool disableUseAfterFreeCheck) noexcept
     : mHandleArena(name, size, disableUseAfterFreeCheck),
       mUseAfterFreeCheckDisabled(disableUseAfterFreeCheck) {
-    // Reserve initial space for debug tags. This prevents excessive calls to malloc when the first
-    // few tags are set.
-    mDebugTags.reserve(512);
 }
 
 template <size_t P0, size_t P1, size_t P2>

filament/backend/src/metal/MetalBuffer.h

@@ -160,8 +160,6 @@ public:
          size_t size, bool forceGpuBuffer = false);
     ~MetalBuffer();
 
-    [[nodiscard]] bool wasAllocationSuccessful() const noexcept { return mBuffer || mCpuBuffer; }
-
     MetalBuffer(const MetalBuffer& rhs) = delete;
     MetalBuffer& operator=(const MetalBuffer& rhs) = delete;
 

filament/backend/src/metal/MetalBuffer.mm

@@ -53,8 +53,8 @@ MetalBuffer::MetalBuffer(MetalContext& context, BufferObjectBinding bindingType,
         mBuffer = { [context.device newBufferWithLength:size options:MTLResourceStorageModePrivate],
             TrackedMetalBuffer::Type::GENERIC };
     }
-    // mBuffer might fail to be allocated. Clients can check for this by calling
-    // wasAllocationSuccessful().
+    FILAMENT_CHECK_POSTCONDITION(mBuffer)
+            << "Could not allocate Metal buffer of size " << size << ".";
 }
 
 MetalBuffer::~MetalBuffer() {

filament/backend/src/metal/MetalDriver.h

@@ -57,6 +57,7 @@ class MetalDriver final : public DriverBase {
 
 public:
     static Driver* create(MetalPlatform* platform, const Platform::DriverConfig& driverConfig);
+    void runAtNextTick(const std::function<void()>& fn) noexcept;
 
 private:
 
@@ -72,12 +73,10 @@ private:
 
     /*
      * Tasks run regularly on the driver thread.
-     * Not thread-safe; tasks are run from the driver thead and must be enqueued from the driver
-     * thread.
      */
-    void runAtNextTick(const std::function<void()>& fn) noexcept;
     void executeTickOps() noexcept;
     std::vector<std::function<void()>> mTickOps;
+    std::mutex mTickOpsLock;
 
     /*
      * Driver interface

filament/backend/src/metal/MetalDriver.mm

@@ -320,40 +320,17 @@ void MetalDriver::createVertexBufferR(Handle<HwVertexBuffer> vbh,
         uint32_t vertexCount, Handle<HwVertexBufferInfo> vbih) {
     MetalVertexBufferInfo const* const vbi = handle_cast<const MetalVertexBufferInfo>(vbih);
     construct_handle<MetalVertexBuffer>(vbh, *mContext, vertexCount, vbi->bufferCount, vbih);
-    // No actual GPU memory is allocated here, so no need to check for allocation success.
 }
 
 void MetalDriver::createIndexBufferR(Handle<HwIndexBuffer> ibh, ElementType elementType,
         uint32_t indexCount, BufferUsage usage) {
-    auto elementSize = (uint8_t)getElementTypeSize(elementType);
-    auto* indexBuffer =
-            construct_handle<MetalIndexBuffer>(ibh, *mContext, usage, elementSize, indexCount);
-    auto& buffer = indexBuffer->buffer;
-    // If the allocation was not successful, postpone the error message until the next tick, to give
-    // Filament a chance to call setDebugTag on the handle; this way we get a nicer error message.
-    if (UTILS_UNLIKELY(!buffer.wasAllocationSuccessful())) {
-        const size_t byteCount = buffer.getSize();
-        runAtNextTick([byteCount, this, ibh]() {
-            FILAMENT_CHECK_POSTCONDITION(false)
-                    << "Could not allocate Metal index buffer of size " << byteCount
-                    << ", tag=" << mHandleAllocator.getHandleTag(ibh.getId()).c_str_safe();
-        });
-    }
+    auto elementSize = (uint8_t) getElementTypeSize(elementType);
+    construct_handle<MetalIndexBuffer>(ibh, *mContext, usage, elementSize, indexCount);
 }
 
 void MetalDriver::createBufferObjectR(Handle<HwBufferObject> boh, uint32_t byteCount,
         BufferObjectBinding bindingType, BufferUsage usage) {
-    auto* bufferObject =
-            construct_handle<MetalBufferObject>(boh, *mContext, bindingType, usage, byteCount);
-    // If the allocation was not successful, postpone the error message until the next tick, to give
-    // Filament a chance to call setDebugTag on the handle; this way we get a nicer error message.
-    if (UTILS_UNLIKELY(!bufferObject->getBuffer()->wasAllocationSuccessful())) {
-        runAtNextTick([byteCount, this, boh]() {
-            FILAMENT_CHECK_POSTCONDITION(false)
-                    << "Could not allocate Metal buffer of size " << byteCount
-                    << ", tag=" << mHandleAllocator.getHandleTag(boh.getId()).c_str_safe();
-        });
-    }
+    construct_handle<MetalBufferObject>(boh, *mContext, bindingType, usage, byteCount);
 }
 
 void MetalDriver::createTextureR(Handle<HwTexture> th, SamplerType target, uint8_t levels,
@@ -1302,11 +1279,11 @@ void MetalDriver::setPushConstant(backend::ShaderStage stage, uint8_t index,
     pushConstants.setPushConstant(value, index);
 }
 
-void MetalDriver::insertEventMarker(const char* string) {
+void MetalDriver::insertEventMarker(const char* string, uint32_t len) {
 
 }
 
-void MetalDriver::pushGroupMarker(const char* string) {
+void MetalDriver::pushGroupMarker(const char* string, uint32_t len) {
     mContext->groupMarkers.push(string);
 }
 
@@ -2095,17 +2072,16 @@ void MetalDriver::enumerateBoundBuffers(BufferObjectBinding bindingType,
 void MetalDriver::resetState(int) {
 }
 
-void MetalDriver::setDebugTag(HandleBase::HandleId handleId, utils::CString tag) {
-    mHandleAllocator.associateTagToHandle(handleId, std::move(tag));
-}
-
 void MetalDriver::runAtNextTick(const std::function<void()>& fn) noexcept {
+    std::lock_guard<std::mutex> const lock(mTickOpsLock);
     mTickOps.push_back(fn);
 }
 
 void MetalDriver::executeTickOps() noexcept {
     std::vector<std::function<void()>> ops;
+    mTickOpsLock.lock();
     std::swap(ops, mTickOps);
+    mTickOpsLock.unlock();
     for (const auto& f : ops) {
         f();
     }

filament/backend/src/metal/MetalHandles.mm

@@ -257,6 +257,10 @@ void MetalSwapChain::present() {
     }
 }
 
+#ifndef FILAMENT_RELEASE_PRESENT_DRAWABLE_MAIN_THREAD
+#define FILAMENT_RELEASE_PRESENT_DRAWABLE_MAIN_THREAD 1
+#endif
+
 class PresentDrawableData {
 public:
     PresentDrawableData() = delete;
@@ -275,10 +279,14 @@ public:
            [that->mDrawable present];
         }
 
+#if FILAMENT_RELEASE_PRESENT_DRAWABLE_MAIN_THREAD == 1
         // mDrawable is acquired on the driver thread. Typically, we would release this object on
         // the same thread, but after receiving consistent crash reports from within
         // [CAMetalDrawable dealloc], we suspect this object requires releasing on the main thread.
         dispatch_async(dispatch_get_main_queue(), ^{ cleanupAndDestroy(that); });
+#else
+        that->mDriver->runAtNextTick([that]() { cleanupAndDestroy(that); });
+#endif
     }
 
 private:

filament/backend/src/noop/NoopDriver.cpp

@@ -320,10 +320,10 @@ void NoopDriver::setPushConstant(backend::ShaderStage stage, uint8_t index,
         backend::PushConstantVariant value) {
 }
 
-void NoopDriver::insertEventMarker(char const* string) {
+void NoopDriver::insertEventMarker(char const* string, uint32_t len) {
 }
 
-void NoopDriver::pushGroupMarker(char const* string) {
+void NoopDriver::pushGroupMarker(char const* string,  uint32_t len) {
 }
 
 void NoopDriver::popGroupMarker(int) {
@@ -392,7 +392,4 @@ void NoopDriver::endTimerQuery(Handle<HwTimerQuery> tqh) {
 void NoopDriver::resetState(int) {
 }
 
-void NoopDriver::setDebugTag(HandleBase::HandleId handleId, utils::CString tag) {
-}
-
 } // namespace filament

filament/backend/src/opengl/OpenGLDriver.cpp

@@ -2222,10 +2222,6 @@ void OpenGLDriver::makeCurrent(Handle<HwSwapChain> schDraw, Handle<HwSwapChain>
 // Updating driver objects
 // ------------------------------------------------------------------------------------------------
 
-void OpenGLDriver::setDebugTag(HandleBase::HandleId handleId, utils::CString tag) {
-    mHandleAllocator.associateTagToHandle(handleId, std::move(tag));
-}
-
 void OpenGLDriver::setVertexBufferObject(Handle<HwVertexBuffer> vbh,
         uint32_t index, Handle<HwBufferObject> boh) {
    DEBUG_MARKER()
@@ -3196,23 +3192,23 @@ void OpenGLDriver::bindSamplers(uint32_t index, Handle<HwSamplerGroup> sbh) {
     CHECK_GL_ERROR(utils::slog.e)
 }
 
-void OpenGLDriver::insertEventMarker(char const* string) {
+void OpenGLDriver::insertEventMarker(char const* string, uint32_t len) {
 #ifndef __EMSCRIPTEN__
 #ifdef GL_EXT_debug_marker
     auto& gl = mContext;
     if (gl.ext.EXT_debug_marker) {
-        glInsertEventMarkerEXT(GLsizei(strlen(string)), string);
+        glInsertEventMarkerEXT(GLsizei(len ? len : strlen(string)), string);
     }
 #endif
 #endif
 }
 
-void OpenGLDriver::pushGroupMarker(char const* string) {
+void OpenGLDriver::pushGroupMarker(char const* string, uint32_t len) {
 #ifndef __EMSCRIPTEN__
 #ifdef GL_EXT_debug_marker
 #if DEBUG_GROUP_MARKER_LEVEL & DEBUG_GROUP_MARKER_OPENGL
     if (UTILS_LIKELY(mContext.ext.EXT_debug_marker)) {
-        glPushGroupMarkerEXT(GLsizei(strlen(string)), string);
+        glPushGroupMarkerEXT(GLsizei(len ? len : strlen(string)), string);
     }
 #endif
 #endif

filament/backend/src/vulkan/VulkanDriver.cpp

@@ -1606,13 +1606,13 @@ void VulkanDriver::setPushConstant(backend::ShaderStage stage, uint8_t index,
             value);
 }
 
-void VulkanDriver::insertEventMarker(char const* string) {
+void VulkanDriver::insertEventMarker(char const* string, uint32_t len) {
 #if FVK_ENABLED(FVK_DEBUG_GROUP_MARKERS)
-    mCommands.insertEventMarker(string, strlen(string));
+    mCommands.insertEventMarker(string, len);
 #endif
 }
 
-void VulkanDriver::pushGroupMarker(char const* string) {
+void VulkanDriver::pushGroupMarker(char const* string, uint32_t) {
     // Turns out all the markers are 0-terminated, so we can just pass it without len.
 #if FVK_ENABLED(FVK_DEBUG_GROUP_MARKERS)
     mCommands.pushGroupMarker(string);
@@ -1821,6 +1821,7 @@ void VulkanDriver::bindPipeline(PipelineState const& pipelineState) {
         .colorWriteMask = (VkColorComponentFlags) (rasterState.colorWrite ? 0xf : 0x0),
         .rasterizationSamples = rt->getSamples(),
         .depthClamp = rasterState.depthClamp,
+        .reserved = 0,
         .colorTargetCount = rt->getColorTargetCount(mCurrentRenderPass),
         .colorBlendOp = rasterState.blendEquationRGB,
         .alphaBlendOp =  rasterState.blendEquationAlpha,
@@ -2037,10 +2038,6 @@ void VulkanDriver::debugCommandBegin(CommandStream* cmds, bool synchronous, cons
 void VulkanDriver::resetState(int) {
 }
 
-void VulkanDriver::setDebugTag(HandleBase::HandleId handleId, utils::CString tag) {
-    mResourceAllocator.associateHandle(handleId, std::move(tag));
-}
-
 // explicit instantiation of the Dispatcher
 template class ConcreteDispatcher<VulkanDriver>;
 

filament/backend/src/vulkan/VulkanHandles.cpp

@@ -16,6 +16,7 @@
 
 #include "VulkanHandles.h"
 
+#include "VulkanDriver.h"
 #include "VulkanConstants.h"
 #include "VulkanDriver.h"
 #include "VulkanMemory.h"

filament/backend/src/vulkan/VulkanPipelineCache.h

@@ -91,7 +91,8 @@ public:
         VkBlendFactor         dstAlphaBlendFactor : 5;
         VkColorComponentFlags colorWriteMask : 4;
         uint8_t               rasterizationSamples : 4;// offset = 4 bytes
-        uint8_t               depthClamp : 4;
+        uint8_t               depthClamp : 1;
+        uint8_t               reserved : 3;
         uint8_t               colorTargetCount;        // offset = 5 bytes
         BlendEquation         colorBlendOp : 4;        // offset = 6 bytes
         BlendEquation         alphaBlendOp : 4;

filament/backend/src/vulkan/VulkanResourceAllocator.h

@@ -105,10 +105,6 @@ public:
         mHandleAllocatorImpl.deallocate(handle, obj);
     }
 
-    inline void associateHandle(HandleBase::HandleId id, utils::CString&& tag) noexcept {
-        mHandleAllocatorImpl.associateTagToHandle(id, std::move(tag));
-    }
-
 private:
     AllocatorImpl mHandleAllocatorImpl;
 

filament/backend/src/vulkan/VulkanTexture.cpp

@@ -97,11 +97,13 @@ VulkanTexture::VulkanTexture(VkDevice device, VkPhysicalDevice physicalDevice,
         imageInfo.extent.depth = 1;
     }
 
-    if (any(usage & TextureUsage::BLIT_SRC)) {
-        imageInfo.usage |= VK_IMAGE_USAGE_TRANSFER_SRC_BIT;
-    }
-    if (any(usage & TextureUsage::BLIT_DST)) {
-        imageInfo.usage |= VK_IMAGE_USAGE_TRANSFER_DST_BIT;
+    // Filament expects blit() to work with any texture, so we almost always set these usage flags.
+    // TODO: investigate performance implications of setting these flags.
+    constexpr VkImageUsageFlags blittable = VK_IMAGE_USAGE_TRANSFER_DST_BIT |
+            VK_IMAGE_USAGE_TRANSFER_SRC_BIT;
+
+    if (any(usage & (TextureUsage::BLIT_DST | TextureUsage::BLIT_SRC))) {
+        imageInfo.usage |= blittable;
     }
 
     if (any(usage & TextureUsage::SAMPLEABLE)) {
@@ -119,7 +121,7 @@ VulkanTexture::VulkanTexture(VkDevice device, VkPhysicalDevice physicalDevice,
         imageInfo.usage |= VK_IMAGE_USAGE_SAMPLED_BIT;
     }
     if (any(usage & TextureUsage::COLOR_ATTACHMENT)) {
-        imageInfo.usage |= VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT;
+        imageInfo.usage |= VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT | blittable;
         if (any(usage & TextureUsage::SUBPASS_INPUT)) {
             imageInfo.usage |= VK_IMAGE_USAGE_INPUT_ATTACHMENT_BIT;
         }
@@ -128,9 +130,10 @@ VulkanTexture::VulkanTexture(VkDevice device, VkPhysicalDevice physicalDevice,
         imageInfo.usage |= VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT;
     }
     if (any(usage & TextureUsage::UPLOADABLE)) {
-        imageInfo.usage |= VK_IMAGE_USAGE_TRANSFER_DST_BIT;
+        imageInfo.usage |= blittable;
     }
     if (any(usage & TextureUsage::DEPTH_ATTACHMENT)) {
+        imageInfo.usage |= blittable;
         imageInfo.usage |= VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT;
 
         // Depth resolves uses a custom shader and therefore needs to be sampleable.

filament/backend/src/vulkan/caching/VulkanPipelineLayoutCache.cpp

@@ -32,8 +32,8 @@ VkPipelineLayout VulkanPipelineLayoutCache::getLayout(
     }
 
     // build the push constant layout key
-    uint32_t const pushConstantRangeCount = program->getPushConstantRangeCount();
-    auto const& pushConstantRanges = program->getPushConstantRanges();
+    uint32_t pushConstantRangeCount = program->getPushConstantRangeCount();
+    auto const& pushConstantRanges = program->getPushConstantRanges();    
     if (pushConstantRangeCount > 0) {
         assert_invariant(pushConstantRangeCount <= Program::SHADER_TYPE_COUNT);
         for (uint8_t i = 0; i < pushConstantRangeCount; ++i) {
@@ -52,8 +52,8 @@ VkPipelineLayout VulkanPipelineLayoutCache::getLayout(
         }
     }
 
-    if (auto iter = mPipelineLayouts.find(key); iter != mPipelineLayouts.end()) {
-        PipelineLayoutCacheEntry& entry = iter->second;
+    if (PipelineLayoutMap::iterator iter = mPipelineLayouts.find(key); iter != mPipelineLayouts.end()) {
+        PipelineLayoutCacheEntry& entry = iter.value();
         entry.lastUsed = mTimestamp++;
         return entry.handle;
     }

filament/backend/src/vulkan/caching/VulkanPipelineLayoutCache.h

@@ -22,7 +22,7 @@
 
 #include <utils/Hash.h>
 
-#include <unordered_map>
+#include <tsl/robin_map.h>
 
 namespace filament::backend {
 
@@ -36,8 +36,8 @@ public:
     void terminate() noexcept;
 
     struct PushConstantKey {
-        uint8_t stage = 0;// We have one set of push constant per shader stage (fragment, vertex, etc).
-        uint8_t size = 0;
+        uint8_t stage;// We have one set of push constant per shader stage (fragment, vertex, etc).
+        uint8_t size;
         // Note that there is also an offset parameter for push constants, but
         // we always assume our update range will have the offset 0.
     };
@@ -73,7 +73,7 @@ private:
         }
     };
 
-    using PipelineLayoutMap = std::unordered_map<PipelineLayoutKey, PipelineLayoutCacheEntry,
+    using PipelineLayoutMap = tsl::robin_map<PipelineLayoutKey, PipelineLayoutCacheEntry,
             PipelineLayoutKeyHashFn, PipelineLayoutKeyEqual>;
 
     VkDevice mDevice;
@@ -82,6 +82,6 @@ private:
     PipelineLayoutMap mPipelineLayouts;
 };
 
-} // filament::backend
+}
 
 #endif // TNT_FILAMENT_BACKEND_VULKANPIPELINECACHE_H

filament/include/filament/BufferObject.h

@@ -54,7 +54,7 @@ public:
     using BufferDescriptor = backend::BufferDescriptor;
     using BindingType = backend::BufferObjectBinding;
 
-    class Builder : public BuilderBase<BuilderDetails>, public BuilderNameMixin<Builder> {
+    class Builder : public BuilderBase<BuilderDetails> {
         friend struct BuilderDetails;
     public:
         Builder() noexcept;
@@ -78,21 +78,6 @@ public:
          */
         Builder& bindingType(BindingType bindingType) noexcept;
 
-        /**
-         * Associate an optional name with this BufferObject for debugging purposes.
-         *
-         * name will show in error messages and should be kept as short as possible. The name is
-         * truncated to a maximum of 128 characters.
-         *
-         * The name string is copied during this method so clients may free its memory after
-         * the function returns.
-         *
-         * @param name A string to identify this BufferObject
-         * @param len Length of name, should be less than or equal to 128
-         * @return This Builder, for chaining calls.
-         */
-        // Builder& name(const char* UTILS_NONNULL name, size_t len) noexcept; // inherited
-
         /**
          * Creates the BufferObject and returns a pointer to it. After creation, the buffer
          * object is uninitialized. Use BufferObject::setBuffer() to initialize it.

filament/include/filament/FilamentAPI.h

@@ -19,7 +19,6 @@
 
 #include <utils/compiler.h>
 #include <utils/PrivateImplementation.h>
-#include <utils/CString.h>
 
 #include <stddef.h>
 
@@ -55,23 +54,6 @@ public:
 template<typename T>
 using BuilderBase = utils::PrivateImplementation<T>;
 
-// This needs to be public because it is used in the following template.
-UTILS_PUBLIC void builderMakeName(utils::CString& outName, const char* name, size_t len) noexcept;
-
-template <typename Builder>
-class UTILS_PUBLIC BuilderNameMixin {
-public:
-    Builder& name(const char* name, size_t len) noexcept {
-        builderMakeName(mName, name, len);
-        return static_cast<Builder&>(*this);
-    }
-
-    utils::CString const& getName() const noexcept { return mName; }
-
-private:
-    utils::CString mName;
-};
-
 } // namespace filament
 
 #endif // TNT_FILAMENT_FILAMENTAPI_H

filament/include/filament/IndexBuffer.h

@@ -59,7 +59,7 @@ public:
         UINT = uint8_t(backend::ElementType::UINT),      //!< 32-bit indices
     };
 
-    class Builder : public BuilderBase<BuilderDetails>, public BuilderNameMixin<Builder> {
+    class Builder : public BuilderBase<BuilderDetails> {
         friend struct BuilderDetails;
     public:
         Builder() noexcept;
@@ -83,21 +83,6 @@ public:
          */
         Builder& bufferType(IndexType indexType) noexcept;
 
-        /**
-         * Associate an optional name with this IndexBuffer for debugging purposes.
-         *
-         * name will show in error messages and should be kept as short as possible. The name is
-         * truncated to a maximum of 128 characters.
-         *
-         * The name string is copied during this method so clients may free its memory after
-         * the function returns.
-         *
-         * @param name A string to identify this IndexBuffer
-         * @param len Length of name, should be less than or equal to 128
-         * @return This Builder, for chaining calls.
-         */
-        // Builder& name(const char* UTILS_NONNULL name, size_t len) noexcept; // inherited
-
         /**
          * Creates the IndexBuffer object and returns a pointer to it. After creation, the index
          * buffer is uninitialized. Use IndexBuffer::setBuffer() to initialize the IndexBuffer.

filament/include/filament/InstanceBuffer.h

@@ -38,7 +38,7 @@ class UTILS_PUBLIC InstanceBuffer : public FilamentAPI {
     struct BuilderDetails;
 
 public:
-    class Builder : public BuilderBase<BuilderDetails>, public BuilderNameMixin<Builder> {
+    class Builder : public BuilderBase<BuilderDetails> {
         friend struct BuilderDetails;
 
     public:
@@ -70,21 +70,6 @@ public:
          */
         Builder& localTransforms(math::mat4f const* UTILS_NULLABLE localTransforms) noexcept;
 
-        /**
-         * Associate an optional name with this InstanceBuffer for debugging purposes.
-         *
-         * name will show in error messages and should be kept as short as possible. The name is
-         * truncated to a maximum of 128 characters.
-         *
-         * The name string is copied during this method so clients may free its memory after
-         * the function returns.
-         *
-         * @param name A string to identify this InstanceBuffer
-         * @param len Length of name, should be less than or equal to 128
-         * @return This Builder, for chaining calls.
-         */
-        // Builder& name(const char* UTILS_NONNULL name, size_t len) noexcept; // inherited
-
         /**
          * Creates the InstanceBuffer object and returns a pointer to it.
          */

filament/include/filament/MorphTargetBuffer.h

@@ -39,7 +39,7 @@ class UTILS_PUBLIC MorphTargetBuffer : public FilamentAPI {
     struct BuilderDetails;
 
 public:
-    class Builder : public BuilderBase<BuilderDetails>, public BuilderNameMixin<Builder> {
+    class Builder : public BuilderBase<BuilderDetails> {
         friend struct BuilderDetails;
     public:
         Builder() noexcept;
@@ -63,21 +63,6 @@ public:
          */
         Builder& count(size_t count) noexcept;
 
-        /**
-         * Associate an optional name with this MorphTargetBuffer for debugging purposes.
-         *
-         * name will show in error messages and should be kept as short as possible. The name is
-         * truncated to a maximum of 128 characters.
-         *
-         * The name string is copied during this method so clients may free its memory after
-         * the function returns.
-         *
-         * @param name A string to identify this MorphTargetBuffer
-         * @param len Length of name, should be less than or equal to 128
-         * @return This Builder, for chaining calls.
-         */
-        // Builder& name(const char* UTILS_NONNULL name, size_t len) noexcept; // inherited
-
         /**
          * Creates the MorphTargetBuffer object and returns a pointer to it.
          *

filament/include/filament/SkinningBuffer.h

@@ -39,7 +39,7 @@ class UTILS_PUBLIC SkinningBuffer : public FilamentAPI {
     struct BuilderDetails;
 
 public:
-    class Builder : public BuilderBase<BuilderDetails>, public BuilderNameMixin<Builder> {
+    class Builder : public BuilderBase<BuilderDetails> {
         friend struct BuilderDetails;
     public:
         Builder() noexcept;
@@ -69,21 +69,6 @@ public:
          */
         Builder& initialize(bool initialize = true) noexcept;
 
-        /**
-         * Associate an optional name with this SkinningBuffer for debugging purposes.
-         *
-         * name will show in error messages and should be kept as short as possible. The name is
-         * truncated to a maximum of 128 characters.
-         *
-         * The name string is copied during this method so clients may free its memory after
-         * the function returns.
-         *
-         * @param name A string to identify this SkinningBuffer
-         * @param len Length of name, should be less than or equal to 128
-         * @return This Builder, for chaining calls.
-         */
-        // Builder& name(const char* UTILS_NONNULL name, size_t len) noexcept; // inherited
-
         /**
          * Creates the SkinningBuffer object and returns a pointer to it.
          *

filament/include/filament/Stream.h

@@ -94,7 +94,7 @@ public:
      *
      * To create a NATIVE stream, call the <pre>stream</pre> method on the builder.
      */
-    class Builder : public BuilderBase<BuilderDetails>, public BuilderNameMixin<Builder> {
+    class Builder : public BuilderBase<BuilderDetails> {
         friend struct BuilderDetails;
     public:
         Builder() noexcept;
@@ -136,21 +136,6 @@ public:
          */
         Builder& height(uint32_t height) noexcept;
 
-        /**
-         * Associate an optional name with this Stream for debugging purposes.
-         *
-         * name will show in error messages and should be kept as short as possible. The name is
-         * truncated to a maximum of 128 characters.
-         *
-         * The name string is copied during this method so clients may free its memory after
-         * the function returns.
-         *
-         * @param name A string to identify this Stream
-         * @param len Length of name, should be less than or equal to 128
-         * @return This Builder, for chaining calls.
-         */
-        // Builder& name(const char* UTILS_NONNULL name, size_t len) noexcept; // inherited
-
         /**
          * Creates the Stream object and returns a pointer to it.
          *

filament/include/filament/Texture.h

@@ -112,7 +112,7 @@ public:
 
 
     //! Use Builder to construct a Texture object instance
-    class Builder : public BuilderBase<BuilderDetails>, public BuilderNameMixin<Builder> {
+    class Builder : public BuilderBase<BuilderDetails> {
         friend struct BuilderDetails;
     public:
         Builder() noexcept;
@@ -202,21 +202,6 @@ public:
          */
         Builder& swizzle(Swizzle r, Swizzle g, Swizzle b, Swizzle a) noexcept;
 
-        /**
-         * Associate an optional name with this Texture for debugging purposes.
-         *
-         * name will show in error messages and should be kept as short as possible. The name is
-         * truncated to a maximum of 128 characters.
-         *
-         * The name string is copied during this method so clients may free its memory after
-         * the function returns.
-         *
-         * @param name A string to identify this Texture
-         * @param len Length of name, should be less than or equal to 128
-         * @return This Builder, for chaining calls.
-         */
-         // Builder& name(const char* UTILS_NONNULL name, size_t len) noexcept; // inherited
-
         /**
          * Creates the Texture object and returns a pointer to it.
          *

filament/include/filament/VertexBuffer.h

@@ -61,7 +61,7 @@ public:
     using AttributeType = backend::ElementType;
     using BufferDescriptor = backend::BufferDescriptor;
 
-    class Builder : public BuilderBase<BuilderDetails>, public BuilderNameMixin<Builder> {
+    class Builder : public BuilderBase<BuilderDetails> {
         friend struct BuilderDetails;
     public:
         Builder() noexcept;
@@ -158,21 +158,6 @@ public:
          */
         Builder& advancedSkinning(bool enabled) noexcept;
 
-        /**
-         * Associate an optional name with this VertexBuffer for debugging purposes.
-         *
-         * name will show in error messages and should be kept as short as possible. The name is
-         * truncated to a maximum of 128 characters.
-         *
-         * The name string is copied during this method so clients may free its memory after
-         * the function returns.
-         *
-         * @param name A string to identify this VertexBuffer
-         * @param len Length of name, should be less than or equal to 128
-         * @return This Builder, for chaining calls.
-         */
-        // Builder& name(const char* UTILS_NONNULL name, size_t len) noexcept; // inherited
-
         /**
          * Creates the VertexBuffer object and returns a pointer to it.
          *

filament/include/filament/View.h

@@ -570,13 +570,6 @@ public:
      */
     void setShadowType(ShadowType shadow) noexcept;
 
-    /**
-     * Returns the shadow mapping technique used by this View.
-     *
-     * @return value set by setShadowType().
-     */
-    ShadowType getShadowType() const noexcept;
-
     /**
      * Sets VSM shadowing options that apply across the entire View.
      *

filament/src/FilamentBuilder.cpp

@@ -1,31 +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.
- */
-
-#include <filament/FilamentAPI.h>
-
-#include <algorithm>
-
-namespace filament {
-
-void builderMakeName(utils::CString& outName, const char* name, size_t len) noexcept {
-    if (!name) {
-        return;
-    }
-    size_t const length = std::min(len, size_t { 128u });
-    outName = utils::CString(name, length);
-}
-
-} // namespace filament

filament/src/FrameSkipper.cpp

@@ -31,7 +31,8 @@ using namespace utils;
 using namespace backend;
 
 FrameSkipper::FrameSkipper(size_t latency) noexcept
-        : mLast(std::clamp(latency, size_t(1), MAX_FRAME_LATENCY) - 1) {
+        : mLast(std::max(latency, MAX_FRAME_LATENCY) - 1) {
+    assert_invariant(latency <= MAX_FRAME_LATENCY);
 }
 
 FrameSkipper::~FrameSkipper() noexcept = default;

filament/src/FrameSkipper.h

@@ -32,18 +32,7 @@ namespace filament {
  * outrun the GPU.
  */
 class FrameSkipper {
-    /*
-     * The maximum frame latency acceptable on ANDROID is 2 because higher latencies will be
-     * throttled anyway in BufferQueueProducer::dequeueBuffer(), because ANDROID is generally
-     * triple-buffered no more; that case is actually pretty bad because the GL thread can block
-     * anywhere (usually inside the first draw command that touches the swapchain).
-     *
-     * A frame latency of 1 has the benefit of reducing render latency,
-     * but the drawback of preventing CPU / GPU overlap.
-     *
-     * Generally a frame latency of 2 is the best compromise.
-     */
-    static constexpr size_t MAX_FRAME_LATENCY = 2;
+    static constexpr size_t MAX_FRAME_LATENCY = 3;
 public:
     /*
      * The latency parameter defines how many unfinished frames we want to accept before we start

filament/src/PerViewUniforms.cpp

@@ -459,12 +459,10 @@ void PerViewUniforms::bind(backend::DriverApi& driver) noexcept {
 
 void PerViewUniforms::unbindSamplers() noexcept {
     auto& samplerGroup = mSamplers;
-    samplerGroup.clearSampler(PerViewSib::SHADOW_MAP);
-    samplerGroup.clearSampler(PerViewSib::IBL_SPECULAR);
     samplerGroup.clearSampler(PerViewSib::SSAO);
     samplerGroup.clearSampler(PerViewSib::SSR);
     samplerGroup.clearSampler(PerViewSib::STRUCTURE);
-    samplerGroup.clearSampler(PerViewSib::FOG);
+    samplerGroup.clearSampler(PerViewSib::SHADOW_MAP);
 }
 
 } // namespace filament

filament/src/PostProcessManager.cpp

@@ -2945,10 +2945,6 @@ FrameGraphId<FrameGraphTexture> PostProcessManager::upscale(FrameGraph& fg, bool
                                     1.0f / outputDesc.height});
                     }
 
-                    if (blitterNames[index] == "blitLow") {
-                        mi->setParameter("levelOfDetail", 0.0f);
-                    }
-
                     mi->setParameter("viewport", float4{
                             (float)vp.left   / inputDesc.width,
                             (float)vp.bottom / inputDesc.height,
@@ -3007,8 +3003,9 @@ FrameGraphId<FrameGraphTexture> PostProcessManager::blit(FrameGraph& fg, bool tr
         SamplerMagFilter filterMag,
         SamplerMinFilter filterMin) noexcept {
 
-    uint32_t const layer = fg.getSubResourceDescriptor(input).layer;
-    float const levelOfDetail = fg.getSubResourceDescriptor(input).level;
+    // TODO: add support for sub-resources
+    assert_invariant(fg.getSubResourceDescriptor(input).layer == 0);
+    assert_invariant(fg.getSubResourceDescriptor(input).level == 0);
 
     struct QuadBlitData {
         FrameGraphId<FrameGraphTexture> input;
@@ -3034,8 +3031,7 @@ FrameGraphId<FrameGraphTexture> PostProcessManager::blit(FrameGraph& fg, bool tr
                 // --------------------------------------------------------------------------------
                 // set uniforms
 
-                PostProcessMaterial const& material =
-                        getPostProcessMaterial(layer ? "blitArray" : "blitLow");
+                PostProcessMaterial const& material = getPostProcessMaterial("blitLow");
                 auto* mi = material.getMaterialInstance(mEngine);
                 mi->setParameter("color", color, {
                         .filterMag = filterMag,
@@ -3047,10 +3043,6 @@ FrameGraphId<FrameGraphTexture> PostProcessManager::blit(FrameGraph& fg, bool tr
                         float(vp.width)  / inputDesc.width,
                         float(vp.height) / inputDesc.height
                 });
-                mi->setParameter("levelOfDetail", levelOfDetail);
-                if (layer) {
-                    mi->setParameter("layerIndex", layer);
-                }
                 mi->commit(driver);
                 mi->use(driver);
 
@@ -3193,7 +3185,6 @@ FrameGraphId<FrameGraphTexture> PostProcessManager::resolve(FrameGraph& fg,
                 assert_invariant(dst);
                 assert_invariant(srcDesc.format == dstDesc.format);
                 assert_invariant(srcDesc.width == dstDesc.width && srcDesc.height == dstDesc.height);
-                assert_invariant(srcDesc.samples > 1 && dstDesc.samples <= 1);
                 driver.resolve(
                         dst, dstSubDesc.level, dstSubDesc.layer,
                         src, srcSubDesc.level, srcSubDesc.layer);

filament/src/RenderPass.h

@@ -529,9 +529,7 @@ public:
     // like above but allows to set specific flags
     RenderPassBuilder& renderFlags(
             RenderPass::RenderFlags mask, RenderPass::RenderFlags value) noexcept {
-        value &= mask;
-        mFlags &= ~mask;
-        mFlags |= value;
+        mFlags = (mFlags & mask) | (value & mask);
         return *this;
     }
 

filament/src/RendererUtils.cpp

@@ -40,7 +40,6 @@
 #include <utils/Panic.h>
 
 #include <algorithm>
-#include <optional>
 #include <utility>
 
 #include <stddef.h>
@@ -51,9 +50,8 @@ namespace filament {
 using namespace backend;
 using namespace math;
 
-RendererUtils::ColorPassOutput RendererUtils::colorPass(
+FrameGraphId<FrameGraphTexture> RendererUtils::colorPass(
         FrameGraph& fg, const char* name, FEngine& engine, FView const& view,
-        ColorPassInput const& colorPassInput,
         FrameGraphTexture::Descriptor const& colorBufferDesc,
         ColorPassConfig const& config, PostProcessManager::ColorGradingConfig colorGradingConfig,
         RenderPass::Executor passExecutor) noexcept {
@@ -69,6 +67,8 @@ RendererUtils::ColorPassOutput RendererUtils::colorPass(
         FrameGraphId<FrameGraphTexture> structure;
     };
 
+    Blackboard& blackboard = fg.getBlackboard();
+
     auto& colorPass = fg.addPass<ColorPassData>(name,
             [&](FrameGraph::Builder& builder, ColorPassData& data) {
 
@@ -76,21 +76,21 @@ RendererUtils::ColorPassOutput RendererUtils::colorPass(
                 TargetBufferFlags clearDepthFlags = config.clearFlags & TargetBufferFlags::DEPTH;
                 TargetBufferFlags clearStencilFlags = config.clearFlags & TargetBufferFlags::STENCIL;
 
-                data.color = colorPassInput.linearColor;
-                data.depth = colorPassInput.depth;
-                data.shadows = colorPassInput.shadows;
-                data.ssao = colorPassInput.ssao;
+                data.shadows = blackboard.get<FrameGraphTexture>("shadows");
+                data.ssao = blackboard.get<FrameGraphTexture>("ssao");
+                data.color = blackboard.get<FrameGraphTexture>("color");
+                data.depth = blackboard.get<FrameGraphTexture>("depth");
 
                 // Screen-space reflection or refractions
                 if (config.hasScreenSpaceReflectionsOrRefractions) {
-                    data.ssr = colorPassInput.ssr;
+                    data.ssr = blackboard.get<FrameGraphTexture>("ssr");
                     if (data.ssr) {
                         data.ssr = builder.sample(data.ssr);
                     }
                 }
 
                 if (config.hasContactShadows) {
-                    data.structure = colorPassInput.structure;
+                    data.structure = blackboard.get<FrameGraphTexture>("structure");
                     assert_invariant(data.structure);
                     data.structure = builder.sample(data.structure);
                 }
@@ -153,8 +153,6 @@ RendererUtils::ColorPassOutput RendererUtils::colorPass(
                 }
 
                 if (colorGradingConfig.asSubpass) {
-                    assert_invariant(config.msaa <= 1);
-                    assert_invariant(colorBufferDesc.samples <= 1);
                     data.output = builder.createTexture("Tonemapped Buffer", {
                             .width = colorBufferDesc.width,
                             .height = colorBufferDesc.height,
@@ -196,6 +194,7 @@ RendererUtils::ColorPassOutput RendererUtils::colorPass(
                         .samples = config.msaa,
                         .layerCount = static_cast<uint8_t>(colorBufferDesc.depth),
                         .clearFlags = clearColorFlags | clearDepthFlags | clearStencilFlags});
+                blackboard["depth"] = data.depth;
             },
             [=, passExecutor = std::move(passExecutor), &view, &engine](FrameGraphResources const& resources,
                     ColorPassData const& data, DriverApi& driver) {
@@ -261,21 +260,24 @@ RendererUtils::ColorPassOutput RendererUtils::colorPass(
             }
     );
 
-    return {
-            .linearColor = colorPass->color,
-            .tonemappedColor = colorPass->output,   // can be null
-            .depth = colorPass->depth
-    };
+    // when color grading is done as a subpass, the output of the color-pass is the ldr buffer
+    auto output = colorGradingConfig.asSubpass ? colorPass->output : colorPass->color;
+
+    blackboard["color"] = output;
+    return output;
 }
 
-std::optional<RendererUtils::ColorPassOutput> RendererUtils::refractionPass(
+std::pair<FrameGraphId<FrameGraphTexture>, bool> RendererUtils::refractionPass(
         FrameGraph& fg, FEngine& engine, FView const& view,
-        ColorPassInput colorPassInput,
         ColorPassConfig config,
         PostProcessManager::ScreenSpaceRefConfig const& ssrConfig,
         PostProcessManager::ColorGradingConfig colorGradingConfig,
         RenderPass const& pass) noexcept {
 
+    auto& blackboard = fg.getBlackboard();
+    auto input = blackboard.get<FrameGraphTexture>("color");
+    FrameGraphId<FrameGraphTexture> output;
+
     // find the first refractive object in channel 2
     RenderPass::Command const* const refraction = std::partition_point(pass.begin(), pass.end(),
             [](auto const& command) {
@@ -290,35 +292,34 @@ std::optional<RendererUtils::ColorPassOutput> RendererUtils::refractionPass(
 
     // if there wasn't any refractive object, just skip everything below.
     if (UTILS_UNLIKELY(hasScreenSpaceRefraction)) {
-        assert_invariant(!colorPassInput.linearColor);
-        assert_invariant(!colorPassInput.depth);
+        PostProcessManager& ppm = engine.getPostProcessManager();
+
+        // clear the color/depth buffers, which will orphan (and cull) the color pass
+        input.clear();
+        blackboard.remove("color");
+        blackboard.remove("depth");
+
         config.hasScreenSpaceReflectionsOrRefractions = true;
 
-        PostProcessManager& ppm = engine.getPostProcessManager();
-        auto const opaquePassOutput = RendererUtils::colorPass(fg,
-                "Color Pass (opaque)", engine, view, colorPassInput, {
+        input = RendererUtils::colorPass(fg, "Color Pass (opaque)", engine, view, {
                         // When rendering the opaques, we need to conserve the sample buffer,
                         // so create a config that specifies the sample count.
                         .width = config.physicalViewport.width,
                         .height = config.physicalViewport.height,
                         .samples = config.msaa,
                         .format = config.hdrFormat
-                },
-                config, { .asSubpass = false, .customResolve = false },
+                }, config, { .asSubpass = false },
                 pass.getExecutor(pass.begin(), refraction));
 
         // generate the mipmap chain
         PostProcessManager::generateMipmapSSR(ppm, fg,
-                opaquePassOutput.linearColor,
-                ssrConfig.refraction,
-                true, ssrConfig);
+                input, ssrConfig.refraction, true, ssrConfig);
 
         // Now we're doing the refraction pass proper.
-        // This uses the same framebuffer (color and depth) used by the opaque pass.
-        // For this reason, the `colorBufferDesc` parameter of colorPass() below is only used  for
-        // the width and height.
-        colorPassInput.linearColor = opaquePassOutput.linearColor;
-        colorPassInput.depth = opaquePassOutput.depth;
+        // This uses the same framebuffer (color and depth) used by the opaque pass. This happens
+        // automatically because these are set in the Blackboard (they were set by the opaque
+        // pass). For this reason, `desc` below is only used in colorPass() for the width and
+        // height.
 
         // Since we're reusing the existing target we don't want to clear any of its buffer.
         // Important: if this target ended up being an imported target, then the clearFlags
@@ -326,25 +327,22 @@ std::optional<RendererUtils::ColorPassOutput> RendererUtils::refractionPass(
         // and we'd end up clearing the opaque pass. This scenario never happens because it is
         // prevented in Renderer.cpp's final blit.
         config.clearFlags = TargetBufferFlags::NONE;
-        auto transparentPassOutput = RendererUtils::colorPass(fg, "Color Pass (transparent)",
-                engine, view, colorPassInput, {
+        output = RendererUtils::colorPass(fg, "Color Pass (transparent)", engine, view, {
                         .width = config.physicalViewport.width,
                         .height = config.physicalViewport.height },
-                config, colorGradingConfig,
-                pass.getExecutor(refraction, pass.end()));
+                config, colorGradingConfig, pass.getExecutor(refraction, pass.end()));
 
         if (config.msaa > 1 && !colorGradingConfig.asSubpass) {
             // We need to do a resolve here because later passes (such as color grading or DoF) will
             // need to sample from 'output'. However, because we have MSAA, we know we're not
             // sampleable. And this is because in the SSR case, we had to use a renderbuffer to
             // conserve the multi-sample buffer.
-            transparentPassOutput.linearColor = ppm.resolve(fg, "Resolved Color Buffer",
-                    transparentPassOutput.linearColor, { .levels = 1 });
+            output = ppm.resolve(fg, "Resolved Color Buffer", output, { .levels = 1 });
         }
-        return transparentPassOutput;
+    } else {
+        output = input;
     }
-
-    return std::nullopt;
+    return { output, hasScreenSpaceRefraction };
 }
 
 UTILS_NOINLINE

filament/src/RendererUtils.h

@@ -21,19 +21,14 @@
 #include "RenderPass.h"
 
 #include "fg/FrameGraphId.h"
-#include "fg/FrameGraphTexture.h"
-
-#include <filament/Viewport.h>
 
 #include <backend/DriverEnums.h>
 #include <backend/PixelBufferDescriptor.h>
 
-#include <math/vec2.h>
 #include <math/vec4.h>
 
 #include <stdint.h>
 
-#include <optional>
 #include <utility>
 
 namespace filament {
@@ -76,32 +71,15 @@ public:
         bool screenSpaceReflectionHistoryNotReady;
     };
 
-    struct ColorPassInput {
-        FrameGraphId<FrameGraphTexture> linearColor;
-        FrameGraphId<FrameGraphTexture> tonemappedColor;
-        FrameGraphId<FrameGraphTexture> depth;
-        FrameGraphId<FrameGraphTexture> shadows;
-        FrameGraphId<FrameGraphTexture> ssao;
-        FrameGraphId<FrameGraphTexture> ssr;
-        FrameGraphId<FrameGraphTexture> structure;
-    };
-    struct ColorPassOutput {
-        FrameGraphId<FrameGraphTexture> linearColor;
-        FrameGraphId<FrameGraphTexture> tonemappedColor;
-        FrameGraphId<FrameGraphTexture> depth;
-    };
-
-    static ColorPassOutput colorPass(
+    static FrameGraphId<FrameGraphTexture> colorPass(
             FrameGraph& fg, const char* name, FEngine& engine, FView const& view,
-            ColorPassInput const& colorPassInput,
             FrameGraphTexture::Descriptor const& colorBufferDesc,
             ColorPassConfig const& config,
             PostProcessManager::ColorGradingConfig colorGradingConfig,
             RenderPass::Executor passExecutor) noexcept;
 
-    static std::optional<RendererUtils::ColorPassOutput> refractionPass(
+    static std::pair<FrameGraphId<FrameGraphTexture>, bool> refractionPass(
             FrameGraph& fg, FEngine& engine, FView const& view,
-            ColorPassInput colorPassInput,
             ColorPassConfig config,
             PostProcessManager::ScreenSpaceRefConfig const& ssrConfig,
             PostProcessManager::ColorGradingConfig colorGradingConfig,

filament/src/ResourceAllocator.cpp

@@ -143,14 +143,12 @@ void ResourceAllocator::terminate() noexcept {
     }
 }
 
-RenderTargetHandle ResourceAllocator::createRenderTarget(const char* name,
+RenderTargetHandle ResourceAllocator::createRenderTarget(const char*,
         TargetBufferFlags targetBufferFlags, uint32_t width, uint32_t height,
         uint8_t samples, uint8_t layerCount, MRT color, TargetBufferInfo depth,
         TargetBufferInfo stencil) noexcept {
-    auto handle = mBackend.createRenderTarget(targetBufferFlags,
+    return mBackend.createRenderTarget(targetBufferFlags,
             width, height, samples ? samples : 1u, layerCount, color, depth, stencil);
-    mBackend.setDebugTag(handle.getId(), CString{ name });
-    return handle;
 }
 
 void ResourceAllocator::destroyRenderTarget(RenderTargetHandle h) noexcept {
@@ -172,9 +170,9 @@ backend::TextureHandle ResourceAllocator::createTexture(const char* name,
 
     // do we have a suitable texture in the cache?
     TextureHandle handle;
-    TextureKey const key{ name, target, levels, format, samples, width, height, depth, usage, swizzle };
     if constexpr (mEnabled) {
         auto& textureCache = mTextureCache;
+        const TextureKey key{ name, target, levels, format, samples, width, height, depth, usage, swizzle };
         auto it = textureCache.find(key);
         if (UTILS_LIKELY(it != textureCache.end())) {
             // we do, move the entry to the in-use list, and remove from the cache
@@ -192,6 +190,7 @@ backend::TextureHandle ResourceAllocator::createTexture(const char* name,
                         swizzle[0], swizzle[1], swizzle[2], swizzle[3]);
             }
         }
+        mDisposer->checkout(handle, key);
     } else {
         if (swizzle == defaultSwizzle) {
             handle = mBackend.createTexture(
@@ -202,14 +201,12 @@ backend::TextureHandle ResourceAllocator::createTexture(const char* name,
                     swizzle[0], swizzle[1], swizzle[2], swizzle[3]);
         }
     }
-    mDisposer->checkout(handle, key);
-    mBackend.setDebugTag(handle.getId(), CString{ name });
     return handle;
 }
 
 void ResourceAllocator::destroyTexture(TextureHandle h) noexcept {
-    auto const key = mDisposer->checkin(h);
     if constexpr (mEnabled) {
+        auto const key = mDisposer->checkin(h);
         if (UTILS_LIKELY(key.has_value())) {
             uint32_t const size = key.value().getSize();
             mTextureCache.emplace(key.value(), TextureCachePayload{ h, mAge, size });

filament/src/ShadowMapManager.cpp

@@ -368,9 +368,11 @@ FrameGraphId<FrameGraphTexture> ShadowMapManager::render(FEngine& engine, FrameG
                     // generate and sort the commands for rendering the shadow map
 
                     RenderPass::RenderFlags renderPassFlags{};
+                    if (view.isFrontFaceWindingInverted()) {
+                        renderPassFlags |= RenderPass::HAS_INVERSE_FRONT_FACES;
+                    }
 
                     bool const canUseDepthClamp =
-                            shadowMap.getShadowType() == ShadowType::DIRECTIONAL &&
                             !view.hasVSM() &&
                             mIsDepthClampSupported &&
                             engine.debug.shadowmap.depth_clamp;
@@ -380,7 +382,7 @@ FrameGraphId<FrameGraphTexture> ShadowMapManager::render(FEngine& engine, FrameG
                     }
 
                     RenderPass const pass = passBuilder
-                            .renderFlags(RenderPass::HAS_DEPTH_CLAMP, renderPassFlags)
+                            .renderFlags(renderPassFlags)
                             .camera(cameraInfo)
                             .visibilityMask(entry.visibilityMask)
                             .geometry(scene->getRenderableData(),

filament/src/View.cpp

@@ -193,10 +193,6 @@ void View::setShadowType(View::ShadowType shadow) noexcept {
     downcast(this)->setShadowType(shadow);
 }
 
-View::ShadowType View::getShadowType() const noexcept {
-    return downcast(this)->getShadowType();
-}
-
 void View::setVsmShadowOptions(VsmShadowOptions const& options) noexcept {
     downcast(this)->setVsmShadowOptions(options);
 }

filament/src/components/RenderableManager.cpp

@@ -588,9 +588,6 @@ void FRenderableManager::create(
             // full size of the UBO.
             instances.handle = driver.createBufferObject(sizeof(PerRenderableUib),
                     BufferObjectBinding::UNIFORM, backend::BufferUsage::DYNAMIC);
-            if (auto name = instances.buffer->getName(); !name.empty()) {
-                driver.setDebugTag(instances.handle.getId(), std::move(name));
-            }
         }
 
         const uint32_t boneCount = builder->mSkinningBoneCount;

filament/src/details/BufferObject.cpp

@@ -20,8 +20,6 @@
 
 #include "FilamentAPI-impl.h"
 
-#include <utils/CString.h>
-
 namespace filament {
 
 struct BufferObject::BuilderDetails {
@@ -58,9 +56,6 @@ FBufferObject::FBufferObject(FEngine& engine, const BufferObject::Builder& build
     FEngine::DriverApi& driver = engine.getDriverApi();
     mHandle = driver.createBufferObject(builder->mByteCount, builder->mBindingType,
             backend::BufferUsage::STATIC);
-    if (auto name = builder.getName(); !name.empty()) {
-        driver.setDebugTag(mHandle.getId(), std::move(name));
-    }
 }
 
 void FBufferObject::terminate(FEngine& engine) {

filament/src/details/IndexBuffer.cpp

@@ -20,8 +20,6 @@
 
 #include "FilamentAPI-impl.h"
 
-#include <utils/CString.h>
-
 namespace filament {
 
 struct IndexBuffer::BuilderDetails {
@@ -60,9 +58,6 @@ FIndexBuffer::FIndexBuffer(FEngine& engine, const IndexBuffer::Builder& builder)
             (backend::ElementType)builder->mIndexType,
             uint32_t(builder->mIndexCount),
             backend::BufferUsage::STATIC);
-    if (auto name = builder.getName(); !name.empty()) {
-        driver.setDebugTag(mHandle.getId(), std::move(name));
-    }
 }
 
 void FIndexBuffer::terminate(FEngine& engine) {

filament/src/details/InstanceBuffer.cpp

@@ -61,8 +61,7 @@ InstanceBuffer* InstanceBuffer::Builder::build(Engine& engine) {
 
 // ------------------------------------------------------------------------------------------------
 
-FInstanceBuffer::FInstanceBuffer(FEngine& engine, const Builder& builder)
-    : mName(builder.getName()) {
+FInstanceBuffer::FInstanceBuffer(FEngine& engine, const Builder& builder) {
     mInstanceCount = builder->mInstanceCount;
 
     mLocalTransforms.reserve(mInstanceCount);

filament/src/details/InstanceBuffer.h

@@ -25,7 +25,6 @@
 
 #include <math/mat4.h>
 
-#include <utils/CString.h>
 #include <utils/FixedCapacityVector.h>
 
 namespace filament {
@@ -47,13 +46,10 @@ public:
     void prepare(FEngine& engine, math::mat4f rootTransform, const PerRenderableData& ubo,
             backend::Handle<backend::HwBufferObject> handle);
 
-    utils::CString const& getName() const noexcept { return mName; }
-
 private:
     friend class RenderableManager;
 
     utils::FixedCapacityVector<math::mat4f> mLocalTransforms;
-    utils::CString mName;
     size_t mInstanceCount;
 };
 

filament/src/details/Material.cpp

@@ -192,27 +192,19 @@ Material* Material::Builder::build(Engine& engine) {
         return nullptr;
     }
 
-    // Print a warning if the material's stereo type doesn't align with the engine's setting.
     MaterialDomain materialDomain;
-    UserVariantFilterMask variantFilterMask;
     materialParser->getMaterialDomain(&materialDomain);
-    materialParser->getMaterialVariantFilterMask(&variantFilterMask);
-    bool const hasStereoVariants = !(variantFilterMask & UserVariantFilterMask(UserVariantFilterBit::STE));
-    if (materialDomain == MaterialDomain::SURFACE && hasStereoVariants) {
+    if (materialDomain == MaterialDomain::SURFACE) {
         StereoscopicType const engineStereoscopicType = engine.getConfig().stereoscopicType;
-        // Default materials are always compiled with either 'instanced' or 'multiview'.
-        // So, we only verify compatibility if the engine is set up for stereo.
-        if (engineStereoscopicType != StereoscopicType::NONE) {
-            StereoscopicType materialStereoscopicType = StereoscopicType::NONE;
-            materialParser->getStereoscopicType(&materialStereoscopicType);
-            if (materialStereoscopicType != engineStereoscopicType) {
-                CString name;
-                materialParser->getName(&name);
-                slog.w << "The stereoscopic type in the compiled material '" << name.c_str_safe()
-                        << "' is " << (int)materialStereoscopicType
-                        << ", which is not compatiable with the engine's setting "
-                        << (int)engineStereoscopicType << "." << io::endl;
-            }
+        StereoscopicType materialStereoscopicType = StereoscopicType::NONE;
+        materialParser->getStereoscopicType(&materialStereoscopicType);
+        if (materialStereoscopicType != engineStereoscopicType) {
+            CString name;
+            materialParser->getName(&name);
+            slog.w << "The stereoscopic type in the compiled material '" << name.c_str_safe()
+                    << "' is " << (int)materialStereoscopicType
+                    << ", which is not compatiable with the engine's setting "
+                    << (int)engineStereoscopicType << "." << io::endl;
         }
     }
 
@@ -618,7 +610,6 @@ Program FMaterial::getProgramWithVariants(
 
 void FMaterial::createAndCacheProgram(Program&& p, Variant variant) const noexcept {
     auto program = mEngine.getDriverApi().createProgram(std::move(p));
-    mEngine.getDriverApi().setDebugTag(program.getId(), mName);
     assert_invariant(program);
     mCachedPrograms[variant.key] = program;
 }

filament/src/details/MaterialInstance.cpp

@@ -51,7 +51,6 @@ FMaterialInstance::FMaterialInstance(FEngine& engine, FMaterial const* material)
         mUniforms = UniformBuffer(material->getUniformInterfaceBlock().getSize());
         mUbHandle = driver.createBufferObject(mUniforms.getSize(),
                 BufferObjectBinding::UNIFORM, backend::BufferUsage::STATIC);
-        driver.setDebugTag(mUbHandle.getId(), material->getName());
     }
 
     if (!material->getSamplerInterfaceBlock().isEmpty()) {
@@ -117,7 +116,6 @@ FMaterialInstance::FMaterialInstance(FEngine& engine,
         mUniforms.setUniforms(other->getUniformBuffer());
         mUbHandle = driver.createBufferObject(mUniforms.getSize(),
                 BufferObjectBinding::UNIFORM, backend::BufferUsage::DYNAMIC);
-        driver.setDebugTag(mUbHandle.getId(), material->getName());
     }
 
     if (!material->getSamplerInterfaceBlock().isEmpty()) {

filament/src/details/MorphTargetBuffer.cpp

@@ -25,8 +25,6 @@
 #include <math/mat4.h>
 #include <math/norm.h>
 
-#include <utils/CString.h>
-
 namespace filament {
 
 using namespace backend;
@@ -126,11 +124,6 @@ FMorphTargetBuffer::FMorphTargetBuffer(FEngine& engine, const Builder& builder)
             mCount,
             TextureUsage::DEFAULT);
 
-    if (auto name = builder.getName(); !name.empty()) {
-        driver.setDebugTag(mPbHandle.getId(), name);
-        driver.setDebugTag(mTbHandle.getId(), std::move(name));
-    }
-
     // create and update sampler group
     mSbHandle = driver.createSamplerGroup(PerRenderPrimitiveMorphingSib::SAMPLER_COUNT,
             utils::FixedSizeString<32>("Morph target samplers"));

filament/src/details/RenderTarget.cpp

@@ -34,7 +34,7 @@ struct RenderTarget::BuilderDetails {
     uint32_t mWidth{};
     uint32_t mHeight{};
     uint8_t mSamples = 1;   // currently not settable in the public facing API
-    uint8_t mLayerCount = 1;
+    uint8_t mLayerCount = 0;// currently not settable in the public facing API
 };
 
 using BuilderType = RenderTarget;
@@ -91,28 +91,22 @@ RenderTarget* RenderTarget::Builder::build(Engine& engine) {
     uint32_t maxWidth = 0;
     uint32_t minHeight = std::numeric_limits<uint32_t>::max();
     uint32_t maxHeight = 0;
-    uint32_t minDepth = std::numeric_limits<uint32_t>::max();
-    uint32_t maxDepth = 0;
     for (auto const& attachment : mImpl->mAttachments) {
         if (attachment.texture) {
             const uint32_t w = attachment.texture->getWidth(attachment.mipLevel);
             const uint32_t h = attachment.texture->getHeight(attachment.mipLevel);
-            const uint32_t d = attachment.texture->getDepth(attachment.mipLevel);
             minWidth  = std::min(minWidth, w);
             minHeight = std::min(minHeight, h);
-            minDepth = std::min(minDepth, d);
             maxWidth  = std::max(maxWidth, w);
             maxHeight = std::max(maxHeight, h);
-            maxDepth = std::max(maxDepth, d);
         }
     }
 
-    FILAMENT_CHECK_PRECONDITION(minWidth == maxWidth && minHeight == maxHeight
-            && minDepth == maxDepth) << "All attachments dimensions must match";
+    FILAMENT_CHECK_PRECONDITION(minWidth == maxWidth && minHeight == maxHeight)
+            << "All attachments dimensions must match";
 
     mImpl->mWidth  = minWidth;
     mImpl->mHeight = minHeight;
-    mImpl->mLayerCount = minDepth;
     return downcast(engine).createRenderTarget(*this);
 }
 

filament/src/details/Renderer.cpp

@@ -651,25 +651,20 @@ void FRenderer::renderJob(RootArenaScope& rootArenaScope, FView& view) {
 
     const bool isProtectedContent =  mSwapChain && mSwapChain->isProtected();
 
-    // Conditions to meet to be able to use the sub-pass rendering path. This is regardless of
-    // whether the backend supports subpasses (or if they are disabled in the debugRegistry).
-    const bool isSubpassPossible =
-             msaaSampleCount <= 1 &&
-             hasColorGrading &&
-             !bloomOptions.enabled && !dofOptions.enabled && !taaOptions.enabled;
-
     // asSubpass is disabled with TAA (although it's supported) because performance was degraded
     // on qualcomm hardware -- we might need a backend dependent toggle at some point
     const PostProcessManager::ColorGradingConfig colorGradingConfig{
             .asSubpass =
-                    isSubpassPossible &&
+                    hasColorGrading &&
+                    msaaSampleCount <= 1 &&
+                    !bloomOptions.enabled && !dofOptions.enabled && !taaOptions.enabled &&
                     driver.isFrameBufferFetchSupported() &&
                     !engine.debug.renderer.disable_subpasses,
             .customResolve =
-                    msaaSampleCount > 1 &&
-                    driver.isFrameBufferFetchMultiSampleSupported() &&
                     msaaOptions.customResolve &&
+                    msaaSampleCount > 1 &&
                     hasColorGrading &&
+                    driver.isFrameBufferFetchMultiSampleSupported() &&
                     !engine.debug.renderer.disable_subpasses,
             .translucent = needsAlphaChannel,
             .fxaa = hasFXAA,
@@ -678,9 +673,6 @@ void FRenderer::renderJob(RootArenaScope& rootArenaScope, FView& view) {
                     TextureFormat::RGBA8 : getLdrFormat(needsAlphaChannel)
     };
 
-    // by construction (msaaSampleCount) both asSubpass and customResolve can't be true
-    assert_invariant(colorGradingConfig.asSubpass + colorGradingConfig.customResolve < 2);
-
     // whether we're scaled at all
      bool scaled = any(notEqual(scale, float2(1.0f)));
 
@@ -703,12 +695,13 @@ void FRenderer::renderJob(RootArenaScope& rootArenaScope, FView& view) {
 
     CameraInfo cameraInfo = view.computeCameraInfo(engine);
 
-    // If fxaa and scaling are not enabled, we're essentially in a very fast rendering path -- in
-    // this case, we would need an extra blit to "resolve" the buffer padding (because there are no
-    // other pass that can do it as a side effect). In this case, it is better to skip the padding,
-    // which won't be helping much.
-    const bool noBufferPadding = (isSubpassPossible &&
-            !hasFXAA && !scaled) || engine.debug.renderer.disable_buffer_padding;
+    // when colorgrading-as-subpass is active, we know that many other effects are disabled
+    // such as dof, bloom. Moreover, if fxaa and scaling are not enabled, we're essentially in
+    // a very fast rendering path -- in this case, we would need an extra blit to "resolve" the
+    // buffer padding (because there are no other pass that can do it as a side effect).
+    // In this case, it is better to skip the padding, which won't be helping much.
+    const bool noBufferPadding = (colorGradingConfig.asSubpass && !hasFXAA && !scaled)
+            || engine.debug.renderer.disable_buffer_padding;
 
     // guardBand must be a multiple of 16 to guarantee the same exact rendering up to 4 mip levels.
     float const guardBand = guardBandOptions.enabled ? 16.0f : 0.0f;
@@ -823,14 +816,14 @@ void FRenderer::renderJob(RootArenaScope& rootArenaScope, FView& view) {
         blackboard["shadows"] = shadows;
     }
 
-    // When we don't have a custom RenderTarget, customRenderTarget below is nullptr and is
+    // When we don't have a custom RenderTarget, currentRenderTarget below is nullptr and is
     // recorded in the list of targets already rendered into -- this ensures that
     // initializeClearFlags() is called only once for the default RenderTarget.
     auto& previousRenderTargets = mPreviousRenderTargets;
-    FRenderTarget* const customRenderTarget = downcast(view.getRenderTarget());
+    FRenderTarget* const currentRenderTarget = downcast(view.getRenderTarget());
     if (UTILS_LIKELY(
-            previousRenderTargets.find(customRenderTarget) == previousRenderTargets.end())) {
-        previousRenderTargets.insert(customRenderTarget);
+            previousRenderTargets.find(currentRenderTarget) == previousRenderTargets.end())) {
+        previousRenderTargets.insert(currentRenderTarget);
         initializeClearFlags();
     }
 
@@ -847,10 +840,10 @@ void FRenderer::renderJob(RootArenaScope& rootArenaScope, FView& view) {
     const TargetBufferFlags keepOverrideStartFlags = TargetBufferFlags::ALL & ~discardStartFlags;
     TargetBufferFlags keepOverrideEndFlags = TargetBufferFlags::NONE;
 
-    if (customRenderTarget) {
+    if (currentRenderTarget) {
         // For custom RenderTarget, we look at each attachment flag and if they have their
         // SAMPLEABLE usage bit set, we assume they must not be discarded after the render pass.
-        keepOverrideEndFlags |= customRenderTarget->getSampleableAttachmentsMask();
+        keepOverrideEndFlags |= currentRenderTarget->getSampleableAttachmentsMask();
     }
 
     // Renderer's ClearOptions apply once at the beginning of the frame (not for each View),
@@ -959,6 +952,7 @@ void FRenderer::renderJob(RootArenaScope& rootArenaScope, FView& view) {
             .scale = aoOptions.resolution,
             .picking = view.hasPicking()
     });
+    blackboard["structure"] = structure;
     const auto picking = picking_;
 
 
@@ -1006,6 +1000,7 @@ void FRenderer::renderJob(RootArenaScope& rootArenaScope, FView& view) {
             ssReflectionsOptions.enabled ? TextureFormat::RGBA16F : TextureFormat::R11F_G11F_B10F,
             view.getCameraUser().getFieldOfView(Camera::Fov::VERTICAL), config.scale);
     config.ssrLodOffset = ssrConfig.lodOffset;
+    blackboard["ssr"] = ssrConfig.ssr;
 
     // --------------------------------------------------------------------------------------------
     // screen-space reflections pass
@@ -1019,10 +1014,6 @@ void FRenderer::renderJob(RootArenaScope& rootArenaScope, FView& view) {
                 { .width = svp.width, .height = svp.height });
 
         if (UTILS_LIKELY(reflections)) {
-            fg.addTrivialSideEffectPass("SSR Cleanup", [&view](DriverApi& driver) {
-                view.getPerViewUniforms().prepareStructure({});
-                view.commitUniforms(driver);
-            });
             // generate the mipchain
             PostProcessManager::generateMipmapSSR(ppm, fg,
                     reflections, ssrConfig.reflection, false, ssrConfig);
@@ -1113,45 +1104,24 @@ void FRenderer::renderJob(RootArenaScope& rootArenaScope, FView& view) {
     );
 
     // the color pass itself + color-grading as subpass if needed
-    auto colorPassOutput = RendererUtils::colorPass(fg, "Color Pass", mEngine, view, {
-                .shadows = blackboard.get<FrameGraphTexture>("shadows"),
-                .ssao = blackboard.get<FrameGraphTexture>("ssao"),
-                .ssr = ssrConfig.ssr,
-                .structure = structure
-            },
+    auto colorPassOutput = RendererUtils::colorPass(fg, "Color Pass", mEngine, view,
             colorBufferDesc, config, colorGradingConfigForColor, pass.getExecutor());
 
     if (view.isScreenSpaceRefractionEnabled() && !pass.empty()) {
-        // This cancels the colorPass() call above if refraction is active.
-        // The color pass + refraction + color-grading as subpass if needed
-        auto const output = RendererUtils::refractionPass(fg, mEngine, view, {
-                        .shadows = blackboard.get<FrameGraphTexture>("shadows"),
-                        .ssao = blackboard.get<FrameGraphTexture>("ssao"),
-                        .ssr = ssrConfig.ssr,
-                        .structure = structure
-                },
+        // this cancels the colorPass() call above if refraction is active.
+        // the color pass + refraction + color-grading as subpass if needed
+        const auto [output, enabled] = RendererUtils::refractionPass(fg, mEngine, view,
                 config, ssrConfig, colorGradingConfigForColor, pass);
-
-        hasScreenSpaceRefraction = output.has_value();
-        if (hasScreenSpaceRefraction) {
-            colorPassOutput = output.value();
-        }
+        colorPassOutput = output;
+        hasScreenSpaceRefraction = enabled;
     }
 
-    fg.addTrivialSideEffectPass("Finish Color Passes", [&view](DriverApi& driver) {
-        // Unbind SSAO sampler, b/c the FrameGraph will delete the texture at the end of the pass.
-        view.cleanupRenderPasses();
-        view.commitUniforms(driver);
-    });
-
     if (colorGradingConfig.customResolve) {
-        assert_invariant(fg.getDescriptor(colorPassOutput.linearColor).samples <= 1);
         // TODO: we have to "uncompress" (i.e. detonemap) the color buffer here because it's used
         //       by many other passes (Bloom, TAA, DoF, etc...). We could make this more
         //       efficient by using ARM_shader_framebuffer_fetch. We use a load/store (i.e.
         //       subpass) here because it's more convenient.
-        colorPassOutput.linearColor =
-                ppm.customResolveUncompressPass(fg, colorPassOutput.linearColor);
+        colorPassOutput = ppm.customResolveUncompressPass(fg, colorPassOutput);
     }
 
     // export the color buffer if screen-space reflections are enabled
@@ -1167,9 +1137,7 @@ void FRenderer::renderJob(RootArenaScope& rootArenaScope, FView& view) {
                     // The "output" of this pass is going to be used during the next frame as
                     // an "import".
                     builder.sideEffect();
-
-                    // we can't use colorPassOutput here because it could be tonemapped
-                    data.history = builder.sample(colorPassOutput.linearColor); // FIXME: an access must be declared for detach(), why?
+                    data.history = builder.sample(colorPassOutput); // FIXME: an access must be declared for detach(), why?
                 }, [&view, projection](FrameGraphResources const& resources, auto const& data,
                         backend::DriverApi&) {
                     auto& history = view.getFrameHistory();
@@ -1179,20 +1147,19 @@ void FRenderer::renderJob(RootArenaScope& rootArenaScope, FView& view) {
                 });
     }
 
-    // this is the output of the color pass / input to post processing,
-    // this is only used later for comparing it with the output after post-processing
-    FrameGraphId<FrameGraphTexture> const postProcessInput = colorGradingConfig.asSubpass ?
-                                                             colorPassOutput.tonemappedColor :
-                                                             colorPassOutput.linearColor;
-
-    // input can change below
-    FrameGraphId<FrameGraphTexture> input = postProcessInput;
+    FrameGraphId<FrameGraphTexture> input = colorPassOutput;
+    fg.addTrivialSideEffectPass("Finish Color Passes", [&view](DriverApi& driver) {
+        // Unbind SSAO sampler, b/c the FrameGraph will delete the texture at the end of the pass.
+        view.cleanupRenderPasses();
+        view.commitUniforms(driver);
+    });
 
     // Resolve depth -- which might be needed because of TAA or DoF. This pass will be culled
     // if the depth is not used below or if the depth is not MS (e.g. it could have been
     // auto-resolved).
     // In practice, this is used on Vulkan and older Metal devices.
-    auto depth = ppm.resolve(fg, "Resolved Depth Buffer", colorPassOutput.depth, { .levels = 1 });
+    auto depth = blackboard.get<FrameGraphTexture>("depth");
+    depth = ppm.resolve(fg, "Resolved Depth Buffer", depth, { .levels = 1 });
 
     // Debug: CSM visualisation
     if (UTILS_UNLIKELY(engine.debug.shadowmap.visualize_cascades &&
@@ -1308,7 +1275,7 @@ void FRenderer::renderJob(RootArenaScope& rootArenaScope, FView& view) {
     // The intermediate buffer is accomplished with a "fake" opaqueBlit (i.e. blit) operation.
 
     const bool outputIsSwapChain =
-            (input == postProcessInput) && (viewRenderTarget == mRenderTargetHandle);
+            (input == colorPassOutput) && (viewRenderTarget == mRenderTargetHandle);
     if (mightNeedFinalBlit) {
         if (blendModeTranslucent ||
             xvp != svp ||

filament/src/details/SkinningBuffer.cpp

@@ -27,8 +27,6 @@
 #include <math/half.h>
 #include <math/mat4.h>
 
-#include <utils/CString.h>
-
 #include <cstring>
 
 namespace filament {
@@ -82,11 +80,6 @@ FSkinningBuffer::FSkinningBuffer(FEngine& engine, const Builder& builder)
             BufferObjectBinding::UNIFORM,
             BufferUsage::DYNAMIC);
 
-    if (auto name = builder.getName(); !name.empty()) {
-        // TODO: We should also tag the texture created inside createIndicesAndWeightsHandle.
-        driver.setDebugTag(mHandle.getId(), std::move(name));
-    }
-
     if (builder->mInitialize) {
         // initialize the bones to identity (before rounding up)
         auto* out = driver.allocatePod<PerRenderableBoneUib::BoneData>(mBoneCount);

filament/src/details/Stream.cpp

@@ -23,10 +23,10 @@
 
 #include <backend/PixelBufferDescriptor.h>
 
-#include <utils/CString.h>
 #include <utils/Panic.h>
 #include <filament/Stream.h>
 
+
 namespace filament {
 
 using namespace backend;
@@ -80,10 +80,6 @@ FStream::FStream(FEngine& engine, const Builder& builder) noexcept
     } else {
         mStreamHandle = engine.getDriverApi().createStreamAcquired();
     }
-
-    if (auto name = builder.getName(); !name.empty()) {
-        engine.getDriverApi().setDebugTag(mStreamHandle.getId(), std::move(name));
-    }
 }
 
 void FStream::terminate(FEngine& engine) noexcept {

filament/src/details/Texture.cpp

@@ -243,11 +243,6 @@ FTexture::FTexture(FEngine& engine, const Builder& builder) {
         mHandle = driver.importTexture(builder->mImportedId,
                 mTarget, mLevelCount, mFormat, mSampleCount, mWidth, mHeight, mDepth, mUsage);
     }
-    if (auto name = builder.getName(); !name.empty()) {
-        driver.setDebugTag(mHandle.getId(), std::move(name));
-    } else {
-        driver.setDebugTag(mHandle.getId(), CString{"FTexture"});
-    }
 }
 
 // frees driver resources, object becomes invalid

filament/src/details/VertexBuffer.cpp

@@ -29,7 +29,6 @@
 
 #include <utils/bitset.h>
 #include <utils/compiler.h>
-#include <utils/CString.h>
 #include <utils/debug.h>
 #include <utils/Log.h>
 #include <utils/ostream.h>
@@ -260,9 +259,7 @@ FVertexBuffer::FVertexBuffer(FEngine& engine, const VertexBuffer::Builder& build
             mBufferCount, mDeclaredAttributes.count(), mAttributes);
 
     mHandle = driver.createVertexBuffer(mVertexCount, mVertexBufferInfoHandle);
-    if (auto name = builder.getName(); !name.empty()) {
-        driver.setDebugTag(mHandle.getId(), name);
-    }
+
 
     // calculate buffer sizes
     size_t bufferSizes[MAX_VERTEX_BUFFER_COUNT] = {};
@@ -290,9 +287,6 @@ FVertexBuffer::FVertexBuffer(FEngine& engine, const VertexBuffer::Builder& build
                 if (!mBufferObjects[i]) {
                     BufferObjectHandle bo = driver.createBufferObject(bufferSizes[i],
                             backend::BufferObjectBinding::VERTEX, backend::BufferUsage::STATIC);
-                    if (auto name = builder.getName(); !name.empty()) {
-                        driver.setDebugTag(bo.getId(), name);
-                    }
                     driver.setVertexBufferObject(mHandle, i, bo);
                     mBufferObjects[i] = bo;
                 }
@@ -309,9 +303,6 @@ FVertexBuffer::FVertexBuffer(FEngine& engine, const VertexBuffer::Builder& build
                 if (!mBufferObjects[i]) {
                     BufferObjectHandle const bo = driver.createBufferObject(bufferSizes[i],
                             backend::BufferObjectBinding::VERTEX, backend::BufferUsage::STATIC);
-                    if (auto name = builder.getName(); !name.empty()) {
-                        driver.setDebugTag(bo.getId(), name);
-                    }
                     driver.setVertexBufferObject(mHandle, i, bo);
                     mBufferObjects[i] = bo;
                 }

filament/src/details/View.cpp

@@ -1040,8 +1040,10 @@ void FView::commitFrameHistory(FEngine& engine) noexcept {
     auto& frameHistory = mFrameHistory;
 
     FrameHistoryEntry& last = frameHistory.back();
-    disposer.destroy(std::move(last.taa.color.handle));
-    disposer.destroy(std::move(last.ssr.color.handle));
+    disposer.destroy(last.taa.color.handle);
+    disposer.destroy(last.ssr.color.handle);
+    last.taa.color.handle.clear();
+    last.ssr.color.handle.clear();
 
     // and then push the new history entry to the history stack
     frameHistory.commit();
@@ -1053,8 +1055,10 @@ void FView::clearFrameHistory(FEngine& engine) noexcept {
     auto& frameHistory = mFrameHistory;
     for (size_t i = 0; i < frameHistory.size(); ++i) {
         FrameHistoryEntry& last = frameHistory[i];
-        disposer.destroy(std::move(last.taa.color.handle));
-        disposer.destroy(std::move(last.ssr.color.handle));
+        disposer.destroy(last.taa.color.handle);
+        disposer.destroy(last.ssr.color.handle);
+        last.taa.color.handle.clear();
+        last.ssr.color.handle.clear();
     }
 }
 

filament/src/fg/FrameGraph.cpp

@@ -195,11 +195,12 @@ FrameGraph& FrameGraph::compile() noexcept {
 
 void FrameGraph::execute(backend::DriverApi& driver) noexcept {
 
+    SYSTRACE_CALL();
+
     bool const useProtectedMemory = mMode == Mode::PROTECTED;
     auto const& passNodes = mPassNodes;
     auto& resourceAllocator = mResourceAllocator;
 
-    SYSTRACE_NAME("FrameGraph");
     driver.pushGroupMarker("FrameGraph");
 
     auto first = passNodes.begin();
@@ -210,6 +211,7 @@ void FrameGraph::execute(backend::DriverApi& driver) noexcept {
         assert_invariant(!node->isCulled());
 
         SYSTRACE_NAME(node->getName());
+
         driver.pushGroupMarker(node->getName());
 
         // devirtualize resourcesList
@@ -227,6 +229,7 @@ void FrameGraph::execute(backend::DriverApi& driver) noexcept {
             assert_invariant(resource->last == node);
             resource->destroy(resourceAllocator);
         }
+
         driver.popGroupMarker();
     }
     driver.popGroupMarker();

filament/src/materials/blitArray.mat

@@ -10,10 +10,6 @@ material {
             type : int,
             name : layerIndex
         },
-        {
-            type : float,
-            name : levelOfDetail,
-        },
         {
             type : float4,
             name : viewport,
@@ -37,6 +33,6 @@ vertex {
 
 fragment {
     void postProcess(inout PostProcessInputs postProcess) {
-        postProcess.color = textureLod(materialParams_color, vec3(variable_vertex.xy, materialParams.layerIndex), materialParams.levelOfDetail);
+        postProcess.color = textureLod(materialParams_color, vec3(variable_vertex.xy, materialParams.layerIndex), 0.0);
     }
 }

filament/src/materials/blitLow.mat

@@ -10,10 +10,6 @@ material {
             type : float4,
             name : viewport,
             precision: high
-        },
-        {
-            type : float,
-            name : levelOfDetail,
         }
     ],
     variables : [
@@ -37,7 +33,7 @@ fragment {
 #if FILAMENT_EFFECTIVE_VERSION == 100
         postProcess.color = texture2D(materialParams_color, variable_vertex.xy);
 #else
-        postProcess.color = textureLod(materialParams_color, variable_vertex.xy, materialParams.levelOfDetail);
+        postProcess.color = textureLod(materialParams_color, variable_vertex.xy, 0.0);
 #endif
     }
 }

ios/CocoaPods/Filament.podspec

@@ -1,12 +1,12 @@
 Pod::Spec.new do |spec|
   spec.name = "Filament"
-  spec.version = "1.54.4"
+  spec.version = "1.54.0"
   spec.license = { :type => "Apache 2.0", :file => "LICENSE" }
   spec.homepage = "https://google.github.io/filament"
   spec.authors = "Google LLC."
   spec.summary = "Filament is a real-time physically based rendering engine for Android, iOS, Windows, Linux, macOS, and WASM/WebGL."
   spec.platform = :ios, "11.0"
-  spec.source = { :http => "https://github.com/google/filament/releases/download/v1.54.4/filament-v1.54.4-ios.tgz" }
+  spec.source = { :http => "https://github.com/google/filament/releases/download/v1.54.0/filament-v1.54.0-ios.tgz" }
 
   # Fix linking error with Xcode 12; we do not yet support the simulator on Apple silicon.
   spec.pod_target_xcconfig = {

libs/filamat/src/GLSLPostProcessor.cpp

@@ -671,13 +671,15 @@ void GLSLPostProcessor::fixupClipDistance(
 // - triggers a crash on some Adreno drivers (b/291140208, b/289401984, b/289393290)
 // However Metal requires this pass in order to correctly generate half-precision MSL
 //
-// CreateSimplificationPass() creates a lot of problems:
+// Note: CreateSimplificationPass() used to creates a lot of problems:
 // - Adreno GPU show artifacts after running simplification passes (Vulkan)
 // - spirv-cross fails generating working glsl
 //      (https://github.com/KhronosGroup/SPIRV-Cross/issues/2162)
-// - generally it makes the code more complicated, e.g.: replacing for loops with
-//   while-if-break, unclear if it helps for anything.
-// However, the simplification passes below are necessary when targeting Metal, otherwise the
+//
+// However this problem was addressed in spirv-cross here:
+//      https://github.com/KhronosGroup/SPIRV-Cross/pull/2163
+//
+// The simplification passes below are necessary when targeting Metal, otherwise the
 // result is mismatched half / float assignments in MSL.
 
 
@@ -710,11 +712,11 @@ void GLSLPostProcessor::registerPerformancePasses(Optimizer& optimizer, Config c
     RegisterPass(CreateAggressiveDCEPass());
     RegisterPass(CreateRedundancyEliminationPass());
     RegisterPass(CreateCombineAccessChainsPass());
-    RegisterPass(CreateSimplificationPass(), MaterialBuilder::TargetApi::METAL);
+    RegisterPass(CreateSimplificationPass());
     RegisterPass(CreateVectorDCEPass());
     RegisterPass(CreateDeadInsertElimPass());
     RegisterPass(CreateDeadBranchElimPass());
-    RegisterPass(CreateSimplificationPass(), MaterialBuilder::TargetApi::METAL);
+    RegisterPass(CreateSimplificationPass());
     RegisterPass(CreateIfConversionPass());
     RegisterPass(CreateCopyPropagateArraysPass());
     RegisterPass(CreateReduceLoadSizePass());
@@ -723,7 +725,7 @@ void GLSLPostProcessor::registerPerformancePasses(Optimizer& optimizer, Config c
     RegisterPass(CreateRedundancyEliminationPass());
     RegisterPass(CreateDeadBranchElimPass());
     RegisterPass(CreateBlockMergePass());
-    RegisterPass(CreateSimplificationPass(), MaterialBuilder::TargetApi::METAL);
+    RegisterPass(CreateSimplificationPass());
 }
 
 void GLSLPostProcessor::registerSizePasses(Optimizer& optimizer, Config const& config) {

libs/gltfio/src/MaterialProvider.cpp

@@ -56,13 +56,7 @@ bool operator==(const MaterialKey& k1, const MaterialKey& k2) {
         (k1.volumeThicknessUV == k2.volumeThicknessUV) &&
         (k1.hasSheen == k2.hasSheen) &&
         (k1.hasIOR == k2.hasIOR) &&
-        (k1.hasVolume == k2.hasVolume) &&
-        (k1.hasSpecular == k2.hasSpecular) &&
-        (k1.hasSpecularTexture == k2.hasSpecularTexture) &&
-        (k1.hasSpecularColorTexture == k2.hasSpecularColorTexture) &&
-        (k1.specularTextureUV == k2.specularTextureUV) &&
-        (k1.specularColorTextureUV == k2.specularColorTextureUV)
-        ;
+        (k1.hasVolume == k2.hasVolume);
 }
 
 // Filament supports up to 2 UV sets. glTF has arbitrary texcoord set indices, but it allows

libs/gltfio/src/UbershaderProvider.cpp

@@ -259,24 +259,6 @@ MaterialInstance* UbershaderProvider::createMaterialInstance(MaterialKey* config
     mi->setParameter("occlusionUvMatrix", identity);
     mi->setParameter("emissiveUvMatrix", identity);
 
-    // set to -1 all possibly optional parameters
-    for (auto const* param : {
-            "clearCoatIndex",
-            "clearCoatRoughnessIndex",
-            "clearCoatNormalIndex",
-            "sheenColorIndex",
-            "sheenRoughnessIndex",
-            "volumeThicknessUvMatrix",
-            "volumeThicknessIndex",
-            "transmissionIndex",
-            "specularIndex",
-            "specularColorIndex",
-    }) {
-        if (material->hasParameter(param)) {
-            mi->setParameter(param, -1);
-        }
-    }
-
     if (config->hasClearCoat) {
         mi->setParameter("clearCoatIndex",
                 getUvIndex(config->clearCoatUV, config->hasClearCoatTexture));
@@ -358,10 +340,10 @@ MaterialInstance* UbershaderProvider::createMaterialInstance(MaterialKey* config
         mi->setParameter("sheenRoughnessMap", mDummyTexture, sampler);
     }
 
-    if (material->hasParameter("ior")) {
+    if (mi->getMaterial()->hasParameter("ior")) {
         mi->setParameter("ior", 1.5f);
     }
-    if (material->hasParameter("reflectance")) {
+    if (mi->getMaterial()->hasParameter("reflectance")) {
         mi->setParameter("reflectance", 0.5f);
     }
 
@@ -373,14 +355,6 @@ MaterialInstance* UbershaderProvider::createMaterialInstance(MaterialKey* config
         mi->setParameter("specularColorMap", mDummyTexture, sampler);
     }
 
-    if (material->hasParameter("specularColorFactor")) {
-        mi->setParameter("specularColorFactor", float3(1.0f));
-    }
-
-    if (material->hasParameter("specularStrength")) {
-        mi->setParameter("specularStrength", 1.0f);
-    }
-
     return mi;
 }
 

libs/gltfio/src/extended/AssetLoaderExtended.cpp

@@ -527,13 +527,11 @@ bool AssetLoaderExtended::createPrimitive(Input* input, Output* out,
 
     if (!mCgltfBuffersLoaded) {
         mCgltfBuffersLoaded = utility::loadCgltfBuffers(gltf, mGltfPath.c_str(), mUriDataCache);
-        if (!mCgltfBuffersLoaded) {
-            return false;
-        }
-        utility::decodeMeshoptCompression(gltf);
+        if (!mCgltfBuffersLoaded) return false;
     }
 
     utility::decodeDracoMeshes(gltf, prim, input->dracoCache);
+    utility::decodeMeshoptCompression(gltf);
 
     auto slots = computeGeometries(prim, jobType, attributesMap, morphTargets, out->uvmap, mEngine);
 

libs/utils/include/utils/memalign.h

@@ -73,8 +73,8 @@ public:
     using const_pointer = const TYPE*;
     using reference = TYPE&;
     using const_reference = const TYPE&;
-    using size_type = ::size_t;
-    using difference_type = ::ptrdiff_t;
+    using size_type = std::size_t;
+    using difference_type = std::ptrdiff_t;
     using propagate_on_container_move_assignment = std::true_type;
     using is_always_equal = std::true_type;
 

samples/CMakeLists.txt

@@ -22,7 +22,6 @@ set(MATERIAL_SRCS
         materials/bakedTexture.mat
         materials/pointSprites.mat
         materials/aoPreview.mat
-        materials/arrayTexture.mat
         materials/groundShadow.mat
         materials/heightfield.mat
         materials/image.mat
@@ -253,7 +252,6 @@ if (NOT ANDROID)
     add_demo(helloskinning)
     add_demo(helloskinningbuffer)
     add_demo(helloskinningbuffer_morebones)
-    add_demo(hellostereo)
     add_demo(image_viewer)
     add_demo(lightbulb)
     add_demo(material_sandbox)
@@ -276,7 +274,6 @@ if (NOT ANDROID)
     target_link_libraries(gltf_viewer PRIVATE gltf-demo-resources uberarchive gltfio viewer)
     target_link_libraries(gltf_instances PRIVATE gltf-demo-resources uberarchive gltfio viewer)
     target_link_libraries(hellopbr PRIVATE filameshio suzanne-resources)
-    target_link_libraries(hellostereo PRIVATE filameshio suzanne-resources)
     target_link_libraries(image_viewer PRIVATE viewer imageio)
     target_link_libraries(multiple_windows PRIVATE filameshio suzanne-resources)
     target_link_libraries(rendertarget PRIVATE filameshio suzanne-resources)

samples/hellostereo.cpp

@@ -1,366 +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.
- */
-
-#include <filament/Camera.h>
-#include <filament/Engine.h>
-#include <filament/IndexBuffer.h>
-#include <filament/LightManager.h>
-#include <filament/Material.h>
-#include <filament/RenderableManager.h>
-#include <filament/Renderer.h>
-#include <filament/RenderTarget.h>
-#include <filament/Scene.h>
-#include <filament/TextureSampler.h>
-#include <filament/TransformManager.h>
-#include <filament/VertexBuffer.h>
-#include <filament/View.h>
-
-#include <private/filament/EngineEnums.h>
-
-#include <utils/EntityManager.h>
-
-#include <filameshio/MeshReader.h>
-
-#include <filamentapp/Config.h>
-#include <filamentapp/FilamentApp.h>
-
-#include <getopt/getopt.h>
-
-#include <iostream>
-#include <vector>
-
-#include "generated/resources/resources.h"
-#include "generated/resources/monkey.h"
-
-using namespace filament;
-using namespace filamesh;
-using namespace filament::math;
-
-struct Vertex {
-    float3 position;
-    float2 uv;
-};
-
-struct App {
-    Config config;
-
-    Material* monkeyMaterial;
-    MaterialInstance* monkeyMatInstance;
-    MeshReader::Mesh monkeyMesh;
-    mat4f monkeyTransform;
-    utils::Entity lightEntity;
-
-    View* stereoView = nullptr;
-    Scene* stereoScene = nullptr;
-    Camera* stereoCamera = nullptr;
-    Texture* stereoColorTexture = nullptr;
-    Texture* stereoDepthTexture = nullptr;
-    RenderTarget* stereoRenderTarget = nullptr;
-
-    VertexBuffer* quadVb = nullptr;
-    IndexBuffer* quadIb = nullptr;
-    Material* quadMaterial = nullptr;
-    std::vector<utils::Entity> quadEntities;
-    std::vector<MaterialInstance*> quadMatInstances;
-};
-
-static void printUsage(char* name) {
-    std::string exec_name(utils::Path(name).getName());
-    std::string usage(
-        "SHOWCASE renders multiple quads displaying the contents of stereoscopic rendering\n"
-        "Usage:\n"
-        "    SHOWCASE [options]\n"
-        "Options:\n"
-        "   --help, -h\n"
-        "       Prints this message\n\n"
-        "   --api, -a\n"
-        "       Specify the backend API: opengl (default), vulkan, or metal\n"
-        "   --eyes=<stereoscopic eyes>, -y <stereoscopic eyes>\n"
-        "       Sets the number of stereoscopic eyes (default: 2) when stereoscopic rendering is\n"
-        "       enabled.\n\n"
-    );
-    const std::string from("SHOWCASE");
-    for (size_t pos = usage.find(from); pos != std::string::npos; pos = usage.find(from, pos)) {
-        usage.replace(pos, from.length(), exec_name);
-    }
-    std::cout << usage;
-}
-
-static int handleCommandLineArguments(int argc, char* argv[], App* app) {
-    static constexpr const char* OPTSTR = "ha:y:";
-    static const struct option OPTIONS[] = {
-        { "help", no_argument,       nullptr, 'h' },
-        { "api",  required_argument, nullptr, 'a' },
-        { "eyes", required_argument, nullptr, 'y' },
-        { nullptr, 0, nullptr, 0 }
-    };
-    int opt;
-    int option_index = 0;
-    while ((opt = getopt_long(argc, argv, OPTSTR, OPTIONS, &option_index)) >= 0) {
-        std::string arg(optarg ? optarg : "");
-        switch (opt) {
-            default:
-            case 'h':
-                printUsage(argv[0]);
-                exit(0);
-            case 'a':
-                if (arg == "opengl") {
-                    app->config.backend = Engine::Backend::OPENGL;
-                } else if (arg == "vulkan") {
-                    app->config.backend = Engine::Backend::VULKAN;
-                } else if (arg == "metal") {
-                    app->config.backend = Engine::Backend::METAL;
-                } else {
-                    std::cerr << "Unrecognized backend. Must be 'opengl'|'vulkan'|'metal'.\n";
-                    exit(1);
-                }
-                break;
-            case 'y': {
-                int eyeCount = 0;
-                try {
-                    eyeCount = std::stoi(arg);
-                } catch (std::invalid_argument &e) { }
-                if (eyeCount >= 2 && eyeCount <= CONFIG_MAX_STEREOSCOPIC_EYES) {
-                    app->config.stereoscopicEyeCount = eyeCount;
-                } else {
-                    std::cerr << "Eye count must be between 2 and CONFIG_MAX_STEREOSCOPIC_EYES ("
-                              << (int)CONFIG_MAX_STEREOSCOPIC_EYES << ") (inclusive).\n";
-                    exit(1);
-                }
-                break;
-            }
-        }
-    }
-    return optind;
-}
-
-int main(int argc, char** argv) {
-
-#if !defined(FILAMENT_SAMPLES_STEREO_TYPE_MULTIVIEW)
-    std::cerr << "This sample only works with multiview enabled.\n";
-    exit(1);
-#endif
-
-    App app{};
-    app.config.title = "stereoscopic rendering";
-    handleCommandLineArguments(argc, argv, &app);
-
-    auto setup = [&app](Engine* engine, View* view, Scene* scene) {
-        auto& tcm = engine->getTransformManager();
-        auto& rcm = engine->getRenderableManager();
-        auto& em = utils::EntityManager::get();
-        auto vp = view->getViewport();
-
-        constexpr float3 monkeyPosition{ 0, 0, -4};
-        constexpr float3 upVector{ 0, 1, 0};
-        const int eyeCount = app.config.stereoscopicEyeCount;
-
-        // Create a mesh material and an instance.
-        app.monkeyMaterial = Material::Builder()
-              .package(RESOURCES_AIDEFAULTMAT_DATA, RESOURCES_AIDEFAULTMAT_SIZE)
-              .build(*engine);
-        auto mi = app.monkeyMatInstance = app.monkeyMaterial->createInstance();
-        mi->setParameter("baseColor", RgbType::LINEAR, {0.8, 1.0, 1.0});
-        mi->setParameter("metallic", 0.0f);
-        mi->setParameter("roughness", 0.4f);
-        mi->setParameter("reflectance", 0.5f);
-
-        // Add a monkey and a light source into the main scene.
-        app.monkeyMesh = MeshReader::loadMeshFromBuffer(
-                engine, MONKEY_SUZANNE_DATA, nullptr, nullptr, mi);
-        auto ti = tcm.getInstance(app.monkeyMesh.renderable);
-        app.monkeyTransform = mat4f{mat3f(1), monkeyPosition } * tcm.getWorldTransform(ti);
-        rcm.setCastShadows(rcm.getInstance(app.monkeyMesh.renderable), false);
-        scene->addEntity(app.monkeyMesh.renderable);
-
-        app.lightEntity = em.create();
-        LightManager::Builder(LightManager::Type::SUN)
-                .color(Color::toLinear<ACCURATE>(sRGBColor(0.98f, 0.92f, 0.89f)))
-                .intensity(110000)
-                .direction({ 0.7, -1, -0.8 })
-                .sunAngularRadius(1.9f)
-                .castShadows(false)
-                .build(*engine, app.lightEntity);
-        scene->addEntity(app.lightEntity);
-
-        // Create a stereo render target that will be rendered as an offscreen view.
-        app.stereoScene = engine->createScene();
-        app.stereoScene->addEntity(app.monkeyMesh.renderable);
-        app.stereoScene->addEntity(app.lightEntity);
-        app.stereoView = engine->createView();
-        app.stereoView->setScene(app.stereoScene);
-        app.stereoView->setPostProcessingEnabled(false);
-        app.stereoColorTexture = Texture::Builder()
-                .width(vp.width)
-                .height(vp.height)
-                .depth(eyeCount)
-                .levels(1)
-                .sampler(Texture::Sampler::SAMPLER_2D_ARRAY)
-                .format(Texture::InternalFormat::RGBA8)
-                .usage(Texture::Usage::COLOR_ATTACHMENT | Texture::Usage::SAMPLEABLE)
-                .build(*engine);
-        app.stereoDepthTexture = Texture::Builder()
-                .width(vp.width)
-                .height(vp.height)
-                .depth(eyeCount)
-                .levels(1)
-                .sampler(Texture::Sampler::SAMPLER_2D_ARRAY)
-                .format(Texture::InternalFormat::DEPTH24)
-                .usage(Texture::Usage::DEPTH_ATTACHMENT)
-                .build(*engine);
-        app.stereoRenderTarget = RenderTarget::Builder()
-                .texture(RenderTarget::AttachmentPoint::COLOR, app.stereoColorTexture)
-                .texture(RenderTarget::AttachmentPoint::DEPTH, app.stereoDepthTexture)
-                .build(*engine);
-        app.stereoView->setRenderTarget(app.stereoRenderTarget);
-        app.stereoView->setViewport({0, 0, vp.width, vp.height});
-        app.stereoCamera = engine->createCamera(em.create());
-        app.stereoView->setCamera(app.stereoCamera);
-        app.stereoView->setStereoscopicOptions({.enabled = true});
-        FilamentApp::get().addOffscreenView(app.stereoView);
-
-        // Camera settings for the stereo render target
-        constexpr double projNear  = 0.1;
-        constexpr double projFar = 100;
-
-        mat4 projections[CONFIG_MAX_STEREOSCOPIC_EYES];
-        mat4 eyeModels[CONFIG_MAX_STEREOSCOPIC_EYES];
-        static_assert(CONFIG_MAX_STEREOSCOPIC_EYES == 4, "Update matrices");
-        projections[0] = Camera::projection(24, 1.0, projNear, projFar);
-        projections[1] = Camera::projection(70, 1.0, projNear, projFar);
-        projections[2] = Camera::projection(50, 1.0, projNear, projFar);
-        projections[3] = Camera::projection(35, 1.0, projNear, projFar);
-        app.stereoCamera->setCustomEyeProjection(projections, 4, projections[0], projNear, projFar);
-
-        eyeModels[0] = mat4::lookAt(float3{ -4, 0, 0 }, monkeyPosition, upVector);
-        eyeModels[1] = mat4::lookAt(float3{ 4, 0, 0 }, monkeyPosition, upVector);
-        eyeModels[2] = mat4::lookAt(float3{ 0, 3, 0 }, monkeyPosition, upVector);
-        eyeModels[3] = mat4::lookAt(float3{ 0, -3, 0 }, monkeyPosition, upVector);
-        for (int i = 0; i < eyeCount; ++i) {
-            app.stereoCamera->setEyeModelMatrix(i, eyeModels[i]);
-        }
-
-        // Create a vertex buffer and an index buffer for a quad. This will be used to display the contents
-        // of each layer of the stereo texture.
-        float3 quadCenter = {0, 0, 0};
-        float3 quadNormal = normalize(float3 {0, 0, 1});
-        float3 u = normalize(cross(quadNormal, upVector));
-        float3 v = cross(quadNormal, u);
-        static Vertex quadVertices[4] = {
-                {{quadCenter - u - v}, {1, 0}},
-                {{quadCenter + u - v}, {0, 0}},
-                {{quadCenter - u + v}, {1, 1}},
-                {{quadCenter + u + v}, {0, 1}}
-        };
-
-        static_assert(sizeof(Vertex) == 20, "Strange vertex size.");
-        app.quadVb = VertexBuffer::Builder()
-                .vertexCount(4)
-                .bufferCount(1)
-                .attribute(VertexAttribute::POSITION, 0, VertexBuffer::AttributeType::FLOAT3, 0, sizeof(Vertex))
-                .attribute(VertexAttribute::UV0, 0, VertexBuffer::AttributeType::FLOAT2, 12, sizeof(Vertex))
-                .build(*engine);
-        app.quadVb->setBufferAt(*engine, 0,
-                VertexBuffer::BufferDescriptor(quadVertices, sizeof(Vertex) * 4, nullptr));
-
-        static constexpr uint16_t quadIndices[6] = { 0, 1, 2, 3, 2, 1 };
-        app.quadIb = IndexBuffer::Builder()
-                .indexCount(6)
-                .bufferType(IndexBuffer::IndexType::USHORT)
-                .build(*engine);
-        app.quadIb->setBuffer(*engine, IndexBuffer::BufferDescriptor(quadIndices, 12, nullptr));
-
-        // Create quad material instances and renderables.
-        app.quadMaterial = Material::Builder()
-                .package(RESOURCES_ARRAYTEXTURE_DATA, RESOURCES_ARRAYTEXTURE_SIZE)
-                .build(*engine);
-
-        for (int i = 0; i < eyeCount; ++i) {
-            MaterialInstance* quadMatInst = app.quadMaterial->createInstance();
-            TextureSampler sampler(TextureSampler::MinFilter::LINEAR, TextureSampler::MagFilter::LINEAR);
-            quadMatInst->setParameter("image", app.stereoColorTexture, sampler);
-            quadMatInst->setParameter("layerIndex", i);
-            quadMatInst->setParameter("borderEffect", true);
-            app.quadMatInstances.push_back(quadMatInst);
-
-            utils::Entity quadEntity = em.create();
-            app.quadEntities.push_back(quadEntity);
-            RenderableManager::Builder(1)
-                    .boundingBox({{ -1, -1, -1 }, { 1, 1, 1 }})
-                    .material(0, quadMatInst)
-                    .geometry(0, RenderableManager::PrimitiveType::TRIANGLES, app.quadVb, app.quadIb, 0, 6)
-                    .culling(false)
-                    .receiveShadows(false)
-                    .castShadows(false)
-                    .build(*engine, quadEntity);
-            scene->addEntity(quadEntity);
-
-            // Place quads at equal intervals.
-            TransformManager::Instance quadTi = tcm.getInstance(quadEntity);
-            mat4f quadWorld = tcm.getWorldTransform(quadTi);
-            constexpr float leftMostPos = -4;
-            constexpr float rightMostPos = 4;
-            float xpos = leftMostPos + ( (rightMostPos - leftMostPos) / (eyeCount - 1) ) * i;
-            tcm.setTransform(quadTi, mat4f::translation(float3(xpos, 2, -8)) * quadWorld);
-        }
-    };
-
-    auto cleanup = [&app](Engine* engine, View*, Scene*) {
-
-        auto& em = utils::EntityManager::get();
-
-        for (MaterialInstance* mi : app.quadMatInstances) {
-            engine->destroy(mi);
-        }
-        for (utils::Entity e : app.quadEntities) {
-            engine->destroy(e);
-        }
-        engine->destroy(app.quadMaterial);
-        engine->destroy(app.quadIb);
-        engine->destroy(app.quadVb);
-        engine->destroy(app.stereoRenderTarget);
-        engine->destroy(app.stereoDepthTexture);
-        engine->destroy(app.stereoColorTexture);
-        auto camera = app.stereoCamera->getEntity();
-        engine->destroyCameraComponent(camera);
-        em.destroy(camera);
-        engine->destroy(app.stereoScene);
-        engine->destroy(app.stereoView);
-        engine->destroy(app.lightEntity);
-        engine->destroy(app.monkeyMesh.renderable);
-        engine->destroy(app.monkeyMesh.indexBuffer);
-        engine->destroy(app.monkeyMesh.vertexBuffer);
-        engine->destroy(app.monkeyMatInstance);
-        engine->destroy(app.monkeyMaterial);
-    };
-
-    auto preRender = [&app](Engine*, View*, Scene*, Renderer* renderer) {
-        renderer->setClearOptions({.clearColor = {0.1,0.2,0.4,1.0}, .clear = true});
-    };
-
-    FilamentApp::get().animate([&app](Engine* engine, View* view, double now) {
-        auto& tcm = engine->getTransformManager();
-
-        // Animate the monkey by spinning and sliding back and forth along Z.
-        auto ti = tcm.getInstance(app.monkeyMesh.renderable);
-        mat4f xform =  app.monkeyTransform *  mat4f::rotation(now, float3{0, 1, 0 });
-        tcm.setTransform(ti, xform);
-    });
-
-    FilamentApp::get().run(app.config, setup, cleanup, FilamentApp::ImGuiCallback(), preRender);
-
-    return 0;
-}

samples/materials/arrayTexture.mat

@@ -1,39 +0,0 @@
-material {
-    name : ArrayTexture,
-    parameters : [
-        {
-            type : sampler2dArray,
-            name : image
-        },
-        {
-            type : int,
-            name : layerIndex
-        },
-        {
-            type : bool,
-            name : borderEffect
-        }
-    ],
-    requires : [
-        uv0
-    ],
-    shadingModel : unlit,
-    culling : none
-}
-
-fragment {
-    void material(inout MaterialInputs material) {
-        prepareMaterial(material);
-        float3 v = texture(materialParams_image, vec3(getUV0(), materialParams.layerIndex)).rgb;
-        material.baseColor.rgb = v;
-
-        // Add black border effect.
-        if (materialParams.borderEffect) {
-            vec2 st = getUV0();
-            float minDist0 = min(st.x, st.y);
-            float minDist1 = min(1.0 - st.x, 1.0 - st.y);
-            float minDist = min(minDist0, minDist1);
-            material.baseColor.rgb *= smoothstep(0.0, 0.1, minDist);
-        }
-    }
-}

web/filament-js/package.json

@@ -1,6 +1,6 @@
 {
   "name": "filament",
-  "version": "1.54.4",
+  "version": "1.54.0",
   "description": "Real-time physically based rendering engine",
   "main": "filament.js",
   "module": "filament.js",