vk: testing a robin_map key hash failure

Executable on device with: ./build.sh -p android -q arm64-v8a release test_compiler && adb push out/cmake-android-release-aarch64/filament/test/test_compiler /data/local/tmp/ && adb shell chmod 777 /data/local/tmp/test_compiler && adb shell /data/local/tmp/test_compiler
2024-07-26 12:23:28 +08:00
113 changed files with 575 additions and 1647 deletions
@@ -7,5 +7,3 @@ for next branch cut* header.
 appropriate header in [RELEASE_NOTES.md](./RELEASE_NOTES.md).

 ## Release notes for next branch cut
-
- Add a `name` API to Filament objects for debugging handle use-after-free assertions
@@ -31,7 +31,7 @@ repositories {
 }

 dependencies {
-    implementation 'com.google.android.filament:filament-android:1.54.0'
+    implementation 'com.google.android.filament:filament-android:1.53.2'
 }
 ```

@@ -51,7 +51,7 @@ Here are all the libraries available in the group `com.google.android.filament`:
 iOS projects can use CocoaPods to install the latest release:

 ```shell
-pod 'Filament', '~> 1.54.0'
+pod 'Filament', '~> 1.53.2'
 ```

 ### Snapshots
@@ -7,22 +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.1
-
-
-## v1.54.0
-
- materials: add a new `stereoscopicType` material parameter. [⚠️ **New Material Version**]
- Fix a crash when compiling shaders on IMG devices
-
-## v1.53.5
-
- engine: Fix bug causing certain sampler parameters to not be applied correctly in GLES 2.0 and on
-  certain GLES 3.0 drivers.
-
-## v1.53.4
-
-
 ## v1.53.3

 - Add drag and drop support for IBL files for desktop gltf_viewer.
@@ -1,5 +1,5 @@
 GROUP=com.google.android.filament
-VERSION_NAME=1.54.0
+VERSION_NAME=1.53.2

 POM_DESCRIPTION=Real-time physically based rendering engine for Android.

@@ -1308,12 +1308,7 @@ Description
      declare a variable called `eyeDirection` you can access it in the fragment shader using
      `variable_eyeDirection`. In the vertex shader, the interpolant name is simply a member of
      the `MaterialVertexInputs` structure (`material.eyeDirection` in your example). Each
-      interpolant is of type `float4` (`vec4`) in the shaders. By default the precision of the
-      interpolant is `highp` in *both* the vertex and fragment shaders.
-      An alternate syntax can be used to specify both the name and precision of the interpolant.
-      In this case the specified precision is used as-is in both fragment and vertex stages, in
-      particular if `default` is specified the default precision is used is the fragment shader
-      (`mediump`) and in the vertex shader (`highp`).
+      interpolant is of type `float4` (`vec4`) in the shaders.

 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ JSON
 material {
@@ -1325,11 +1320,7 @@ material {
        }
    ],
    variables : [
-         eyeDirection,
-         {
-            name : eyeColor,
-            precision : medium
-         }
+         eyeDirection
    ],
    vertexDomain : device,
    depthWrite : false,
@@ -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
@@ -1244,7 +1244,7 @@ enum class Workaround : uint16_t {
    ADRENO_UNIFORM_ARRAY_CRASH,
    // Workaround a Metal pipeline compilation error with the message:
    // "Could not statically determine the target of a texture". See light_indirect.fs
-    METAL_STATIC_TEXTURE_TARGET_ERROR,
+    A8X_STATIC_TEXTURE_TARGET_ERROR,
    // Adreno drivers sometimes aren't able to blit into a layer of a texture array.
    DISABLE_BLIT_INTO_TEXTURE_ARRAY,
    // Multiple workarounds needed for PowerVR GPUs
@@ -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
 * -----------------------
@@ -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>

@@ -40,7 +39,7 @@

 #define HandleAllocatorGL  HandleAllocator<32,  64, 136>    // ~4520 / pool / MiB
 #define HandleAllocatorVK  HandleAllocator<64, 160, 312>    // ~1820 / pool / MiB
-#define HandleAllocatorMTL HandleAllocator<32,  64, 552>    // ~1660 / pool / MiB
+#define HandleAllocatorMTL HandleAllocator<32,  48, 552>    // ~1660 / pool / MiB

 namespace filament::backend {

@@ -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,34 +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 tag's age to N bits.
-            constexpr uint8_t N = 2; // support a history of 4 tags
-            constexpr uint8_t mask = (1 << N) - 1;
-
-            uint8_t const age = (id & HANDLE_AGE_MASK) >> HANDLE_AGE_SHIFT;
-            uint8_t const newAge = age & mask;
-            uint32_t const key = (id & ~HANDLE_AGE_MASK) | (newAge << HANDLE_AGE_SHIFT);
-
-            // 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)";
-        }
-        if (auto pos = mDebugTags.find(id); pos != mDebugTags.end()) {
-            return pos->second;
-        }
-        return "(no tag)";
-    }
-
 private:

    template<typename D>
@@ -394,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;
 };
@@ -101,8 +101,9 @@ void CommandBufferQueue::flush() noexcept {
    size_t const used = std::distance(
            static_cast<char const*>(begin), static_cast<char const*>(end));

-
    std::unique_lock<utils::Mutex> lock(mLock);
+    mCommandBuffersToExecute.push_back({ begin, end });
+    mCondition.notify_one();

    // circular buffer is too small, we corrupted the stream
    FILAMENT_CHECK_POSTCONDITION(used <= mFreeSpace) <<
@@ -111,13 +112,11 @@ void CommandBufferQueue::flush() noexcept {
            "Space used at this time: " << used <<
            " bytes, overflow: " << used - mFreeSpace << " bytes";

-    mFreeSpace -= used;
-    mCommandBuffersToExecute.push_back({ begin, end });
-    mCondition.notify_one();
-
    // wait until there is enough space in the buffer
+    mFreeSpace -= used;
    if (UTILS_UNLIKELY(mFreeSpace < requiredSize)) {

+
 #ifndef NDEBUG
        size_t const totalUsed = circularBuffer.size() - mFreeSpace;
        slog.d << "CommandStream used too much space (will block): "
@@ -154,10 +153,8 @@ std::vector<CommandBufferQueue::Range> CommandBufferQueue::waitForCommands() con
 }

 void CommandBufferQueue::releaseBuffer(CommandBufferQueue::Range const& buffer) {
-    size_t const used = std::distance(
-            static_cast<char const*>(buffer.begin), static_cast<char const*>(buffer.end));
    std::lock_guard<utils::Mutex> const lock(mLock);
-    mFreeSpace += used;
+    mFreeSpace += uintptr_t(buffer.end) - uintptr_t(buffer.begin);
    mCondition.notify_one();
 }

@@ -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>
@@ -93,7 +93,7 @@ struct MetalContext {
    } highestSupportedGpuFamily;

    struct {
-        bool staticTextureTargetError;
+        bool a8xStaticTextureTargetError;
    } bugs;

    // sampleCountLookup[requestedSamples] gives a <= sample count supported by the device.
@@ -53,14 +53,14 @@ Driver* MetalDriverFactory::create(MetalPlatform* const platform, const Platform
    //    MetalRenderPrimitive         :  24       many
    //    MetalVertexBuffer            :  32       moderate
    // -- less than or equal 32 bytes
+    //    MetalIndexBuffer             :  40       moderate
    //    MetalFence                   :  48       few
-    //    MetalIndexBuffer             :  56       moderate
-    //    MetalBufferObject            :  64       many
-    // -- less than or equal 64 bytes
+    //    MetalBufferObject            :  48       many
+    // -- less than or equal 48 bytes
    //    MetalSamplerGroup            : 112       few
    //    MetalProgram                 : 152       moderate
    //    MetalTexture                 : 152       moderate
-    //    MetalSwapChain               : 208       few
+    //    MetalSwapChain               : 184       few
    //    MetalRenderTarget            : 272       few
    //    MetalVertexBufferInfo        : 552       moderate
    // -- less than or equal to 552 bytes
@@ -162,10 +162,8 @@ MetalDriver::MetalDriver(MetalPlatform* platform, const Platform::DriverConfig&
        sc[s] = [mContext->device supportsTextureSampleCount:s] ? s : sc[s - 1];
    }

-    mContext->bugs.staticTextureTargetError =
-            [mContext->device.name containsString:@"Apple A8X GPU"] ||
-            [mContext->device.name containsString:@"Apple A8 GPU"] ||
-            [mContext->device.name containsString:@"Apple A7 GPU"];
+    mContext->bugs.a8xStaticTextureTargetError =
+            [mContext->device.name containsString:@"Apple A8X GPU"];

    mContext->commandQueue = mPlatform.createCommandQueue(mContext->device);
    mContext->pipelineStateCache.setDevice(mContext->device);
@@ -842,8 +840,8 @@ bool MetalDriver::isWorkaroundNeeded(Workaround workaround) {
            return true;
        case Workaround::ADRENO_UNIFORM_ARRAY_CRASH:
            return false;
-        case Workaround::METAL_STATIC_TEXTURE_TARGET_ERROR:
-            return mContext->bugs.staticTextureTargetError;
+        case Workaround::A8X_STATIC_TEXTURE_TARGET_ERROR:
+            return mContext->bugs.a8xStaticTextureTargetError;
        case Workaround::DISABLE_BLIT_INTO_TEXTURE_ARRAY:
            return false;
        default:
@@ -2061,10 +2059,6 @@ 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);
@@ -388,7 +388,4 @@ void NoopDriver::endTimerQuery(Handle<HwTimerQuery> tqh) {
 void NoopDriver::resetState(int) {
 }

-void NoopDriver::setDebugTag(HandleBase::HandleId handleId, utils::CString tag) {
-}
-
 } // namespace filament
@@ -1044,11 +1044,6 @@ void OpenGLContext::resetState() noexcept {
    );
    glDepthMask(state.raster.depthMask);
    glDepthFunc(state.raster.depthFunc);
-
-    utils::slog.e << "stencil front=" << 
-        state.stencil.front.func.func << " "  <<
-        state.stencil.front.func.ref << " "  <<
-        state.stencil.front.func.mask << " " << utils::io::endl;
    
    // state.stencil
    glStencilFuncSeparate(
@@ -83,20 +83,12 @@
 #define HAS_MAPBUFFERS 1
 #endif

-#define DEBUG_GROUP_MARKER_NONE       0x00    // no debug marker
-#define DEBUG_GROUP_MARKER_OPENGL     0x01    // markers in the gl command queue (req. driver support)
-#define DEBUG_GROUP_MARKER_BACKEND    0x02    // markers on the backend side (systrace)
-#define DEBUG_GROUP_MARKER_ALL        0x03    // all markers
+#define DEBUG_MARKER_NONE       0x00    // no debug marker
+#define DEBUG_MARKER_OPENGL     0x01    // markers in the gl command queue (req. driver support)
+#define DEBUG_MARKER_BACKEND    0x02    // markers on the backend side (systrace)
+#define DEBUG_MARKER_ALL        0x03    // all markers

-#define DEBUG_MARKER_NONE             0x00    // no debug marker
-#define DEBUG_MARKER_OPENGL           0x01    // markers in the gl command queue (req. driver support)
-#define DEBUG_MARKER_BACKEND          0x02    // markers on the backend side (systrace)
-#define DEBUG_MARKER_ALL              0x03    // all markers
-
-// set to the desired debug marker level (for user markers [default: All])
-#define DEBUG_GROUP_MARKER_LEVEL      DEBUG_GROUP_MARKER_ALL
-
-// set to the desired debug level (for internal debugging [Default: None])
+// set to the desired debug marker level
 #define DEBUG_MARKER_LEVEL      DEBUG_MARKER_NONE

 #if DEBUG_MARKER_LEVEL > DEBUG_MARKER_NONE
@@ -204,37 +196,11 @@ Driver* OpenGLDriver::create(OpenGLPlatform* const platform,

 OpenGLDriver::DebugMarker::DebugMarker(OpenGLDriver& driver, const char* string) noexcept
        : driver(driver) {
-#ifndef __EMSCRIPTEN__
-#ifdef GL_EXT_debug_marker
-#if DEBUG_MARKER_LEVEL & DEBUG_MARKER_OPENGL
-    if (UTILS_LIKELY(driver.getContext().ext.EXT_debug_marker)) {
-        glPushGroupMarkerEXT(GLsizei(strlen(string)), string);
-    }
-#endif
-#endif
-
-#if DEBUG_MARKER_LEVEL & DEBUG_MARKER_BACKEND
-    SYSTRACE_CONTEXT();
-    SYSTRACE_NAME_BEGIN(string);
-#endif
-#endif
+    driver.pushGroupMarker(string, strlen(string));
 }

 OpenGLDriver::DebugMarker::~DebugMarker() noexcept {
-#ifndef __EMSCRIPTEN__
-#ifdef GL_EXT_debug_marker
-#if DEBUG_MARKER_LEVEL & DEBUG_MARKER_OPENGL
-    if (UTILS_LIKELY(driver.getContext().ext.EXT_debug_marker)) {
-        glPopGroupMarkerEXT();
-    }
-#endif
-#endif
-
-#if DEBUG_MARKER_LEVEL & DEBUG_MARKER_BACKEND
-    SYSTRACE_CONTEXT();
-    SYSTRACE_NAME_END();
-#endif
-#endif
+    driver.popGroupMarker();
 }

 // ------------------------------------------------------------------------------------------------
@@ -460,20 +426,20 @@ void OpenGLDriver::setStencilState(StencilState ss) noexcept {

    // stencil test / operation
    // GL_STENCIL_TEST must be enabled if we're testing OR writing to the stencil buffer.
-    // if (UTILS_LIKELY(
-    //         ss.front.stencilFunc == StencilState::StencilFunction::A &&
-    //         ss.back.stencilFunc == StencilState::StencilFunction::A &&
-    //         ss.front.stencilOpDepthFail == StencilOperation::KEEP &&
-    //         ss.back.stencilOpDepthFail == StencilOperation::KEEP &&
-    //         ss.front.stencilOpStencilFail == StencilOperation::KEEP &&
-    //         ss.back.stencilOpStencilFail == StencilOperation::KEEP &&
-    //         ss.front.stencilOpDepthStencilPass == StencilOperation::KEEP &&
-    //         ss.back.stencilOpDepthStencilPass == StencilOperation::KEEP) && false) {
-    //     // that's equivalent to having the stencil test disabled
-    //     gl.disable(GL_STENCIL_TEST);
-    // } else {
+    if (UTILS_LIKELY(
+            ss.front.stencilFunc == StencilState::StencilFunction::A &&
+            ss.back.stencilFunc == StencilState::StencilFunction::A &&
+            ss.front.stencilOpDepthFail == StencilOperation::KEEP &&
+            ss.back.stencilOpDepthFail == StencilOperation::KEEP &&
+            ss.front.stencilOpStencilFail == StencilOperation::KEEP &&
+            ss.back.stencilOpStencilFail == StencilOperation::KEEP &&
+            ss.front.stencilOpDepthStencilPass == StencilOperation::KEEP &&
+            ss.back.stencilOpDepthStencilPass == StencilOperation::KEEP)) {
+        // that's equivalent to having the stencil test disabled
+        gl.disable(GL_STENCIL_TEST);
+    } else {
        gl.enable(GL_STENCIL_TEST);
-//    }
+    }

    // glStencilFuncSeparate() also sets the reference value, which may be used depending
    // on the stencilOp, so we always need to call glStencilFuncSeparate().
@@ -481,9 +447,9 @@ void OpenGLDriver::setStencilState(StencilState ss) noexcept {
            getStencilFunc(ss.front.stencilFunc), ss.front.ref, ss.front.readMask,
            getStencilFunc(ss.back.stencilFunc), ss.back.ref, ss.back.readMask);

-//    if (UTILS_LIKELY(!ss.stencilWrite)) {
-//        gl.stencilMaskSeparate(0x00, 0x00);
-//    } else {
+    if (UTILS_LIKELY(!ss.stencilWrite)) {
+        gl.stencilMaskSeparate(0x00, 0x00);
+    } else {
        // Stencil ops are only relevant when stencil write is enabled
        gl.stencilOpSeparate(
                getStencilOp(ss.front.stencilOpStencilFail),
@@ -493,7 +459,7 @@ void OpenGLDriver::setStencilState(StencilState ss) noexcept {
                getStencilOp(ss.back.stencilOpDepthFail),
                getStencilOp(ss.back.stencilOpDepthStencilPass));
        gl.stencilMaskSeparate(ss.front.writeMask, ss.back.writeMask);
-//    }
+    }
 }

 // ------------------------------------------------------------------------------------------------
@@ -2210,10 +2176,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()
@@ -2379,15 +2341,6 @@ void OpenGLDriver::updateSamplerGroup(Handle<HwSamplerGroup> sbh,
            GLTexture const* const t = handle_cast<const GLTexture*>(th);
            assert_invariant(t);

-            if (UTILS_UNLIKELY(es2)
-#if defined(GL_EXT_texture_filter_anisotropic)
-                    || UTILS_UNLIKELY(anisotropyWorkaround)
- #endif
-                    ) {
-                // We must set texture parameters on the texture itself.
-                bindTexture(OpenGLContext::DUMMY_TEXTURE_BINDING, t);
-            }
-
            SamplerParams params = pSamplers[i].s;
            if (UTILS_UNLIKELY(t->target == SamplerType::SAMPLER_EXTERNAL)) {
                // From OES_EGL_image_external spec:
@@ -3198,14 +3151,14 @@ void OpenGLDriver::insertEventMarker(char const* string, uint32_t len) {
 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 DEBUG_MARKER_LEVEL & DEBUG_MARKER_OPENGL
    if (UTILS_LIKELY(mContext.ext.EXT_debug_marker)) {
        glPushGroupMarkerEXT(GLsizei(len ? len : strlen(string)), string);
    }
 #endif
 #endif

-#if DEBUG_GROUP_MARKER_LEVEL & DEBUG_GROUP_MARKER_BACKEND
+#if DEBUG_MARKER_LEVEL & DEBUG_MARKER_BACKEND
    SYSTRACE_CONTEXT();
    SYSTRACE_NAME_BEGIN(string);
 #endif
@@ -3215,14 +3168,14 @@ void OpenGLDriver::pushGroupMarker(char const* string, uint32_t len) {
 void OpenGLDriver::popGroupMarker(int) {
 #ifndef __EMSCRIPTEN__
 #ifdef GL_EXT_debug_marker
-#if DEBUG_GROUP_MARKER_LEVEL & DEBUG_GROUP_MARKER_OPENGL
+#if DEBUG_MARKER_LEVEL & DEBUG_MARKER_OPENGL
    if (UTILS_LIKELY(mContext.ext.EXT_debug_marker)) {
        glPopGroupMarkerEXT();
    }
 #endif
 #endif

-#if DEBUG_GROUP_MARKER_LEVEL & DEBUG_GROUP_MARKER_BACKEND
+#if DEBUG_MARKER_LEVEL & DEBUG_MARKER_BACKEND
    SYSTRACE_CONTEXT();
    SYSTRACE_NAME_END();
 #endif
@@ -3928,7 +3881,6 @@ void OpenGLDriver::bindRenderPrimitive(Handle<HwRenderPrimitive> rph) {
 }

 void OpenGLDriver::draw2(uint32_t indexOffset, uint32_t indexCount, uint32_t instanceCount) {
-    DEBUG_MARKER()
    GLRenderPrimitive const* const rp = mBoundRenderPrimitive;
    if (UTILS_UNLIKELY(!rp || !mValidProgram)) {
        return;
@@ -3950,7 +3902,6 @@ void OpenGLDriver::draw2(uint32_t indexOffset, uint32_t indexCount, uint32_t ins
 }

 void OpenGLDriver::draw2GLES2(uint32_t indexOffset, uint32_t indexCount, uint32_t instanceCount) {
-    DEBUG_MARKER()
    GLRenderPrimitive const* const rp = mBoundRenderPrimitive;
    if (UTILS_UNLIKELY(!rp || !mValidProgram)) {
        return;
@@ -3971,7 +3922,6 @@ void OpenGLDriver::draw2GLES2(uint32_t indexOffset, uint32_t indexCount, uint32_
 }

 void OpenGLDriver::scissor(Viewport scissor) {
-    DEBUG_MARKER()
    setScissor(scissor);
 }

@@ -3991,7 +3941,6 @@ void OpenGLDriver::draw(PipelineState state, Handle<HwRenderPrimitive> rph,
 }

 void OpenGLDriver::dispatchCompute(Handle<HwProgram> program, math::uint3 workGroupCount) {
-    DEBUG_MARKER()
    getShaderCompilerService().tick();

    OpenGLProgram* const p = handle_cast<OpenGLProgram*>(program);
@@ -81,7 +81,7 @@ public:
            const Platform::DriverConfig& driverConfig) noexcept;

    class DebugMarker {
-        UTILS_UNUSED OpenGLDriver& driver;
+        OpenGLDriver& driver;
    public:
        DebugMarker(OpenGLDriver& driver, const char* string) noexcept;
        ~DebugMarker() noexcept;
@@ -143,25 +143,21 @@ void TimerQueryNativeFactory::endTimeElapsedQuery(OpenGLDriver& driver, GLTimerQ

    driver.runEveryNowAndThen([&context = mContext, weak]() -> bool {
        auto state = weak.lock();
-        if (!state) {
-            // The timer query state has been destroyed on the way, very likely due to the IBL
-            // prefilter context destruction. We still return true to get this element removed from
-            // the query list.
-            return true;
+        if (state) {
+            GLuint available = 0;
+            context.procs.getQueryObjectuiv(state->gl.query, GL_QUERY_RESULT_AVAILABLE, &available);
+            CHECK_GL_ERROR(utils::slog.e)
+            if (!available) {
+                // we need to try this one again later
+                return false;
+            }
+            GLuint64 elapsedTime = 0;
+            // we won't end-up here if we're on ES and don't have GL_EXT_disjoint_timer_query
+            context.procs.getQueryObjectui64v(state->gl.query, GL_QUERY_RESULT, &elapsedTime);
+            state->elapsed.store((int64_t)elapsedTime, std::memory_order_relaxed);
+        } else {
+            state->elapsed.store(int64_t(TimerQueryResult::ERROR), std::memory_order_relaxed);
        }
-
-        GLuint available = 0;
-        context.procs.getQueryObjectuiv(state->gl.query, GL_QUERY_RESULT_AVAILABLE, &available);
-        CHECK_GL_ERROR(utils::slog.e)
-        if (!available) {
-            // we need to try this one again later
-            return false;
-        }
-        GLuint64 elapsedTime = 0;
-        // we won't end-up here if we're on ES and don't have GL_EXT_disjoint_timer_query
-        context.procs.getQueryObjectui64v(state->gl.query, GL_QUERY_RESULT, &elapsedTime);
-        state->elapsed.store((int64_t)elapsedTime, std::memory_order_relaxed);
-
        return true;
    });
 }
@@ -26,28 +26,16 @@

 #include <utils/compiler.h>
 #include <utils/CString.h>
-#include <utils/debug.h>
-#include <utils/FixedCapacityVector.h>
 #include <utils/JobSystem.h>
 #include <utils/Log.h>
-#include <utils/ostream.h>
-#include <utils/Panic.h>
 #include <utils/Systrace.h>

-#include <array>
 #include <cctype>
 #include <chrono>
-#include <mutex>
-#include <memory>
 #include <string>
 #include <string_view>
-#include <thread>
-#include <utility>
 #include <variant>

-#include <stddef.h>
-#include <stdint.h>
-
 namespace filament::backend {

 using namespace utils;
@@ -488,12 +476,6 @@ GLuint ShaderCompilerService::initialize(program_token_t& token) noexcept {
    // check status of program linking and shader compilation, logs error and free all resources
    // in case of error.
    bool const success = checkProgramStatus(token);
-
-    // Unless we have matdbg, we panic if a program is invalid. Otherwise, we'd get a UB.
-    // The compilation error has been logged to log.e by this point.
-    FILAMENT_CHECK_POSTCONDITION(FILAMENT_ENABLE_MATDBG || success)
-            << "OpenGL program " << token->name.c_str_safe() << " failed to link or compile";
-
    if (UTILS_LIKELY(success)) {
        program = token->gl.program;
        // no need to keep the shaders around
@@ -597,31 +579,24 @@ void ShaderCompilerService::compileShaders(OpenGLContext& context,
                version = "#version 310 es\n";
            }

-            std::array<std::string_view, 5> sources = {
-                version,
-                prolog,
-                specializationConstantString,
-                packingFunctions,
-                { body.data(), body.size() - 1 }  // null-terminated
+            const std::array<const char*, 5> sources = {
+                    version.data(),
+                    prolog.data(),
+                    specializationConstantString.c_str(),
+                    packingFunctions.data(),
+                    body.data()
            };

-            // Some of the sources may be zero-length. Remove them as to avoid passing lengths of
-            // zero to glShaderSource(). glShaderSource should work with lengths of zero, but some
-            // drivers instead interpret zero as a sentinel for a null-terminated string.
-            auto partitionPoint = std::stable_partition(
-                    sources.begin(), sources.end(), [](std::string_view s) { return !s.empty(); });
-            size_t count = std::distance(sources.begin(), partitionPoint);
-
-            std::array<const char*, 5> shaderStrings;
-            std::array<GLint, 5> lengths;
-            for (size_t i = 0; i < count; i++) {
-                shaderStrings[i] = sources[i].data();
-                lengths[i] = sources[i].size();
-            }
+            const std::array<GLint, 5> lengths = {
+                    (GLint)version.length(),
+                    (GLint)prolog.length(),
+                    (GLint)specializationConstantString.length(),
+                    (GLint)packingFunctions.length(),
+                    (GLint)body.length() - 1 // null terminated
+            };

            GLuint const shaderId = glCreateShader(glShaderType);
-            glShaderSource(shaderId, count, shaderStrings.data(), lengths.data());
-
+            glShaderSource(shaderId, sources.size(), sources.data(), lengths.data());
            glCompileShader(shaderId);

 #ifndef NDEBUG
@@ -59,11 +59,7 @@ VkExtent2D VulkanAttachment::getExtent2D() const {

 VkImageView VulkanAttachment::getImageView() {
    assert_invariant(texture);
-    VkImageSubresourceRange range = getSubresourceRange();
-    if (range.layerCount > 1) {
-        return texture->getMultiviewAttachmentView(range);
-    }
-    return texture->getAttachmentView(range);
+    return texture->getAttachmentView(getSubresourceRange());
 }

 bool VulkanAttachment::isDepth() const {
@@ -77,7 +73,7 @@ VkImageSubresourceRange VulkanAttachment::getSubresourceRange() const {
            .baseMipLevel = uint32_t(level),
            .levelCount = 1,
            .baseArrayLayer = uint32_t(layer),
-            .layerCount = layerCount,
+            .layerCount = 1,
    };
 }

@@ -43,8 +43,6 @@ struct VulkanCommandBuffer;
 struct VulkanAttachment {
    VulkanTexture* texture = nullptr;
    uint8_t level = 0;
-    uint8_t baseViewIndex = 0;
-    uint8_t layerCount = 1;
    uint16_t layer = 0;

    bool isDepth() const;
@@ -595,8 +595,6 @@ void VulkanDriver::createRenderTargetR(Handle<HwRenderTarget> rth,
            colorTargets[i] = {
                .texture = mResourceAllocator.handle_cast<VulkanTexture*>(color[i].handle),
                .level = color[i].level,
-                .baseViewIndex = color[i].baseViewIndex,
-                .layerCount = layerCount,
                .layer = color[i].layer,
            };
            UTILS_UNUSED_IN_RELEASE VkExtent2D extent = colorTargets[i].getExtent2D();
@@ -611,8 +609,6 @@ void VulkanDriver::createRenderTargetR(Handle<HwRenderTarget> rth,
        depthStencil[0] = {
            .texture = mResourceAllocator.handle_cast<VulkanTexture*>(depth.handle),
            .level = depth.level,
-            .baseViewIndex = depth.baseViewIndex,
-            .layerCount = layerCount,
            .layer = depth.layer,
        };
        UTILS_UNUSED_IN_RELEASE VkExtent2D extent = depthStencil[0].getExtent2D();
@@ -625,8 +621,6 @@ void VulkanDriver::createRenderTargetR(Handle<HwRenderTarget> rth,
        depthStencil[1] = {
            .texture = mResourceAllocator.handle_cast<VulkanTexture*>(stencil.handle),
            .level = stencil.level,
-            .baseViewIndex = stencil.baseViewIndex,
-            .layerCount = layerCount,
            .layer = stencil.layer,
        };
        UTILS_UNUSED_IN_RELEASE VkExtent2D extent = depthStencil[1].getExtent2D();
@@ -643,7 +637,7 @@ void VulkanDriver::createRenderTargetR(Handle<HwRenderTarget> rth,

    auto renderTarget = mResourceAllocator.construct<VulkanRenderTarget>(rth, mPlatform->getDevice(),
            mPlatform->getPhysicalDevice(), mContext, mAllocator, &mCommands, width, height,
-            samples, colorTargets, depthStencil, mStagePool, layerCount);
+            samples, colorTargets, depthStencil, mStagePool);
    mResourceManager.acquire(renderTarget);
 }

@@ -1273,8 +1267,6 @@ void VulkanDriver::beginRenderPass(Handle<HwRenderTarget> rth, const RenderPassP
        }
    }

-    uint8_t const renderTargetLayerCount = rt->getLayerCount();
-
    // Create the VkRenderPass or fetch it from cache.
    VulkanFboCache::RenderPassKey rpkey = {
        .initialColorLayoutMask = 0,
@@ -1285,12 +1277,10 @@ void VulkanDriver::beginRenderPass(Handle<HwRenderTarget> rth, const RenderPassP
        .discardEnd = discardEndVal,
        .samples = rt->getSamples(),
        .subpassMask = uint8_t(params.subpassMask),
-        .viewCount = renderTargetLayerCount,
    };
    for (int i = 0; i < MRT::MAX_SUPPORTED_RENDER_TARGET_COUNT; i++) {
        const VulkanAttachment& info = rt->getColor(i);
        if (info.texture) {
-            assert_invariant(info.layerCount == renderTargetLayerCount);
            rpkey.initialColorLayoutMask |= 1 << i;
            rpkey.colorFormat[i] = info.getFormat();
            if (rpkey.samples > 1 && info.texture->samples == 1) {
@@ -2032,10 +2022,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>;

@@ -43,7 +43,6 @@ bool VulkanFboCache::RenderPassEq::operator()(const RenderPassKey& k1,
    if (k1.samples != k2.samples) return false;
    if (k1.needsResolveMask != k2.needsResolveMask) return false;
    if (k1.subpassMask != k2.subpassMask) return false;
-    if (k1.viewCount != k2.viewCount) return false;
    return true;
 }

@@ -187,25 +186,6 @@ VkRenderPass VulkanFboCache::getRenderPass(RenderPassKey config) noexcept {
        .pDependencies = dependencies
    };

-    VkRenderPassMultiviewCreateInfo multiviewCreateInfo = {};
-    uint32_t const subpassViewMask = (1 << config.viewCount) - 1;
-    // Prepare a view mask array for the maximum number of subpasses. All subpasses have all views
-    // activated.
-    uint32_t const viewMasks[2] = {subpassViewMask, subpassViewMask};
-    if (config.viewCount > 1) {
-        // Fill the multiview create info.
-        multiviewCreateInfo.sType = VK_STRUCTURE_TYPE_RENDER_PASS_MULTIVIEW_CREATE_INFO;
-        multiviewCreateInfo.pNext = nullptr;
-        multiviewCreateInfo.subpassCount = hasSubpasses ? 2u : 1u;
-        multiviewCreateInfo.pViewMasks = viewMasks;
-        multiviewCreateInfo.dependencyCount = 0;
-        multiviewCreateInfo.pViewOffsets = nullptr;
-        multiviewCreateInfo.correlationMaskCount = 1;
-        multiviewCreateInfo.pCorrelationMasks = &subpassViewMask;
-
-        renderPassInfo.pNext = &multiviewCreateInfo;
-    }
-
    int attachmentIndex = 0;

    // Populate the Color Attachments.
@@ -64,7 +64,7 @@ public:
        uint8_t samples; // 1 byte
        uint8_t needsResolveMask; // 1 byte
        uint8_t subpassMask; // 1 byte
-        uint8_t viewCount; // 1 byte
+        uint8_t padding2; // 1 byte
    };
    struct RenderPassVal {
        VkRenderPass handle;
@@ -323,12 +323,11 @@ VulkanRenderTarget::VulkanRenderTarget(VkDevice device, VkPhysicalDevice physica
        VulkanContext const& context, VmaAllocator allocator, VulkanCommands* commands,
        uint32_t width, uint32_t height, uint8_t samples,
        VulkanAttachment color[MRT::MAX_SUPPORTED_RENDER_TARGET_COUNT],
-        VulkanAttachment depthStencil[2], VulkanStagePool& stagePool, uint8_t layerCount)
+        VulkanAttachment depthStencil[2], VulkanStagePool& stagePool)
    : HwRenderTarget(width, height),
      VulkanResource(VulkanResourceType::RENDER_TARGET),
      mOffscreen(true),
-      mSamples(samples),
-      mLayerCount(layerCount) {
+      mSamples(samples) {
    for (int index = 0; index < MRT::MAX_SUPPORTED_RENDER_TARGET_COUNT; index++) {
        mColor[index] = color[index];
    }
@@ -304,7 +304,7 @@ struct VulkanRenderTarget : private HwRenderTarget, VulkanResource {
            VulkanContext const& context, VmaAllocator allocator,
            VulkanCommands* commands, uint32_t width, uint32_t height,
            uint8_t samples, VulkanAttachment color[MRT::MAX_SUPPORTED_RENDER_TARGET_COUNT],
-            VulkanAttachment depthStencil[2], VulkanStagePool& stagePool, uint8_t layerCount);
+            VulkanAttachment depthStencil[2], VulkanStagePool& stagePool);

    // Creates a special "default" render target (i.e. associated with the swap chain)
    explicit VulkanRenderTarget();
@@ -319,7 +319,6 @@ struct VulkanRenderTarget : private HwRenderTarget, VulkanResource {
    VulkanAttachment& getMsaaDepth();
    uint8_t getColorTargetCount(const VulkanRenderPass& pass) const;
    uint8_t getSamples() const { return mSamples; }
-    uint8_t getLayerCount() const { return mLayerCount; }
    bool hasDepth() const { return mDepth.texture; }
    bool isSwapChain() const { return !mOffscreen; }
    void bindToSwapChain(VulkanSwapChain& surf);
@@ -331,7 +330,6 @@ private:
    VulkanAttachment mMsaaDepthAttachment = {};
    const bool mOffscreen : 1;
    uint8_t mSamples : 7;
-    uint8_t mLayerCount = 1;
 };

 struct VulkanBufferObject;
@@ -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;

@@ -387,15 +387,12 @@ void VulkanTexture::setPrimaryRange(uint32_t minMiplevel, uint32_t maxMiplevel)
 }

 VkImageView VulkanTexture::getAttachmentView(VkImageSubresourceRange range) {
+    // Attachments should only have one mipmap level and one layer.
    range.levelCount = 1;
    range.layerCount = 1;
    return getImageView(range, VK_IMAGE_VIEW_TYPE_2D, {});
 }

-VkImageView VulkanTexture::getMultiviewAttachmentView(VkImageSubresourceRange range) {
-    return getImageView(range, VK_IMAGE_VIEW_TYPE_2D_ARRAY, {});
-}
-
 VkImageView VulkanTexture::getViewForType(VkImageSubresourceRange const& range, VkImageViewType type) {
    return getImageView(range, type, mSwizzle);
 }
@@ -73,10 +73,6 @@ struct VulkanTexture : public HwTexture, VulkanResource {
    // and the identity swizzle.
    VkImageView getAttachmentView(VkImageSubresourceRange range);

-    // Gets or creates a cached VkImageView for a single subresource that can be used as a render
-    // target attachment when rendering with multiview.
-    VkImageView getMultiviewAttachmentView(VkImageSubresourceRange range);
-
    // This is a workaround for the first few frames where we're waiting for the texture to actually
    // be uploaded.  In that case, we bind the sampler to an empty texture, but the corresponding
    // imageView needs to be of the right type. Hence, we provide an option to indicate the
@@ -172,7 +172,7 @@ public:
        UTILS_UNUSED VkResult result = vkAllocateDescriptorSets(mDevice, &allocInfo, &vkSet);
        FILAMENT_CHECK_POSTCONDITION(result == VK_SUCCESS)
                << "Failed to allocate descriptor set code=" << result << " size=" << mSize
-                << " capacity=" << mCapacity << " count=" << mUnusedCount;
+                << " capacity=" << mCapacity << " count=" << "%s";
        mSize++;
        return createSet(layout->bitmask, vkSet);
    }
@@ -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.
@@ -896,29 +896,6 @@ public:
    /** Tells whether an InstanceBuffer object is valid */
    bool isValid(const InstanceBuffer* UTILS_NULLABLE p) const;

-    /**
-     * Retrieve the count of each resource tracked by Engine.
-     * This is intended for debugging.
-     * @{
-     */
-    size_t getBufferObjectCount() const noexcept;
-    size_t getViewCount() const noexcept;
-    size_t getSceneCount() const noexcept;
-    size_t getSwapChainCount() const noexcept;
-    size_t getStreamCount() const noexcept;
-    size_t getIndexBufferCount() const noexcept;
-    size_t getSkinningBufferCount() const noexcept;
-    size_t getMorphTargetBufferCount() const noexcept;
-    size_t getInstanceBufferCount() const noexcept;
-    size_t getVertexBufferCount() const noexcept;
-    size_t getIndirectLightCount() const noexcept;
-    size_t getMaterialCount() const noexcept;
-    size_t getTextureCount() const noexcept;
-    size_t getSkyboxeCount() const noexcept;
-    size_t getColorGradingCount() const noexcept;
-    size_t getRenderTargetCount() const noexcept;
-    /**  @} */
-
    /**
     * Kicks the hardware thread (e.g. the OpenGL, Vulkan or Metal thread) and blocks until
     * all commands to this point are executed. Note that does guarantee that the
@@ -19,7 +19,6 @@

 #include <utils/compiler.h>
 #include <utils/PrivateImplementation.h>
-#include <utils/CString.h>

 #include <stddef.h>

@@ -55,22 +54,6 @@ public:
 template<typename T>
 using BuilderBase = utils::PrivateImplementation<T>;

-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
@@ -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.
@@ -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.
         */
@@ -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.
         *
@@ -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.
         *
@@ -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.
         *
@@ -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.
         *
@@ -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.
         *
@@ -24,7 +24,6 @@

 #include <utils/compiler.h>
 #include <utils/Entity.h>
-#include <utils/FixedCapacityVector.h>

 #include <math/mathfwd.h>

@@ -728,7 +727,7 @@ public:
    void setDebugCamera(Camera* UTILS_NULLABLE camera) noexcept;

    //! debugging: returns a Camera from the point of view of *the* dominant directional light used for shadowing.
-    utils::FixedCapacityVector<Camera const*> getDirectionalShadowCameras() const noexcept;
+    Camera const* UTILS_NULLABLE getDirectionalShadowCamera() const noexcept;


    /** Result of a picking query */
@@ -16,8 +16,6 @@

 #include "details/Engine.h"

-#include "ResourceAllocator.h"
-
 #include "details/BufferObject.h"
 #include "details/Camera.h"
 #include "details/Fence.h"
@@ -268,71 +266,6 @@ bool Engine::isValid(const InstanceBuffer* p) const {
    return downcast(this)->isValid(downcast(p));
 }

-size_t Engine::getBufferObjectCount() const noexcept {
-    return downcast(this)->getBufferObjectCount();
-}
-
-size_t Engine::getViewCount() const noexcept {
-    return downcast(this)->getViewCount();
-}
-
-size_t Engine::getSceneCount() const noexcept {
-    return downcast(this)->getSceneCount();
-}
-
-size_t Engine::getSwapChainCount() const noexcept {
-    return downcast(this)->getSwapChainCount();
-}
-
-size_t Engine::getStreamCount() const noexcept {
-    return downcast(this)->getStreamCount();
-}
-
-size_t Engine::getIndexBufferCount() const noexcept {
-    return downcast(this)->getIndexBufferCount();
-}
-
-size_t Engine::getSkinningBufferCount() const noexcept {
-    return downcast(this)->getSkinningBufferCount();
-}
-
-size_t Engine::getMorphTargetBufferCount() const noexcept {
-    return downcast(this)->getMorphTargetBufferCount();
-}
-
-size_t Engine::getInstanceBufferCount() const noexcept {
-    return downcast(this)->getInstanceBufferCount();
-}
-
-size_t Engine::getVertexBufferCount() const noexcept {
-    return downcast(this)->getVertexBufferCount();
-}
-
-size_t Engine::getIndirectLightCount() const noexcept {
-    return downcast(this)->getIndirectLightCount();
-}
-
-size_t Engine::getMaterialCount() const noexcept {
-    return downcast(this)->getMaterialCount();
-}
-
-size_t Engine::getTextureCount() const noexcept {
-    return downcast(this)->getTextureCount();
-}
-
-size_t Engine::getSkyboxeCount() const noexcept {
-    return downcast(this)->getSkyboxeCount();
-}
-
-size_t Engine::getColorGradingCount() const noexcept {
-    return downcast(this)->getColorGradingCount();
-}
-
-size_t Engine::getRenderTargetCount() const noexcept {
-    return downcast(this)->getRenderTargetCount();
-}
-
-
 void Engine::flushAndWait() {
    downcast(this)->flushAndWait();
 }
@@ -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
@@ -25,7 +25,6 @@
 #include <utils/FixedCapacityVector.h>
 #include <utils/Log.h>
 #include <utils/ostream.h>
-#include <utils/Systrace.h>

 #include <algorithm>
 #include <atomic>
@@ -79,33 +78,25 @@ void FrameInfoManager::beginFrame(DriverApi& driver, Config const& config, uint3
    });

    // now is a good time to check the oldest active query
-    while (mLast != mIndex) {
-        uint64_t elapsed = 0;
-        TimerQueryResult const result = driver.getTimerQueryValue(mQueries[mLast].handle, &elapsed);
-        switch (result) {
-            case TimerQueryResult::NOT_READY:
-                // nothing to do
-                break;
-            case TimerQueryResult::ERROR:
-                mLast = (mLast + 1) % POOL_COUNT;
-                break;
-            case TimerQueryResult::AVAILABLE: {
-                SYSTRACE_CONTEXT();
-                SYSTRACE_VALUE32("FrameInfo::elapsed", uint32_t(elapsed));
-                // conversion to our duration happens here
-                pFront = mQueries[mLast].pInfo;
-                pFront->frameTime = std::chrono::duration<uint64_t, std::nano>(elapsed);
-                mLast = (mLast + 1) % POOL_COUNT;
-                denoiseFrameTime(history, config);
-                break;
-            }
-        }
-        if (result != TimerQueryResult::AVAILABLE) {
+    uint64_t elapsed = 0;
+    TimerQueryResult const result = driver.getTimerQueryValue(mQueries[mLast].handle, &elapsed);
+    switch (result) {
+        case TimerQueryResult::NOT_READY:
+            // nothing to do
+            break;
+        case TimerQueryResult::ERROR:
+            mLast = (mLast + 1) % POOL_COUNT;
+            break;
+        case TimerQueryResult::AVAILABLE:
+            // conversion to our duration happens here
+            pFront = mQueries[mLast].pInfo;
+            pFront->frameTime = std::chrono::duration<uint64_t, std::nano>(elapsed);
+            mLast = (mLast + 1) % POOL_COUNT;
+            denoiseFrameTime(config);
            break;
-        }
-        // read the pending timer queries until we find one that's not ready
    }

+
    // keep this just for debugging
    if constexpr (false) {
        using namespace utils;
@@ -138,13 +129,15 @@ void FrameInfoManager::endFrame(DriverApi& driver) noexcept {
    mIndex = (mIndex + 1) % POOL_COUNT;
 }

-void FrameInfoManager::denoiseFrameTime(FrameHistoryQueue& history, Config const& config) noexcept {
+void FrameInfoManager::denoiseFrameTime(Config const& config) noexcept {
+    auto& history = mFrameTimeHistory;
    assert_invariant(!history.empty());

    // find the first slot that has a valid frame duration
    size_t first = history.size();
    for (size_t i = 0, c = history.size(); i < c; ++i) {
        if (history[i].frameTime != duration(0)) {
+            assert_invariant(std::addressof(history[i]) == pFront);
            first = i;
            break;
        }
@@ -163,16 +163,15 @@ public:
    // call this immediately before "swap buffers"
    void endFrame(backend::DriverApi& driver) noexcept;

-    details::FrameInfo getLastFrameInfo() const noexcept {
-        // if pFront is not set yet, return FrameInfo(). But the `valid` field will be false in this case.
-        return pFront ? *pFront : details::FrameInfo{};
+    details::FrameInfo const& getLastFrameInfo() const noexcept {
+        // if pFront is not set yet, return front() but in this case front().valid will be false
+        return pFront ? *pFront : mFrameTimeHistory.front();
    }

    utils::FixedCapacityVector<Renderer::FrameInfo> getFrameInfoHistory(size_t historySize) const noexcept;

 private:
-    using FrameHistoryQueue = CircularQueue<FrameInfoImpl, MAX_FRAMETIME_HISTORY>;
-    static void denoiseFrameTime(FrameHistoryQueue& history, Config const& config) noexcept;
+    void denoiseFrameTime(Config const& config) noexcept;
    struct Query {
        backend::Handle<backend::HwTimerQuery> handle{};
        FrameInfoImpl* pInfo = nullptr;
@@ -181,7 +180,7 @@ private:
    uint32_t mIndex = 0;                // index of current query
    uint32_t mLast = 0;                 // index of oldest query still active
    FrameInfoImpl* pFront = nullptr;    // the most recent slot with a valid frame time
-    FrameHistoryQueue mFrameTimeHistory;
+    CircularQueue<FrameInfoImpl, MAX_FRAMETIME_HISTORY> mFrameTimeHistory;
 };


@@ -16,22 +16,16 @@

 #include "FrameSkipper.h"

-#include <backend/DriverEnums.h>
-
-#include <utils/compiler.h>
+#include <utils/Log.h>
 #include <utils/debug.h>

-#include <algorithm>
-
-#include <stddef.h>
-
 namespace filament {

 using namespace utils;
 using namespace backend;

 FrameSkipper::FrameSkipper(size_t latency) noexcept
-        : mLast(std::max(latency, MAX_FRAME_LATENCY) - 1) {
+        : mLast(latency - 1) {
    assert_invariant(latency <= MAX_FRAME_LATENCY);
 }

@@ -47,32 +41,31 @@ void FrameSkipper::terminate(DriverApi& driver) noexcept {

 bool FrameSkipper::beginFrame(DriverApi& driver) noexcept {
    auto& fences = mDelayedFences;
-    if (fences.front()) {
-        // Do we have a latency old fence?
-        auto status = driver.getFenceStatus(fences.front());
-        if (UTILS_UNLIKELY(status == FenceStatus::TIMEOUT_EXPIRED)) {
-            // The fence hasn't signaled yet, skip this frame
+    auto fence = fences.front();
+    if (fence) {
+        auto status = driver.getFenceStatus(fence);
+        if (status == FenceStatus::TIMEOUT_EXPIRED) {
+            // Sync not ready, skip frame
            return false;
        }
        assert_invariant(status == FenceStatus::CONDITION_SATISFIED);
+        driver.destroyFence(fence);
    }
+    // shift all fences down by 1
+    std::move(fences.begin() + 1, fences.end(), fences.begin());
+    fences.back() = {};
    return true;
 }

 void FrameSkipper::endFrame(DriverApi& driver) noexcept {
-    auto& fences = mDelayedFences;
-    size_t const last = mLast;
-
-    // pop the oldest fence and advance the other ones
-    if (fences.front()) {
-        driver.destroyFence(fences.front());
+    // If the user produced a new frame despite the fact that the previous one wasn't finished
+    // (i.e. FrameSkipper::beginFrame() returned false), we need to make sure to replace
+    // a fence that might be here already)
+    auto& fence = mDelayedFences[mLast];
+    if (fence) {
+        driver.destroyFence(fence);
    }
-    std::move(fences.begin() + 1, fences.end(), fences.begin());
-
-    // add a new fence to the end
-    assert_invariant(!fences[last]);
-
-    fences[last] = driver.createFence();
+    fence = driver.createFence();
 }

 } // namespace filament
@@ -22,9 +22,6 @@

 #include <array>

-#include <stddef.h>
-#include <stdint.h>
-
 namespace filament {

 /*
@@ -63,7 +60,7 @@ public:
 private:
    using Container = std::array<backend::Handle<backend::HwFence>, MAX_FRAME_LATENCY>;
    mutable Container mDelayedFences{};
-    uint8_t const mLast;
+    size_t mLast;
 };

 } // namespace filament
@@ -354,12 +354,6 @@ bool MaterialParser::getSpecularAntiAliasingThreshold(float* value) const noexce
    return mImpl.getFromSimpleChunk(ChunkType::MaterialSpecularAntiAliasingThreshold, value);
 }

-bool MaterialParser::getStereoscopicType(backend::StereoscopicType* value) const noexcept {
-    static_assert(sizeof(StereoscopicType) == sizeof(uint8_t),
-            "StereoscopicType expected size is wrong");
-    return mImpl.getFromSimpleChunk(ChunkType::MaterialStereoscopicType, reinterpret_cast<uint8_t*>(value));
-}
-
 bool MaterialParser::getRequiredAttributes(AttributeBitset* value) const noexcept {
    uint32_t rawAttributes = 0;
    if (!mImpl.getFromSimpleChunk(ChunkType::MaterialRequiredAttributes, &rawAttributes)) {
@@ -122,7 +122,6 @@ public:
    bool hasSpecularAntiAliasing(bool* value) const noexcept;
    bool getSpecularAntiAliasingVariance(float* value) const noexcept;
    bool getSpecularAntiAliasingThreshold(float* value) const noexcept;
-    bool getStereoscopicType(backend::StereoscopicType*) const noexcept;

    bool getShader(filaflat::ShaderContent& shader, backend::ShaderModel shaderModel,
            Variant variant, backend::ShaderStage stage) noexcept;
@@ -494,6 +494,7 @@ PostProcessManager::StructurePassOutput PostProcessManager::structure(FrameGraph

    struct StructureMipmapData {
        FrameGraphId<FrameGraphTexture> depth;
+        uint32_t rt[8];
    };

    fg.addPass<StructureMipmapData>("StructureMipmap",
@@ -504,7 +505,7 @@ PostProcessManager::StructurePassOutput PostProcessManager::structure(FrameGraph
                            .level = uint8_t(i)
                    });
                    out = builder.write(out, FrameGraphTexture::Usage::DEPTH_ATTACHMENT);
-                    builder.declareRenderPass("Structure mip target", {
+                    data.rt[i - 1] = builder.declareRenderPass("Structure mip target", {
                            .attachments = { .depth = out }
                    });
                }
@@ -2945,10 +2946,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 +3004,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 +3032,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 +3044,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);

@@ -118,11 +118,10 @@ RenderPass::RenderPass(FEngine& engine, RenderPassBuilder const& builder) noexce
    uint32_t const customCommandCount =
            builder.mCustomCommands.has_value() ? builder.mCustomCommands->size() : 0;

-    Command* const commandBegin = builder.mArena.alloc<Command>(commandCount + customCommandCount);
-    Command* commandEnd = commandBegin + (commandCount + customCommandCount);
-    assert_invariant(commandBegin);
+    Command* const curr = builder.mArena.alloc<Command>(commandCount + customCommandCount);
+    assert_invariant(curr);

-    if (UTILS_UNLIKELY(builder.mArena.getAllocator().isHeapAllocation(commandBegin))) {
+    if (UTILS_UNLIKELY(builder.mArena.getAllocator().isHeapAllocation(curr))) {
        static bool sLogOnce = true;
        if (UTILS_UNLIKELY(sLogOnce)) {
            sLogOnce = false;
@@ -131,7 +130,10 @@ RenderPass::RenderPass(FEngine& engine, RenderPassBuilder const& builder) noexce
        }
    }

-    appendCommands(engine, { commandBegin, commandCount },
+    mCommandBegin = curr;
+    mCommandEnd = curr + commandCount + customCommandCount;
+
+    appendCommands(engine, { curr, commandCount },
            builder.mUboHandle,
            builder.mVisibleRenderables,
            builder.mCommandTypeFlags,
@@ -142,36 +144,32 @@ RenderPass::RenderPass(FEngine& engine, RenderPassBuilder const& builder) noexce
            builder.mCameraForwardVector);

    if (builder.mCustomCommands.has_value()) {
-        Command* p = commandBegin + commandCount;
+        Command* p = curr + commandCount;
        for (auto [channel, passId, command, order, fn]: builder.mCustomCommands.value()) {
            appendCustomCommand(p++, channel, passId, command, order, fn);
        }
    }

    // sort commands once we're done adding commands
-    commandEnd = resize(builder.mArena,
-            RenderPass::sortCommands(commandBegin, commandEnd));
+    sortCommands(builder.mArena);

    if (engine.isAutomaticInstancingEnabled()) {
        int32_t stereoscopicEyeCount = 1;
        if (builder.mFlags & IS_INSTANCED_STEREOSCOPIC) {
            stereoscopicEyeCount *= engine.getConfig().stereoscopicEyeCount;
        }
-        commandEnd = resize(builder.mArena,
-                instanceify(engine, commandBegin, commandEnd, stereoscopicEyeCount));
+        instanceify(engine, builder.mArena, stereoscopicEyeCount);
    }
-
-    // these are `const` from this point on...
-    mCommandBegin = commandBegin;
-    mCommandEnd = commandEnd;
 }

 // this destructor is actually heavy because it inlines ~vector<>
 RenderPass::~RenderPass() noexcept = default;

-RenderPass::Command* RenderPass::resize(Arena& arena, Command* const last) noexcept {
-    arena.rewind(last);
-    return last;
+void RenderPass::resize(Arena& arena, size_t count) noexcept {
+    if (mCommandBegin) {
+        mCommandEnd = mCommandBegin + count;
+        arena.rewind(mCommandEnd);
+    }
 }

 void RenderPass::appendCommands(FEngine& engine,
@@ -262,19 +260,18 @@ void RenderPass::appendCustomCommand(Command* commands,
    commands->key = cmd;
 }

-RenderPass::Command* RenderPass::sortCommands(
-        Command* const begin, Command* const end) noexcept {
-    SYSTRACE_NAME("sort commands");
+void RenderPass::sortCommands(Arena& arena) noexcept {
+    SYSTRACE_NAME("sort and trim commands");

-    std::sort(begin, end);
+    std::sort(mCommandBegin, mCommandEnd);

    // find the last command
-    Command* const last = std::partition_point(begin, end,
+    Command const* const last = std::partition_point(mCommandBegin, mCommandEnd,
            [](Command const& c) {
                return c.key != uint64_t(Pass::SENTINEL);
            });

-    return last;
+    resize(arena, uint32_t(last - mCommandBegin));
 }

 void RenderPass::execute(RenderPass const& pass,
@@ -287,9 +284,7 @@ void RenderPass::execute(RenderPass const& pass,
    driver.endRenderPass();
 }

-RenderPass::Command* RenderPass::instanceify(FEngine& engine,
-        Command* curr, Command* const last,
-        int32_t eyeCount) const noexcept {
+void RenderPass::instanceify(FEngine& engine, Arena& arena, int32_t eyeCount) noexcept {
    SYSTRACE_NAME("instanceify");

    // instanceify works by scanning the **sorted** command stream, looking for repeat draw
@@ -302,12 +297,14 @@ RenderPass::Command* RenderPass::instanceify(FEngine& engine,

    UTILS_UNUSED uint32_t drawCallsSavedCount = 0;

+    Command* curr = mCommandBegin;
+    Command* const last = mCommandEnd;
+
    Command* firstSentinel = nullptr;
    PerRenderableData const* uboData = nullptr;
    PerRenderableData* stagingBuffer = nullptr;
    uint32_t stagingBufferSize = 0;
    uint32_t instancedPrimitiveOffset = 0;
-    size_t const count = last - curr;

    // TODO: for the case of instancing we could actually use 128 instead of 64 instances
    constexpr size_t maxInstanceCount = CONFIG_MAX_INSTANCES;
@@ -346,6 +343,7 @@ RenderPass::Command* RenderPass::instanceify(FEngine& engine,
            if (UTILS_UNLIKELY(!stagingBuffer)) {

                // create a temporary UBO for instancing
+                size_t const count = mCommandEnd - mCommandBegin;
                mInstancedUboHandle = BufferObjectSharedHandle{
                        engine.getDriverApi().createBufferObject(
                                count * sizeof(PerRenderableData) + sizeof(PerRenderableUib),
@@ -387,7 +385,7 @@ RenderPass::Command* RenderPass::instanceify(FEngine& engine,

    if (UTILS_UNLIKELY(firstSentinel)) {
        //slog.d << "auto-instancing, saving " << drawCallsSavedCount << " draw calls, out of "
-        //       << count << io::endl;
+        //       << mCommandEnd - mCommandBegin << io::endl;

        // we have instanced primitives
        DriverApi& driver = engine.getDriverApi();
@@ -403,15 +401,14 @@ RenderPass::Command* RenderPass::instanceify(FEngine& engine,
        stagingBuffer = nullptr;

        // remove all the canceled commands
-        auto lastCommand = std::remove_if(firstSentinel, last, [](auto const& command) {
+        auto lastCommand = std::remove_if(firstSentinel, mCommandEnd, [](auto const& command) {
            return command.key == uint64_t(Pass::SENTINEL);
        });

-        return lastCommand;
+        resize(arena, uint32_t(lastCommand - mCommandBegin));
    }

    assert_invariant(stagingBuffer == nullptr);
-    return last;
 }


@@ -610,7 +607,7 @@ RenderPass::Command* RenderPass::generateCommandsImpl(RenderPass::CommandTypeFla
        //   Here, objects close to the camera (but behind) will be drawn first.
        // An alternative that keeps the mathematical ordering is given here:
        //   distanceBits ^= ((int32_t(distanceBits) >> 31) | 0x80000000u);
-        float const distance = -(dot(soaWorldAABBCenter[i], cameraForward) - cameraPositionDotCameraForward);
+        float const distance = -dot(soaWorldAABBCenter[i], cameraForward) - cameraPositionDotCameraForward;
        uint32_t const distanceBits = reinterpret_cast<uint32_t const&>(distance);

        // calculate the per-primitive face winding order inversion
@@ -408,16 +408,13 @@ private:
            uint8_t channel, Pass pass, CustomCommand custom, uint32_t order,
            Executor::CustomCommandFn command);

-    static Command* resize(Arena& arena, Command* const last) noexcept;
+    void resize(Arena& arena, size_t count) noexcept;

    // sorts commands then trims sentinels
-    static Command* sortCommands(
-            Command* begin, Command* end) noexcept;
+    void sortCommands(Arena& arena) noexcept;

    // instanceify commands then trims sentinels
-    RenderPass::Command* instanceify(FEngine& engine,
-            Command* begin, Command* end,
-            int32_t eyeCount) const noexcept;
+    void instanceify(FEngine& engine, Arena& arena, int32_t eyeCount) noexcept;

    // We choose the command count per job to minimize JobSystem overhead.
    static constexpr size_t JOBS_PARALLEL_FOR_COMMANDS_COUNT = 128;
@@ -451,10 +448,10 @@ private:

    FScene::RenderableSoa const& mRenderableSoa;
    backend::Viewport const mScissorViewport;
-    Command const* /* const */ mCommandBegin = nullptr;   // Pointer to the first command
-    Command const* /* const */ mCommandEnd = nullptr;     // Pointer to one past the last command
+    Command* mCommandBegin = nullptr;   // Pointer to the first command
+    Command* mCommandEnd = nullptr;     // Pointer to one past the last command
    // a UBO for instanced primitives
-    mutable BufferObjectSharedHandle mInstancedUboHandle;
+    BufferObjectSharedHandle mInstancedUboHandle;
    // a vector for our custom commands
    using CustomCommandVector = std::vector<Executor::CustomCommandFn,
            utils::STLAllocator<Executor::CustomCommandFn, LinearAllocatorArena>>;
@@ -16,10 +16,9 @@

 #include <filament/Renderer.h>

-#include "ResourceAllocator.h"
+#include "details/Renderer.h"

 #include "details/Engine.h"
-#include "details/Renderer.h"
 #include "details/View.h"

 #include <utils/FixedCapacityVector.h>
@@ -75,6 +75,7 @@ FrameGraphId<FrameGraphTexture> RendererUtils::colorPass(
                TargetBufferFlags const clearColorFlags = config.clearFlags & TargetBufferFlags::COLOR;
                TargetBufferFlags clearDepthFlags = config.clearFlags & TargetBufferFlags::DEPTH;
                TargetBufferFlags clearStencilFlags = config.clearFlags & TargetBufferFlags::STENCIL;
+                uint8_t layerCount = 0;

                data.shadows = blackboard.get<FrameGraphTexture>("shadows");
                data.ssao = blackboard.get<FrameGraphTexture>("ssao");
@@ -171,6 +172,9 @@ FrameGraphId<FrameGraphTexture> RendererUtils::colorPass(

                data.color = builder.write(data.color, FrameGraphTexture::Usage::COLOR_ATTACHMENT);
                data.depth = builder.write(data.depth, FrameGraphTexture::Usage::DEPTH_ATTACHMENT);
+                if (view.hasStereo() && engine.getConfig().stereoscopicType == StereoscopicType::MULTIVIEW) {
+                    layerCount = engine.getConfig().stereoscopicEyeCount;
+                }

                /*
                 * There is a bit of magic happening here regarding the viewport used.
@@ -192,7 +196,7 @@ FrameGraphId<FrameGraphTexture> RendererUtils::colorPass(
                        .stencil = data.stencil },
                        .clearColor = config.clearColor,
                        .samples = config.msaa,
-                        .layerCount = static_cast<uint8_t>(colorBufferDesc.depth),
+                        .layerCount = layerCount,
                        .clearFlags = clearColorFlags | clearDepthFlags | clearStencilFlags});
                blackboard["depth"] = data.depth;
            },
@@ -28,7 +28,6 @@ namespace filament {
 class ResourceListBase {
 public:
    using iterator = typename tsl::robin_set<void*>::iterator;
-    using const_iterator = typename tsl::robin_set<void*>::const_iterator;

    explicit ResourceListBase(const char* typeName);
    ResourceListBase(ResourceListBase&& rhs) noexcept = default;
@@ -59,14 +58,6 @@ public:
        return mList.end();
    }

-    const_iterator begin() const noexcept {
-        return mList.begin();
-    }
-
-    const_iterator end() const noexcept {
-        return mList.end();
-    }
-
 protected:
    void forEach(void(*f)(void* user, void *p), void* user) const noexcept;
    tsl::robin_set<void*> mList;
@@ -57,6 +57,9 @@ namespace filament {
 using namespace math;
 using namespace backend;

+// do this only if depth-clamp is available
+static constexpr bool USE_DEPTH_CLAMP = false;
+
 ShadowMap::ShadowMap(FEngine& engine) noexcept
        : mPerShadowMapUniforms(engine),
          mShadowType(ShadowType::DIRECTIONAL),
@@ -123,8 +126,7 @@ ShadowMap::ShaderParameters ShadowMap::updateDirectional(FEngine& engine,
        FScene::LightSoa const& lightData, size_t index,
        filament::CameraInfo const& camera,
        ShadowMapInfo const& shadowMapInfo,
-        SceneInfo const& sceneInfo,
-        bool useDepthClamp) noexcept {
+        SceneInfo const& sceneInfo) noexcept {

    // reset the visible shadow status
    mHasVisibleShadows = false;
@@ -135,20 +137,13 @@ ShadowMap::ShaderParameters ShadowMap::updateDirectional(FEngine& engine,

    const auto direction = lightData.elementAt<FScene::SHADOW_DIRECTION>(index);

-    auto const [Mv, znear, zfar, lsClippedShadowVolume, vertexCount, visibleShadows] =
-            computeDirectionalShadowBounds(engine, direction, params, camera, sceneInfo,
-                    useDepthClamp);
+    auto [Mv, znear, zfar, lsClippedShadowVolume, vertexCount, visibleShadows] =
+            computeDirectionalShadowBounds(engine, direction, params, camera, sceneInfo);

    if (UTILS_UNLIKELY(!visibleShadows)) {
        return {};
    }

-    // if the 2D bounds of the intersection is empty seen from the light, we have no shadow
-    Aabb const bounds = compute2DBounds(Mv, lsClippedShadowVolume.data(), vertexCount);
-    if (UTILS_UNLIKELY(!(bounds.min.x < bounds.max.x && bounds.min.y < bounds.max.y))) {
-        return {};
-    }
-
    /*
     * Compute the light's projection matrix
     * (directional/point lights, i.e. projection to use, including znear/zfar clip planes)
@@ -166,17 +161,12 @@ ShadowMap::ShaderParameters ShadowMap::updateDirectional(FEngine& engine,
    mat4f W, Wp, L;
    // We can't use LISPSM in stable mode
    const bool useLispsm = params.options.lispsm && !params.options.stable;
-
-    if (useLispsm ||
-            (!params.options.stable && !engine.debug.shadowmap.disable_light_frustum_align)) {
+    if (useLispsm) {
        // Orient the shadow map in the direction of the view vector by constructing a
        const float3 lsCameraFwd = Mv.upperLeft() * camera.getForwardVector();
        L = computeLightRotation(lsCameraFwd);
        LMp = L * Mp;
        LMpMv = LMp * Mv;
-    }
-
-    if (useLispsm) {
        W = applyLISPSM(Wp, camera, params,
                LMp, Mv, LMpMv, lsClippedShadowVolume, vertexCount, direction);
    }
@@ -194,7 +184,8 @@ ShadowMap::ShaderParameters ShadowMap::updateDirectional(FEngine& engine,
    //   In LiPSM mode, we're using the warped space here.
    float4 f = computeFocusParams(LMpMv, WLMp,
            lsClippedShadowVolume, vertexCount,
-            camera, params.options.shadowFar, params.options.stable);
+            camera, sceneInfo.csNearFar,
+            params.options.shadowFar, params.options.stable);

    if (params.options.stable) {
        const auto lsRef = lightData.elementAt<FScene::SHADOW_REF>(index);
@@ -395,8 +386,7 @@ ShadowMap::DirectionalShadowBounds ShadowMap::computeDirectionalShadowBounds(
        float3 const direction,
        FLightManager::ShadowParams params,
        filament::CameraInfo const& camera,
-        SceneInfo const& sceneInfo,
-        bool useDepthClamp) noexcept {
+        SceneInfo const& sceneInfo) noexcept {

    // we use aligned_storage<> here to avoid the default initialization of std::array<>
    using Storage = std::aligned_storage<sizeof(FrustumBoxIntersection)>::type;
@@ -458,49 +448,36 @@ ShadowMap::DirectionalShadowBounds ShadowMap::computeDirectionalShadowBounds(

    // Compute the intersection of the view volume with the intersection of receivers and casters
    // in light space. This returns a set of points on the convex-hull of the intersection.
-    mat4f const projection = camera.cullingProjection *
-            (camera.view * FCamera::rigidTransformInverse(MvAtOrigin));
    size_t const vertexCount = intersectFrustumWithBox(lsClippedShadowVolume,
-            projection, lsLightFrustumBounds);
+            camera.cullingProjection * camera.view * FCamera::rigidTransformInverse(MvAtOrigin),
+            sceneInfo.csNearFar, lsLightFrustumBounds);

    if (UTILS_UNLIKELY(vertexCount < 4)) {
        return {};
    }

    /*
-     * Adjust the scene's zmax (i.e. Near plane) and zmin (i.e. Far plane) in light space.
-     * (near/far correspond to max/min because the light looks down the -z axis).
-     *
-     *   - For the Far plane, the light frustum is already set to the closest of receivers and
-     *     casters (i.e.: shadow casters behind the last receivers can't cast any shadows).
-     *     But it can be moved closer up to the farthest point in the camera frustum & light
-     *     frustum intersection.
-     *
-     *  - The Near plane is already set to the shadow casters max z (i.e. closest to the light)
-     *
-     *  If "depth clamp" is supported, we can further tighten the near plane to the
-     *  shadow receiver (i.e. to the closest point of camera frustum & light frustum intersection).
-     *
-     *  Note: L has no influence here, since we're only interested in z values
-     *        (L is a rotation around z)
-     */
+    * Adjust the scene's zmax (i.e. Near plane) and zmin (i.e. Far plane) in light space.
+    * (near/far correspond to max/min because the light looks down the -z axis).
+    *  - The Near plane is set to the shadow casters max z (i.e. closest to the light)
+    *  - The Far plane is set to the closest of the farthest shadow casters and receivers
+    *    i.e.: shadow casters behind the last receivers can't cast any shadows
+    *
+    *  If "depth clamp" is supported, we can further tighten the near plane to the
+    *  shadow receiver.
+    *
+    *  Note: L has no influence here, since we're only interested in z values
+    *        (L is a rotation around z)
+    */

-    float lsClippedShadowVolumeFarthest = std::numeric_limits<float>::max();
-    float lsClippedShadowVolumeNearest = std::numeric_limits<float>::lowest();
    for (size_t i = 0; i < vertexCount; ++i) {
        float3 const v = lsClippedShadowVolume[i];
-        lsClippedShadowVolumeFarthest = std::min(lsClippedShadowVolumeFarthest, v.z);
-        lsClippedShadowVolumeNearest = std::max(lsClippedShadowVolumeNearest, v.z);
+        // far: figure out the farthest shadow receivers
+        lsLightFrustumBounds.min.z = min(lsLightFrustumBounds.min.z, v.z);
+        if constexpr (USE_DEPTH_CLAMP) {
+            lsLightFrustumBounds.max.z = max(lsLightFrustumBounds.max.z, v.z);
+        }
    }
-
-    lsLightFrustumBounds.min.z =
-            std::max(lsLightFrustumBounds.min.z, lsClippedShadowVolumeFarthest);
-
-    if (useDepthClamp) {
-        lsLightFrustumBounds.max.z =
-                std::min(lsLightFrustumBounds.max.z, lsClippedShadowVolumeNearest);
-    }
-
    if (engine.debug.shadowmap.far_uses_shadowcasters) {
        // far: closest of the farthest shadow casters and receivers
        lsLightFrustumBounds.min.z =
@@ -634,7 +611,7 @@ math::float4 ShadowMap::computeFocusParams(
        mat4f const& LMpMv,
        mat4f const& WLMp,
        FrustumBoxIntersection const& lsShadowVolume, size_t vertexCount,
-        filament::CameraInfo const& camera,
+        filament::CameraInfo const& camera, float2 const& csNearFar,
        float shadowFar, bool stable) noexcept {
    float2 s, o;
    if (stable) {
@@ -649,7 +626,7 @@ math::float4 ShadowMap::computeFocusParams(
                return wsViewVolumeBoundingSphere;
            } else {
                mat4f const viewFromClip = inverse(camera.cullingProjection);
-                Corners const wsFrustumVertices = computeFrustumCorners(viewFromClip);
+                Corners const wsFrustumVertices = computeFrustumCorners(viewFromClip, csNearFar);
                float4 const wsViewVolumeBoundingSphere =
                        computeBoundingSphere(wsFrustumVertices.vertices, 8);
                return wsViewVolumeBoundingSphere;
@@ -817,14 +794,15 @@ Aabb ShadowMap::compute2DBounds(const mat4f& lightView,
 }

 ShadowMap::Corners ShadowMap::computeFrustumCorners(
-        mat4f const& projectionInverse) noexcept {
+        mat4f const& projectionInverse,
+        float2 csNearFar) noexcept {

    Corners out;

    // compute view frustum in world space (from its NDC)
    // matrix to convert: ndc -> camera -> world
-    float const near = -1.0f;
-    float const far  =  1.0f;
+    float const near = csNearFar.x;
+    float const far  = csNearFar.y;

    Corners const csViewFrustumCorners = {
            .vertices = {
@@ -917,11 +895,11 @@ void ShadowMap::snapLightFrustum(float2& s, float2& o,

 size_t ShadowMap::intersectFrustumWithBox(
        FrustumBoxIntersection& UTILS_RESTRICT outVertices,
-        mat4f const& UTILS_RESTRICT projection,
+        mat4f const& UTILS_RESTRICT projection, math::float2 const& UTILS_RESTRICT csNearFar,
        Aabb const& UTILS_RESTRICT box)
 {
    Frustum const frustum{ projection };
-    Corners const frustumVertices{ computeFrustumCorners(inverse(projection)) };
+    Corners const frustumVertices{ computeFrustumCorners(inverse(projection), csNearFar) };

    constexpr const float EPSILON = 1.0f / 8192.0f; // ~0.012 mm
    size_t vertexCount = 0;
@@ -1225,11 +1203,12 @@ void ShadowMap::visitScene(const FScene& scene, uint32_t visibleLayers,
 }

 ShadowMap::SceneInfo::SceneInfo(
-        FScene const& scene, uint8_t visibleLayers) noexcept
-        : visibleLayers(visibleLayers) {
+        FScene const& scene, uint8_t visibleLayers, mat4f const& viewMatrix) noexcept
+        : vsNearFar(std::numeric_limits<float>::lowest(), std::numeric_limits<float>::max()),
+          visibleLayers(visibleLayers) {

    // the code below only works with affine transforms
-    // Filament's API requires viewMatrix to be rigid (and thus affine).
+    assert_invariant(transpose(viewMatrix)[3] == float4(0, 0, 0, 1));

    // We assume the light is at the origin to compute the SceneInfo. This is consumed later by
    // computeShadowCameraDirectional() which takes this into account.
@@ -1245,6 +1224,9 @@ ShadowMap::SceneInfo::SceneInfo(
            [&](Aabb receiver, Culler::result_type) {
                wsShadowReceiversVolume.min = min(wsShadowReceiversVolume.min, receiver.min);
                wsShadowReceiversVolume.max = max(wsShadowReceiversVolume.max, receiver.max);
+                auto r = Aabb::transform(viewMatrix.upperLeft(), viewMatrix[3].xyz, receiver);
+                vsNearFar.x = std::max(vsNearFar.x, r.max.z);
+                vsNearFar.y = std::min(vsNearFar.y, r.min.z);
            }
    );
 }
@@ -109,13 +109,20 @@ public:
    struct SceneInfo {

        SceneInfo() noexcept = default;
-        SceneInfo(FScene const& scene, uint8_t visibleLayers) noexcept;
+        SceneInfo(FScene const& scene, uint8_t visibleLayers, math::mat4f const& viewMatrix) noexcept;
+
+        // scratch data: The near and far planes, in clip space, to use for this shadow map
+        math::float2 csNearFar = { -1.0f, 1.0f };

        // scratch data: light's near/far expressed in light-space, calculated from the scene's
        // content assuming the light is at the origin.
        math::float2 lsCastersNearFar;
        math::float2 lsReceiversNearFar;

+        // Viewing camera's near/far expressed in view-space, calculated from the
+        // scene's content.
+        math::float2 vsNearFar;
+
        // World-space shadow-casters volume
        Aabb wsShadowCastersVolume;

@@ -147,8 +154,7 @@ public:
            const FScene::LightSoa& lightData, size_t index,
            filament::CameraInfo const& camera,
            ShadowMapInfo const& shadowMapInfo,
-            SceneInfo const& sceneInfo,
-            bool useDepthClamp) noexcept;
+            SceneInfo const& sceneInfo) noexcept;

    ShaderParameters updateSpot(FEngine& engine,
            const FScene::LightSoa& lightData, size_t index,
@@ -238,8 +244,7 @@ private:
            math::float3 direction,
            FLightManager::ShadowParams params,
            filament::CameraInfo const& camera,
-            SceneInfo const& sceneInfo,
-            bool useDepthClamp) noexcept;
+            SceneInfo const& sceneInfo) noexcept;

    static math::mat4f applyLISPSM(math::mat4f& Wp,
            filament::CameraInfo const& camera, FLightManager::ShadowParams const& params,
@@ -255,7 +260,7 @@ private:
            math::mat4f const& LMpMv,
            math::mat4f const& WLMp,
            FrustumBoxIntersection const& lsShadowVolume, size_t vertexCount,
-            filament::CameraInfo const& camera,
+            filament::CameraInfo const& camera, math::float2 const& csNearFar,
            float shadowFar, bool stable) noexcept;

    static inline void snapLightFrustum(math::float2& s, math::float2& o,
@@ -266,7 +271,8 @@ private:
            SceneInfo const& sceneInfo,
            bool stable, bool focusShadowCasters, bool farUsesShadowCasters) noexcept;

-    static Corners computeFrustumCorners(const math::mat4f& projectionInverse) noexcept;
+    static Corners computeFrustumCorners(const math::mat4f& projectionInverse,
+            math::float2 csNearFar = { -1.0f, 1.0f }) noexcept;

    static inline math::float2 computeNearFar(math::mat4f const& view,
            math::float3 const* wsVertices, size_t count) noexcept;
@@ -301,7 +307,7 @@ private:

    static size_t intersectFrustumWithBox(
            FrustumBoxIntersection& outVertices,
-            math::mat4f const& projection,
+            math::mat4f const& projection, math::float2 const& csNearFar,
            Aabb const& box);

    static math::mat4f warpFrustum(float n, float f) noexcept;
@@ -39,20 +39,17 @@
 #include <backend/DriverApiForward.h>
 #include <backend/DriverEnums.h>

-#include <utils/compiler.h>
-#include <utils/debug.h>
 #include <utils/FixedCapacityVector.h>
-#include <utils/BitmaskEnum.h>
 #include <utils/Range.h>
 #include <utils/Slice.h>
+#include <utils/compiler.h>
+#include <utils/debug.h>

 #include <math/half.h>
 #include <math/mat4.h>
 #include <math/vec4.h>
 #include <math/scalar.h>

-#include <algorithm>
-#include <array>
 #include <cmath>
 #include <limits>
 #include <new>
@@ -66,15 +63,12 @@ namespace filament {
 using namespace backend;
 using namespace math;

-// do this only if depth-clamp is available
-static constexpr bool USE_DEPTH_CLAMP = false;
-
 ShadowMapManager::ShadowMapManager(FEngine& engine) {
    FDebugRegistry& debugRegistry = engine.getDebugRegistry();
    debugRegistry.registerProperty("d.shadowmap.visualize_cascades",
            &engine.debug.shadowmap.visualize_cascades);
-    debugRegistry.registerProperty("d.shadowmap.disable_light_frustum_align",
-            &engine.debug.shadowmap.disable_light_frustum_align);
+    debugRegistry.registerProperty("d.shadowmap.tightly_bound_scene",
+            &engine.debug.shadowmap.tightly_bound_scene);
 }

 ShadowMapManager::~ShadowMapManager() {
@@ -153,7 +147,7 @@ ShadowMapManager::ShadowTechnique ShadowMapManager::update(
    calculateTextureRequirements(engine, view, lightData);

    // Compute scene-dependent values shared across all shadow maps
-    ShadowMap::SceneInfo const info{ *view.getScene(), view.getVisibleLayers() };
+    ShadowMap::SceneInfo const info{ *view.getScene(), view.getVisibleLayers(), cameraInfo.view };

    shadowTechnique |= updateCascadeShadowMaps(
            engine, view, cameraInfo, renderableData, lightData, info);
@@ -549,9 +543,65 @@ ShadowMapManager::ShadowTechnique ShadowMapManager::updateCascadeShadowMaps(FEng
    FLightManager::ShadowParams const& params = lcm.getShadowParams(directionalLight);

    // Adjust the camera's projection for the light's shadowFar
+    cameraInfo.zf = params.options.shadowFar > 0.0f ? params.options.shadowFar : cameraInfo.zf;
    if (UTILS_UNLIKELY(params.options.shadowFar > 0.0f)) {
        cameraInfo.zf = params.options.shadowFar;
-        updateNearFarPlanes(&cameraInfo.cullingProjection, cameraInfo.zn, cameraInfo.zf);
+        float const n = cameraInfo.zn;
+        float const f = cameraInfo.zf;
+
+        /*
+         *  Updating a projection matrix near and far planes:
+         *
+         *  We assume that the near and far plane equations are of the form:
+         *           N = { 0, 0,  1,  n }
+         *           F = { 0, 0, -1, -f }
+         *
+         *  We also assume that the lower-left 2x2 of the projection is all 0:
+         *       P =   A   0   C   0
+         *             0   B   D   0
+         *             0   0   E   F
+         *             0   0   G   H
+         *
+         *  It result that we need to calculate E and F while leaving all other parameter unchanged.
+         *
+         *  We know that:
+         *       with N, F the near/far normalized plane equation parameters
+         *            sn, sf arbitrary scale factors (they don't affect the planes)
+         *            m is the transpose of projection (see Frustum.cpp)
+         *
+         *       sn * N == -m[3] - m[2]
+         *       sf * F == -m[3] + m[2]
+         *
+         *       sn * N + sf * F == -2 * m[3]
+         *       sn * N - sf * F == -2 * m[2]
+         *
+         *       sn * N.z + sf * F.z == -2 * m[3].z
+         *       sn * N.w + sf * F.w == -2 * m[3].w
+         *       sn * N.z - sf * F.z == -2 * m[2].z
+         *       sn * N.w - sf * F.w == -2 * m[2].w
+         *
+         *       sn * N.z + sf * F.z == -2 * p[2].w
+         *       sn * N.w + sf * F.w == -2 * p[3].w
+         *       sn * N.z - sf * F.z == -2 * p[2].z
+         *       sn * N.w - sf * F.w == -2 * p[3].z
+         *
+         *  We now need to solve for { p[2].z, p[3].z, sn, sf } :
+         *
+         *       sn == -2 * (p[2].w * F.w - p[3].w * F.z) / (N.z * F.w - N.w * F.z)
+         *       sf == -2 * (p[2].w * N.w - p[3].w * N.z) / (F.z * N.w - F.w * N.z)
+         *   p[2].z == (sf * F.z - sn * N.z) / 2
+         *   p[3].z == (sf * F.w - sn * N.w) / 2
+         */
+        auto& p = cameraInfo.cullingProjection;
+        float4 const N = { 0, 0,  1,  n };  // near plane equation
+        float4 const F = { 0, 0, -1, -f };  // far plane equation
+        // near plane equation scale factor
+        float const sn = -2.0f * (p[2].w * F.w - p[3].w * F.z) / (N.z * F.w - N.w * F.z);
+        // far plane equation scale factor
+        float const sf = -2.0f * (p[2].w * N.w - p[3].w * N.z) / (F.z * N.w - F.w * N.z);
+        // New values for the projection
+        p[2].z = (sf * F.z - sn * N.z) * 0.5f;
+        p[3].z = (sf * F.w - sn * N.w) * 0.5f;
    }

    const ShadowMap::ShadowMapInfo shadowMapInfo{
@@ -581,10 +631,8 @@ ShadowMapManager::ShadowTechnique ShadowMapManager::updateCascadeShadowMaps(FEng
        // Compute scene-dependent values shared across all cascades
        ShadowMap::updateSceneInfoDirectional(MvAtOrigin, *scene, sceneInfo);

-        // we always do culling without depth clamp, because objects behind the camera
-        // must be rendered regardless
        shadowMap.updateDirectional(engine,
-                lightData, 0, cameraInfo, shadowMapInfo, sceneInfo, false);
+                lightData, 0, cameraInfo, shadowMapInfo, sceneInfo);

        hasVisibleShadows = shadowMap.hasVisibleShadows();

@@ -600,7 +648,15 @@ ShadowMapManager::ShadowTechnique ShadowMapManager::updateCascadeShadowMaps(FEng
    uint32_t cascadeHasVisibleShadows = 0;

    if (hasVisibleShadows) {
-        uint32_t const cascadeCount = cascadedShadowMaps.size();
+        // Adjust the near and far planes to tightly bound the scene.
+        float vsNear = -cameraInfo.zn;
+        float vsFar = -cameraInfo.zf;
+        if (engine.debug.shadowmap.tightly_bound_scene && !params.options.stable) {
+            vsNear = std::min(vsNear, sceneInfo.vsNearFar.x);
+            vsFar = std::max(vsFar, sceneInfo.vsNearFar.y);
+        }
+
+        const size_t cascadeCount = cascadedShadowMaps.size();

        // We divide the camera frustum into N cascades. This gives us N + 1 split positions.
        // The first split position is the near plane; the last split position is the far plane.
@@ -611,8 +667,9 @@ ShadowMapManager::ShadowTechnique ShadowMapManager::updateCascadeShadowMaps(FEng
        }

        const CascadeSplits splits({
-                .near = -cameraInfo.zn,
-                .far = -cameraInfo.zf,
+                .proj = cameraInfo.cullingProjection,
+                .near = vsNear,
+                .far = vsFar,
                .cascadeCount = cascadeCount,
                .splitPositions = splitPercentages
        });
@@ -622,7 +679,10 @@ ShadowMapManager::ShadowTechnique ShadowMapManager::updateCascadeShadowMaps(FEng
        static_assert(CONFIG_MAX_SHADOW_CASCADES <= 5,
                "At most, a float4 can fit 4 split positions for 5 shadow cascades");
        float4 wsSplitPositionUniform{ -std::numeric_limits<float>::infinity() };
-        std::copy(splits.begin() + 1, splits.end(), &wsSplitPositionUniform[0]);
+        std::copy(splits.beginWs() + 1, splits.endWs(), &wsSplitPositionUniform[0]);
+
+        float csSplitPosition[CONFIG_MAX_SHADOW_CASCADES + 1];
+        std::copy(splits.beginCs(), splits.endCs(), csSplitPosition);

        mShadowMappingUniforms.cascadeSplits = wsSplitPositionUniform;

@@ -635,14 +695,10 @@ ShadowMapManager::ShadowTechnique ShadowMapManager::updateCascadeShadowMaps(FEng
            ShadowMap& shadowMap = cascadedShadowMaps[i];
            assert_invariant(shadowMap.getLightIndex() == 0);

-            // update cameraInfo culling projection for the cascade
-            float const* nearFarPlanes = splits.begin();
-            cameraInfo.zn = -nearFarPlanes[i];
-            cameraInfo.zf = -nearFarPlanes[i + 1];
-            updateNearFarPlanes(&cameraInfo.cullingProjection, cameraInfo.zn, cameraInfo.zf);
+            sceneInfo.csNearFar = { csSplitPosition[i], csSplitPosition[i + 1] };

            auto shaderParameters = shadowMap.updateDirectional(engine,
-                    lightData, 0, cameraInfo, shadowMapInfo, sceneInfo, USE_DEPTH_CLAMP);
+                    lightData, 0, cameraInfo, shadowMapInfo, sceneInfo);

            if (shadowMap.hasVisibleShadows()) {
                const size_t shadowIndex = shadowMap.getShadowIndex();
@@ -1013,78 +1069,8 @@ ShadowMapManager::CascadeSplits::CascadeSplits(Params const& params) noexcept
        : mSplitCount(params.cascadeCount + 1) {
    for (size_t s = 0; s < mSplitCount; s++) {
        mSplitsWs[s] = params.near + (params.far - params.near) * params.splitPositions[s];
+        mSplitsCs[s] = mat4f::project(params.proj, float3(0.0f, 0.0f, mSplitsWs[s])).z;
    }
 }

-void ShadowMapManager::updateNearFarPlanes(mat4f* projection,
-        float nearDistance, float farDistance) noexcept {
-    float const n = nearDistance;
-    float const f = farDistance;
-
-    /*
-     *  Updating a projection matrix near and far planes:
-     *
-     *  We assume that the near and far plane equations are of the form:
-     *           N = { 0, 0,  1,  n }
-     *           F = { 0, 0, -1, -f }
-     *
-     *  We also assume that the lower-left 2x2 of the projection is all 0:
-     *       P =   A   0   C   0
-     *             0   B   D   0
-     *             0   0   E   F
-     *             0   0   G   H
-     *
-     *  It result that we need to calculate E and F while leaving all other parameter unchanged.
-     *
-     *  We know that:
-     *       with N, F the near/far normalized plane equation parameters
-     *            sn, sf arbitrary scale factors (they don't affect the planes)
-     *            m is the transpose of projection (see Frustum.cpp)
-     *
-     *       sn * N == -m[3] - m[2]
-     *       sf * F == -m[3] + m[2]
-     *
-     *       sn * N + sf * F == -2 * m[3]
-     *       sn * N - sf * F == -2 * m[2]
-     *
-     *       sn * N.z + sf * F.z == -2 * m[3].z
-     *       sn * N.w + sf * F.w == -2 * m[3].w
-     *       sn * N.z - sf * F.z == -2 * m[2].z
-     *       sn * N.w - sf * F.w == -2 * m[2].w
-     *
-     *       sn * N.z + sf * F.z == -2 * p[2].w
-     *       sn * N.w + sf * F.w == -2 * p[3].w
-     *       sn * N.z - sf * F.z == -2 * p[2].z
-     *       sn * N.w - sf * F.w == -2 * p[3].z
-     *
-     *  We now need to solve for { p[2].z, p[3].z, sn, sf } :
-     *
-     *       sn == -2 * (p[2].w * F.w - p[3].w * F.z) / (N.z * F.w - N.w * F.z)
-     *       sf == -2 * (p[2].w * N.w - p[3].w * N.z) / (F.z * N.w - F.w * N.z)
-     *   p[2].z == (sf * F.z - sn * N.z) / 2
-     *   p[3].z == (sf * F.w - sn * N.w) / 2
-     */
-    auto& p = *projection;
-    float4 const N = { 0, 0,  1,  n };  // near plane equation
-    float4 const F = { 0, 0, -1, -f };  // far plane equation
-    // near plane equation scale factor
-    float const sn = -2.0f * (p[2].w * F.w - p[3].w * F.z) / (N.z * F.w - N.w * F.z);
-    // far plane equation scale factor
-    float const sf = -2.0f * (p[2].w * N.w - p[3].w * N.z) / (F.z * N.w - F.w * N.z);
-    // New values for the projection
-    p[2].z = (sf * F.z - sn * N.z) * 0.5f;
-    p[3].z = (sf * F.w - sn * N.w) * 0.5f;
-}
-
-utils::FixedCapacityVector<Camera const*>
-ShadowMapManager::getDirectionalShadowCameras() const noexcept {
-    if (!mInitialized) return {};
-    auto const csm = getCascadedShadowMap();
-    auto result = utils::FixedCapacityVector<Camera const*>::with_capacity(csm.size());
-    for (ShadowMap const& sm : csm) {
-        result.push_back(sm.hasVisibleShadows() ? sm.getDebugCamera() : nullptr);
-    }
-    return result;
-}
-
 } // namespace filament
@@ -40,7 +40,6 @@

 #include <utils/BitmaskEnum.h>
 #include <utils/compiler.h>
-#include <utils/FixedCapacityVector.h>
 #include <utils/debug.h>
 #include <utils/Range.h>
 #include <utils/Slice.h>
@@ -59,7 +58,6 @@

 namespace filament {

-class Camera;
 class FCamera;
 class FView;
 class FrameGraph;
@@ -140,16 +138,16 @@ public:
    bool hasSpotShadows() const { return !mSpotShadowMapCount; }

    // for debugging only
-    utils::FixedCapacityVector<Camera const*> getDirectionalShadowCameras() const noexcept;
+    FCamera const* getDirectionalShadowCamera() const noexcept {
+        if (!mInitialized) return nullptr;
+        return getShadowMap(0).getDebugCamera();
+    }

 private:
    explicit ShadowMapManager(FEngine& engine);

    void terminate(FEngine& engine);

-    static void updateNearFarPlanes(math::mat4f* projection,
-            float nearDistance, float farDistance) noexcept;
-
    ShadowMapManager::ShadowTechnique updateCascadeShadowMaps(FEngine& engine,
            FView& view, CameraInfo cameraInfo, FScene::RenderableSoa& renderableData,
            FScene::LightSoa const& lightData, ShadowMap::SceneInfo sceneInfo) noexcept;
@@ -188,21 +186,27 @@ private:
        constexpr static size_t SPLIT_COUNT = CONFIG_MAX_SHADOW_CASCADES + 1;

        struct Params {
+            math::mat4f proj;
            float near = 0.0f;
            float far = 0.0f;
-            uint32_t cascadeCount = 1;
+            size_t cascadeCount = 1;
            std::array<float, SPLIT_COUNT> splitPositions = { 0.0f };
        };

        explicit CascadeSplits(Params const& params) noexcept;

        // Split positions in world-space.
-        const float* begin() const { return mSplitsWs; }
-        const float* end() const { return mSplitsWs + mSplitCount; }
+        const float* beginWs() const { return mSplitsWs; }
+        const float* endWs() const { return mSplitsWs + mSplitCount; }
+
+        // Split positions in clip-space.
+        const float* beginCs() const { return mSplitsCs; }
+        const float* endCs() const { return mSplitsCs + mSplitCount; }

    private:
        float mSplitsWs[SPLIT_COUNT];
-        uint32_t mSplitCount;
+        float mSplitsCs[SPLIT_COUNT];
+        size_t mSplitCount;
    };

    // Atlas requirements, updated in ShadowMapManager::update(),
@@ -244,14 +248,10 @@ private:
    }

    utils::Slice<ShadowMap> getCascadedShadowMap() noexcept {
-        ShadowMap const* const p = &getShadowMap(0);
+        ShadowMap* const p = &getShadowMap(0);
        return { p, mDirectionalShadowMapCount };
    }

-    utils::Slice<ShadowMap> getCascadedShadowMap() const noexcept {
-        return const_cast<ShadowMapManager*>(this)->getCascadedShadowMap();
-    }
-
    utils::Slice<ShadowMap> getSpotShadowMaps() noexcept {
        ShadowMap* const p = &getShadowMap(CONFIG_MAX_SHADOW_CASCADES);
        return { p, mSpotShadowMapCount };
@@ -73,8 +73,8 @@ const char* View::getName() const noexcept {
    return downcast(this)->getName();
 }

-utils::FixedCapacityVector<Camera const*> View::getDirectionalShadowCameras() const noexcept {
-    return downcast(this)->getDirectionalShadowCameras();
+Camera const* View::getDirectionalShadowCamera() const noexcept {
+    return downcast(this)->getDirectionalShadowCamera();
 }

 void View::setShadowingEnabled(bool enabled) noexcept {
@@ -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;
@@ -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) {
@@ -118,32 +118,19 @@ template bool FDebugRegistry::getProperty<float2>(const char* name, float2* v) c
 template bool FDebugRegistry::getProperty<float3>(const char* name, float3* v) const noexcept;
 template bool FDebugRegistry::getProperty<float4>(const char* name, float4* v) const noexcept;

-bool FDebugRegistry::registerDataSource(std::string_view name,
+void FDebugRegistry::registerDataSource(std::string_view name,
        void const* data, size_t count) noexcept {
    auto& dataSourceMap = mDataSourceMap;
-    bool const found = dataSourceMap.find(name) == dataSourceMap.end();
-    if (found) {
+    if (dataSourceMap.find(name) == dataSourceMap.end()) {
        dataSourceMap[name] = { data, count };
    }
-    return found;
 }

-bool FDebugRegistry::registerDataSource(std::string_view name,
+void FDebugRegistry::registerDataSource(std::string_view name,
        utils::Invocable<DataSource()>&& creator) noexcept {
-    auto& dataSourceCreatorMap = mDataSourceCreatorMap;
-    bool const found = dataSourceCreatorMap.find(name) == dataSourceCreatorMap.end();
-    if (found) {
-        dataSourceCreatorMap[name] = std::move(creator);
-    }
-    return found;
+    mDataSourceCreatorMap[name] = std::move(creator);
 }

-void FDebugRegistry::unregisterDataSource(std::string_view name) noexcept {
-    mDataSourceCreatorMap.erase(name);
-    mDataSourceMap.erase(name);
-}
-
-
 DebugRegistry::DataSource FDebugRegistry::getDataSource(const char* name) const noexcept {
    std::string_view const key{ name };
    auto& dataSourceMap = mDataSourceMap;
@@ -101,14 +101,12 @@ public:
    }

    // registers a DataSource directly
-    bool registerDataSource(std::string_view name, void const* data, size_t count) noexcept;
+    void registerDataSource(std::string_view name, void const* data, size_t count) noexcept;

    // registers a DataSource lazily
-    bool registerDataSource(std::string_view name,
+    void registerDataSource(std::string_view name,
            utils::Invocable<DataSource()>&& creator) noexcept;

-    void unregisterDataSource(std::string_view name) noexcept;
-
 #if !defined(_MSC_VER)
 private:
 #endif
@@ -71,7 +71,7 @@ struct Engine::BuilderDetails {
    FeatureLevel mFeatureLevel = FeatureLevel::FEATURE_LEVEL_1;
    void* mSharedContext = nullptr;
    bool mPaused = false;
-    static Config validateConfig(Config config) noexcept;
+    static Config validateConfig(const Config* pConfig) noexcept;
 };

 Engine* FEngine::create(Engine::Builder const& builder) {
@@ -1197,22 +1197,6 @@ bool FEngine::isValid(const FInstanceBuffer* p) const {
    return isValid(p, mInstanceBuffers);
 }

-size_t FEngine::getBufferObjectCount() const noexcept { return mBufferObjects.size(); }
-size_t FEngine::getViewCount() const noexcept { return mViews.size(); }
-size_t FEngine::getSceneCount() const noexcept { return mScenes.size(); }
-size_t FEngine::getSwapChainCount() const noexcept { return mSwapChains.size(); }
-size_t FEngine::getStreamCount() const noexcept { return mStreams.size(); }
-size_t FEngine::getIndexBufferCount() const noexcept { return mIndexBuffers.size(); }
-size_t FEngine::getSkinningBufferCount() const noexcept { return mSkinningBuffers.size(); }
-size_t FEngine::getMorphTargetBufferCount() const noexcept { return mMorphTargetBuffers.size(); }
-size_t FEngine::getInstanceBufferCount() const noexcept { return mInstanceBuffers.size(); }
-size_t FEngine::getVertexBufferCount() const noexcept { return mVertexBuffers.size(); }
-size_t FEngine::getIndirectLightCount() const noexcept { return mIndirectLights.size(); }
-size_t FEngine::getMaterialCount() const noexcept { return mMaterials.size(); }
-size_t FEngine::getTextureCount() const noexcept { return mTextures.size(); }
-size_t FEngine::getSkyboxeCount() const noexcept { return mSkyboxes.size(); }
-size_t FEngine::getColorGradingCount() const noexcept { return mColorGradings.size(); }
-size_t FEngine::getRenderTargetCount() const noexcept { return mRenderTargets.size(); }

 void* FEngine::streamAlloc(size_t size, size_t alignment) noexcept {
    // we allow this only for small allocations
@@ -1302,7 +1286,7 @@ Engine::Builder& Engine::Builder::platform(Platform* platform) noexcept {
 }

 Engine::Builder& Engine::Builder::config(Engine::Config const* config) noexcept {
-    mImpl->mConfig = config ? *config : Engine::Config{};
+    mImpl->mConfig = BuilderDetails::validateConfig(config);
    return *this;
 }

@@ -1330,15 +1314,22 @@ void Engine::Builder::build(Invocable<void(void*)>&& callback) const {
 #endif

 Engine* Engine::Builder::build() const {
-    mImpl->mConfig = BuilderDetails::validateConfig(mImpl->mConfig);
    return FEngine::create(*this);
 }

-Engine::Config Engine::BuilderDetails::validateConfig(Config config) noexcept {
+Engine::Config Engine::BuilderDetails::validateConfig(const Config* const pConfig) noexcept {
    // Rule of thumb: perRenderPassArenaMB must be roughly 1 MB larger than perFrameCommandsMB
    constexpr uint32_t COMMAND_ARENA_OVERHEAD = 1;
    constexpr uint32_t CONCURRENT_FRAME_COUNT = 3;

+    Config config;
+    if (!pConfig) {
+        return config;
+    }
+
+    // make sure to copy all the fields
+    config = *pConfig;
+
    // Use at least the defaults set by the build system
    config.minCommandBufferSizeMB = std::max(
            config.minCommandBufferSizeMB,
@@ -351,23 +351,6 @@ public:
    bool isValid(const FView* p) const;
    bool isValid(const FInstanceBuffer* p) const;

-    size_t getBufferObjectCount() const noexcept;
-    size_t getViewCount() const noexcept;
-    size_t getSceneCount() const noexcept;
-    size_t getSwapChainCount() const noexcept;
-    size_t getStreamCount() const noexcept;
-    size_t getIndexBufferCount() const noexcept;
-    size_t getSkinningBufferCount() const noexcept;
-    size_t getMorphTargetBufferCount() const noexcept;
-    size_t getInstanceBufferCount() const noexcept;
-    size_t getVertexBufferCount() const noexcept;
-    size_t getIndirectLightCount() const noexcept;
-    size_t getMaterialCount() const noexcept;
-    size_t getTextureCount() const noexcept;
-    size_t getSkyboxeCount() const noexcept;
-    size_t getColorGradingCount() const noexcept;
-    size_t getRenderTargetCount() const noexcept;
-
    void destroy(utils::Entity e);

    bool isPaused() const noexcept;
@@ -590,8 +573,7 @@ private:
    Config mConfig;

 public:
-    // These are the debug properties used by FDebug.
-    // They're accessed directly by modules who need them.
+    // these are the debug properties used by FDebug. They're accessed directly by modules who need them.
    struct {
        struct {
            bool debug_directional_shadowmap = false;
@@ -599,7 +581,7 @@ public:
            bool far_uses_shadowcasters = true;
            bool focus_shadowcasters = true;
            bool visualize_cascades = false;
-            bool disable_light_frustum_align = false;
+            bool tightly_bound_scene = true;
            float dzn = -1.0f;
            float dzf =  1.0f;
            float display_shadow_texture_scale = 0.25f;
@@ -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) {
@@ -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);
@@ -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;
 };

@@ -192,30 +192,6 @@ 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) {
-        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;
-            }
-        }
-    }
-
    return downcast(engine).createMaterial(*this, std::move(materialParser));
 }

@@ -224,7 +200,8 @@ FMaterial::FMaterial(FEngine& engine, const Material::Builder& builder,
        : mIsDefaultMaterial(builder->mDefaultMaterial),
          mEngine(engine),
          mMaterialId(engine.getMaterialId()),
-          mMaterialParser(std::move(materialParser)) {
+          mMaterialParser(std::move(materialParser))
+{
    MaterialParser* const parser = mMaterialParser.get();

    UTILS_UNUSED_IN_RELEASE bool const nameOk = parser->getName(&mName);
@@ -618,7 +595,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;
 }
@@ -897,7 +873,7 @@ void FMaterial::processSpecializationConstants(FEngine& engine, Material::Builde
            engine.getDriverApi().getMaxUniformBufferSize() / 16u);

    bool const staticTextureWorkaround =
-            engine.getDriverApi().isWorkaroundNeeded(Workaround::METAL_STATIC_TEXTURE_TARGET_ERROR);
+            engine.getDriverApi().isWorkaroundNeeded(Workaround::A8X_STATIC_TEXTURE_TARGET_ERROR);

    bool const powerVrShaderWorkarounds =
            engine.getDriverApi().isWorkaroundNeeded(Workaround::POWER_VR_SHADER_WORKAROUNDS);
@@ -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()) {
@@ -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"));
@@ -344,14 +344,10 @@ bool FRenderer::beginFrame(FSwapChain* swapChain, uint64_t vsyncSteadyClockTimeN
    * to ignore the return value and render the frame anyway -- which is perfectly fine.
    * The remaining work will be done when the first render() call is made.
    */
-    auto beginFrameInternal = [this, appVsync, swapChain]() {
+    auto beginFrameInternal = [this, appVsync]() {
        FEngine& engine = mEngine;
        FEngine::DriverApi& driver = engine.getDriverApi();

-        // we need to re-set mSwapChain here because if a frame was marked as "skip" but the
-        // user ignored us, we'd still want mSwapChain to be set.
-        mSwapChain = swapChain;
-
        driver.beginFrame(
                appVsync.time_since_epoch().count(),
                mDisplayInfo.refreshRate == 0.0 ? 0 : int64_t(
@@ -380,10 +376,6 @@ bool FRenderer::beginFrame(FSwapChain* swapChain, uint64_t vsyncSteadyClockTimeN
    // so we need to delay this work until that happens.
    mBeginFrameInternal = beginFrameInternal;

-    // clear mSwapChain because the frame should be skipped (it will be re-set if the user
-    // ignores the skip)
-    mSwapChain = nullptr;
-
    // we need to flush in this case, to make sure the tick() call is executed at some point
    engine.flush();

@@ -542,6 +534,8 @@ void FRenderer::renderStandaloneView(FView const* view) {
 void FRenderer::render(FView const* view) {
    SYSTRACE_CALL();

+    assert_invariant(mSwapChain);
+
    if (UTILS_UNLIKELY(mBeginFrameInternal)) {
        // this should not happen, the user should not call render() if we returned false from
        // beginFrame(). But because this is allowed, we handle it gracefully.
@@ -549,9 +543,6 @@ void FRenderer::render(FView const* view) {
        mBeginFrameInternal = {};
    }

-    // after beginFrame() is called, mSwapChain should be true
-    assert_invariant(mSwapChain);
-
    if (UTILS_LIKELY(view && view->getScene() && view->hasCamera())) {
        if (mViewRenderedCount) {
            // This is a good place to kick the GPU, since we've rendered a View before,
@@ -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);
@@ -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 {
@@ -243,9 +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));
-    }
 }

 // frees driver resources, object becomes invalid
@@ -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;
                }
@@ -31,17 +31,15 @@
 #include "details/Skybox.h"

 #include <filament/Exposure.h>
-#include <filament/DebugRegistry.h>
 #include <filament/TextureSampler.h>
 #include <filament/View.h>

 #include <private/filament/UibStructs.h>

-#include <utils/compiler.h>
-#include <utils/debug.h>
 #include <utils/Profiler.h>
 #include <utils/Slice.h>
 #include <utils/Systrace.h>
+#include <utils/debug.h>
 #include <utils/Zip2Iterator.h>

 #include <math/scalar.h>
@@ -49,7 +47,6 @@

 #include <array>
 #include <memory>
-#include <tuple>

 using namespace utils;

@@ -81,29 +78,21 @@ FView::FView(FEngine& engine)
    mPidController.setOutputDeadBand(-0.01f, 0.05f);

 #ifndef NDEBUG
-    // This can fail if another view has already registered this data source
-    mDebugState->owner = debugRegistry.registerDataSource("d.view.frame_info",
-            [weak = std::weak_ptr<DebugState>(mDebugState)]() -> DebugRegistry::DataSource {
-                // the View could have been destroyed by the time we do this
-                auto const state = weak.lock();
-                if (!state) {
-                    return { nullptr, 0 };
-                }
-                // Lazily allocate the buffer for the debug data source, and mark this
-                // data source as active. It can never go back to inactive.
-                assert_invariant(!state->debugFrameHistory);
-                state->active = true;
-                state->debugFrameHistory =
-                        std::make_unique<std::array<DebugRegistry::FrameHistory, 5 * 60>>();
-                return { state->debugFrameHistory->data(), state->debugFrameHistory->size() };
+    debugRegistry.registerDataSource("d.view.frame_info",
+            [this]() -> DebugRegistry::DataSource {
+                assert_invariant(!mDebugFrameHistory);
+                mDebugFrameHistory = std::make_unique<std::array<DebugRegistry::FrameHistory, 5*60>>();
+                return { mDebugFrameHistory->data(), mDebugFrameHistory->size() };
            });
-
-    if (UTILS_UNLIKELY(mDebugState->owner)) {
-        // publish the properties (they will be initialized in the main loop)
-        debugRegistry.registerProperty("d.view.pid.kp", &engine.debug.view.pid.kp);
-        debugRegistry.registerProperty("d.view.pid.ki", &engine.debug.view.pid.ki);
-        debugRegistry.registerProperty("d.view.pid.kd", &engine.debug.view.pid.kd);
-    }
+    debugRegistry.registerProperty("d.view.pid.kp", &engine.debug.view.pid.kp);
+    debugRegistry.registerProperty("d.view.pid.ki", &engine.debug.view.pid.ki);
+    debugRegistry.registerProperty("d.view.pid.kd", &engine.debug.view.pid.kd);
+    // default parameters for debugging UI
+    engine.debug.view.pid.kp = 1.0f - std::exp(-1.0f / 8.0f);
+    engine.debug.view.pid.ki = PID_CONTROLLER_Ki;
+    engine.debug.view.pid.kd = PID_CONTROLLER_Kd;
+    mPidController.setParallelGains(
+            engine.debug.view.pid.kp, engine.debug.view.pid.ki, engine.debug.view.pid.kd);
 #endif

    // allocate UBOs
@@ -137,12 +126,6 @@ void FView::terminate(FEngine& engine) {
    mFroxelizer.terminate(driver);

    engine.getEntityManager().destroy(mFogEntity);
-
-#ifndef NDEBUG
-    if (UTILS_UNLIKELY(mDebugState->owner)) {
-        engine.getDebugRegistry().unregisterDataSource("d.view.frame_info");
-    }
-#endif
 }

 void FView::setViewport(filament::Viewport const& viewport) noexcept {
@@ -184,16 +167,6 @@ float2 FView::updateScale(FEngine& engine,
        Renderer::FrameRateOptions const& frameRateOptions,
        Renderer::DisplayInfo const& displayInfo) noexcept {

-#ifndef NDEBUG
-    if (UTILS_LIKELY(!mDebugState->active)) {
-        // if we're not active, update the debug properties with the normal values
-        // and use that for configuring the PID controller.
-        engine.debug.view.pid.kp = 1.0f - std::exp(-frameRateOptions.scaleRate);
-        engine.debug.view.pid.ki = PID_CONTROLLER_Ki;
-        engine.debug.view.pid.kd = PID_CONTROLLER_Kd;
-    }
-#endif
-
    DynamicResolutionOptions const& options = mDynamicResolution;
    if (options.enabled) {
        if (!UTILS_UNLIKELY(info.valid)) {
@@ -277,15 +250,14 @@ float2 FView::updateScale(FEngine& engine,

 #ifndef NDEBUG
    // only for debugging...
-    if (UTILS_UNLIKELY(mDebugState->active && mDebugState->debugFrameHistory)) {
-        auto* const debugFrameHistory = mDebugState->debugFrameHistory.get();
+    if (mDebugFrameHistory) {
        using namespace std::chrono;
        using duration_ms = duration<float, std::milli>;
        const float target = (1000.0f * float(frameRateOptions.interval)) / displayInfo.refreshRate;
        const float targetWithHeadroom = target * (1.0f - frameRateOptions.headRoomRatio);
-        std::move(debugFrameHistory->begin() + 1,
-                debugFrameHistory->end(), debugFrameHistory->begin());
-        debugFrameHistory->back() = {
+        std::move(mDebugFrameHistory->begin() + 1,
+                mDebugFrameHistory->end(), mDebugFrameHistory->begin());
+        mDebugFrameHistory->back() = {
                .target             = target,
                .targetWithHeadroom = targetWithHeadroom,
                .frameTime          = duration_cast<duration_ms>(info.frameTime).count(),
@@ -201,9 +201,9 @@ public:

    void setStereoscopicOptions(StereoscopicOptions const& options) noexcept;

-    utils::FixedCapacityVector<Camera const*> getDirectionalShadowCameras() const noexcept {
-        if (!mShadowMapManager) return {};
-        return mShadowMapManager->getDirectionalShadowCameras();
+    FCamera const* getDirectionalShadowCamera() const noexcept {
+        if (!mShadowMapManager) return nullptr;
+        return mShadowMapManager->getDirectionalShadowCamera();
    }

    void setRenderTarget(FRenderTarget* renderTarget) noexcept {
@@ -576,12 +576,7 @@ private:
                                                    }};

 #ifndef NDEBUG
-    struct DebugState {
-        std::unique_ptr<std::array<DebugRegistry::FrameHistory, 5*60>> debugFrameHistory{};
-        bool owner = false;
-        bool active = false;
-    };
-    std::shared_ptr<DebugState> mDebugState{ new DebugState };
+    std::unique_ptr<std::array<DebugRegistry::FrameHistory, 5*60>> mDebugFrameHistory;
 #endif
 };

@@ -48,7 +48,7 @@ struct FrameGraphRenderPass {
        Viewport viewport{};
        math::float4 clearColor{};
        uint8_t samples = 0;    // # of samples (0 = unset, default)
-        uint8_t layerCount = 1; // # of layer (# > 1 = multiview)
+        uint8_t layerCount = 0; // # of layer (# > 1 = multiview)
        backend::TargetBufferFlags clearFlags{};
        backend::TargetBufferFlags discardStart{};
    };
@@ -190,10 +190,10 @@ void RenderPassNode::resolve() noexcept {
                minHeight = std::min(minHeight, h);
                maxHeight = std::max(maxHeight, h);
            }
+            // additionally, clear implies discardStart
+            rt.backend.params.flags.discardStart |= (
+                    rt.descriptor.clearFlags & rt.targetBufferFlags);
        }
-        // additionally, clear implies discardStart
-        rt.backend.params.flags.discardStart |= (
-                rt.descriptor.clearFlags & rt.targetBufferFlags);

        assert_invariant(minWidth == maxWidth);
        assert_invariant(minHeight == maxHeight);
@@ -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);
    }
 }
@@ -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
    }
 }
@@ -62,6 +62,7 @@ if (ANDROID)
    target_link_libraries(test_compiler PRIVATE utils)
    target_link_libraries(test_compiler PRIVATE EGL)
    target_link_libraries(test_compiler PRIVATE GLESv3)
+    target_link_libraries(test_compiler PRIVATE bluevk)    
 endif()

 add_executable(test_material_parser
@@ -1,181 +1,82 @@
-/*
- * Copyright (C) 2023 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 <iostream>
+#include <utils/Hash.h>
+#include <tsl/robin_map.h>
+#include <bluevk/BlueVK.h>

-#include <utils/Log.h>
+namespace {

-#include <GLES3/gl3.h>
-#include <EGL/egl.h>
-#include <EGL/eglext.h>
-
-#include <gtest/gtest.h>
-
-using namespace utils;
-using namespace std::literals;
-
-class CompilerTest : public testing::Test {
-protected:
-    void SetUp() override {
-        EGLBoolean success;
-        EGLint major, minor;
-        dpy = eglGetDisplay(EGL_DEFAULT_DISPLAY);
-        ASSERT_NE(dpy, EGL_NO_DISPLAY);
-
-        EGLBoolean const initialized = eglInitialize(dpy, &major, &minor);
-        ASSERT_TRUE(initialized);
-
-        EGLint const contextAttribs[] = {
-                EGL_CONTEXT_CLIENT_VERSION, 3,
-                EGL_NONE
-        };
-
-        EGLint configsCount;
-        EGLint configAttribs[] = {
-                EGL_RENDERABLE_TYPE, EGL_OPENGL_ES3_BIT_KHR,        //  0
-                EGL_RED_SIZE,    8,                                 //  2
-                EGL_GREEN_SIZE,  8,                                 //  4
-                EGL_BLUE_SIZE,   8,                                 //  6
-                EGL_NONE                                            // 14
-        };
-        success = eglChooseConfig(dpy, configAttribs, &config, 1, &configsCount);
-        ASSERT_TRUE(success);
-
-        context = eglCreateContext(dpy, config, EGL_NO_CONTEXT, contextAttribs);
-        ASSERT_NE(context, EGL_NO_CONTEXT);
-
-        success = eglMakeCurrent(dpy, EGL_NO_SURFACE, EGL_NO_SURFACE, context);
-        ASSERT_TRUE(success);
-
-        ASSERT_EQ(eglGetError(), EGL_SUCCESS);
-    }
-
-    void TearDown() override {
-        eglMakeCurrent(dpy, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
-        eglDestroyContext(dpy, context);
-        eglTerminate(dpy);
-    }
-
-private:
-    EGLDisplay dpy;
-    EGLContext context;
-    EGLConfig config;
+struct T {
 };

-TEST_F(CompilerTest, Simple) {
-    auto shader = R"(
-#version 300 es
-void main()
-{
-})"sv;
+constexpr uint8_t const UNIQUE_DESCRIPTOR_SET_COUNT = 3;
+constexpr uint8_t const SHADER_TYPE_COUNT = 3;
+using Timestamp = uint64_t;
+using VulkanResourceAllocator = T;

-    const char* const src = shader.data();
-    GLint const len = (GLint)shader.size();
+struct PushConstantKey {
+    uint8_t stage;// We have one set of push constant per shader stage (fragment, vertex, etc).
+    uint8_t size;
+};

-    GLuint const id = glCreateShader(GL_VERTEX_SHADER);
-    EXPECT_EQ(glGetError(), GL_NO_ERROR);
+struct PipelineLayoutKey {
+    using DescriptorSetLayoutArray = std::array<VkDescriptorSetLayout, UNIQUE_DESCRIPTOR_SET_COUNT>;
+    DescriptorSetLayoutArray descSetLayouts = {};        // 8 * 3
+    PushConstantKey pushConstant[SHADER_TYPE_COUNT] = {};// 2 * 3
+    uint16_t padding = 0;
+};
+static_assert(sizeof(PipelineLayoutKey) == 32);

-    glShaderSource(id, 1, &src, &len);
-    EXPECT_EQ(glGetError(), GL_NO_ERROR);
+using PipelineLayoutKeyHashFn = utils::hash::MurmurHashFn<PipelineLayoutKey>;
+struct PipelineLayoutKeyEqual {
+    bool operator()(PipelineLayoutKey const& k1, PipelineLayoutKey const& k2) const {
+        return 0 == memcmp((const void*) &k1, (const void*) &k2, sizeof(PipelineLayoutKey));
+    }
+};

-    glCompileShader(id);
-    EXPECT_EQ(glGetError(), GL_NO_ERROR);
+struct PipelineLayoutCacheEntry {
+    VkPipelineLayout handle;
+    Timestamp lastUsed;
+};

-    GLint result = 0;
-    glGetShaderiv(id, GL_COMPILE_STATUS, &result);
-    EXPECT_EQ(result, GL_TRUE);
+using PipelineLayoutMap = tsl::robin_map<PipelineLayoutKey, PipelineLayoutCacheEntry,
+        PipelineLayoutKeyHashFn, PipelineLayoutKeyEqual>;

-    glDeleteShader(id);
-    EXPECT_EQ(glGetError(), GL_NO_ERROR);
+class TestClass {
+public:
+    VkDevice mDevice;
+    VulkanResourceAllocator* mAllocator;
+    Timestamp mTimestamp;
+    PipelineLayoutMap layout;
+};
+
+void insert(PipelineLayoutMap& layout, uint64_t val) {
+    PipelineLayoutKey key{};
+    key.descSetLayouts[0] = (VkDescriptorSetLayout) val;
+    layout[key] = {(VkPipelineLayout) val, val};
 }

-TEST_F(CompilerTest, CrashPVRUniFlexCompileToHw) {
-
-    // Some PowerVR driver crash with this shader
-
-    auto shader = R"(
-#version 300 es
-
-layout(location = 0) in vec4 mesh_position;
-
-layout(std140) uniform FrameUniforms {
-    vec2 i;
-} frameUniforms;
-
-void main() {
-    gl_Position = mesh_position;
-    gl_Position.z = dot(gl_Position.zw, frameUniforms.i);
-})"sv;
-
-    const char* const src = shader.data();
-    GLint const len = (GLint)shader.size();
-
-    GLuint const id = glCreateShader(GL_VERTEX_SHADER);
-    EXPECT_EQ(glGetError(), GL_NO_ERROR);
-
-    glShaderSource(id, 1, &src, &len);
-    EXPECT_EQ(glGetError(), GL_NO_ERROR);
-
-    glCompileShader(id);
-    EXPECT_EQ(glGetError(), GL_NO_ERROR);
-
-    GLint result = 0;
-    glGetShaderiv(id, GL_COMPILE_STATUS, &result);
-    EXPECT_EQ(result, GL_TRUE);
-
-    glDeleteShader(id);
-    EXPECT_EQ(glGetError(), GL_NO_ERROR);
-}
-
-TEST_F(CompilerTest, ConstParameters) {
-
-    // Some PowerVR driver fail to compile this shader
-
-    auto shader = R"(
-#version 300 es
-
-highp mat3 m;
-void buggy(const mediump vec3 n) {
-    m*n;
-}
-
-void main() {
-})"sv;
-
-    const char* const src = shader.data();
-    GLint const len = (GLint)shader.size();
-
-    GLuint const id = glCreateShader(GL_FRAGMENT_SHADER);
-    EXPECT_EQ(glGetError(), GL_NO_ERROR);
-
-    glShaderSource(id, 1, &src, &len);
-    EXPECT_EQ(glGetError(), GL_NO_ERROR);
-
-    glCompileShader(id);
-    EXPECT_EQ(glGetError(), GL_NO_ERROR);
-
-    GLint result = 0;
-    glGetShaderiv(id, GL_COMPILE_STATUS, &result);
-    EXPECT_EQ(result, GL_TRUE);
-
-    EXPECT_EQ(glGetError(), GL_NO_ERROR);
-
-    glDeleteShader(id);
-    EXPECT_EQ(glGetError(), GL_NO_ERROR);
-}
+}// namespace

 int main(int argc, char** argv) {
-    ::testing::InitGoogleTest(&argc, argv);
-    return RUN_ALL_TESTS();
+    constexpr uint32_t START = 1000;
+    TestClass c;
+    auto& layout = c.layout;
+
+    uint64_t count = 0;
+    for (; count < 20; count++) {
+        insert(layout, count + START);
+    }
+
+    for (uint64_t t = 0; t < count; ++t) {
+        PipelineLayoutKey key = {};
+        key.descSetLayouts[0] = (VkDescriptorSetLayout)(START + t);
+
+        if (layout.find(key) != layout.end()) {
+            std::cout << "found " << t << std::endl;
+        } else {
+            std::cout << "not found" << t << std::endl;
+        }
+    }
+
+    return 0;
 }
@@ -1,12 +1,12 @@
 Pod::Spec.new do |spec|
  spec.name = "Filament"
-  spec.version = "1.54.0"
+  spec.version = "1.53.2"
  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.0/filament-v1.54.0-ios.tgz" }
+  spec.source = { :http => "https://github.com/google/filament/releases/download/v1.53.2/filament-v1.53.2-ios.tgz" }

  # Fix linking error with Xcode 12; we do not yet support the simulator on Apple silicon.
  spec.pod_target_xcconfig = {
@@ -92,7 +92,6 @@ enum UTILS_PUBLIC ChunkType : uint64_t {

    MaterialVertexDomain = charTo64bitNum("MAT_VEDO"),
    MaterialInterpolation = charTo64bitNum("MAT_INTR"),
-    MaterialStereoscopicType = charTo64bitNum("MAT_STER"),

    DictionaryText = charTo64bitNum("DIC_TEXT"),
    DictionarySpirv = charTo64bitNum("DIC_SPIR"),
@@ -28,7 +28,7 @@
 namespace filament {

 // update this when a new version of filament wouldn't work with older materials
-static constexpr size_t MATERIAL_VERSION = 54;
+static constexpr size_t MATERIAL_VERSION = 53;

 /**
 * Supported shading models
@@ -166,8 +166,7 @@ ssize_t BufferInterfaceBlock::getFieldOffset(std::string_view name, size_t index
 BufferInterfaceBlock::FieldInfo const* BufferInterfaceBlock::getFieldInfo(
        std::string_view name) const {
    auto pos = mInfoMap.find(name);
-    FILAMENT_CHECK_PRECONDITION(pos != mInfoMap.end()) << "uniform named \""
-            << name << "\" not found";
+    FILAMENT_CHECK_PRECONDITION(pos != mInfoMap.end()) << "uniform named \"%.*s\" not found";
    return &mFieldInfoList[pos->second];
 }

@@ -40,20 +40,14 @@ endif()

 file(MAKE_DIRECTORY ${MATERIAL_DIR})

-set (MATC_FLAGS ${MATC_BASE_FLAGS})
-if (FILAMENT_SAMPLES_STEREO_TYPE STREQUAL "instanced")
-    set (MATC_FLAGS ${MATC_FLAGS} -PstereoscopicType=instanced)
-elseif (FILAMENT_SAMPLES_STEREO_TYPE STREQUAL "multiview")
-    set (MATC_FLAGS ${MATC_FLAGS} -PstereoscopicType=multiview)
-endif ()
-
 foreach (mat_src ${MATERIAL_SRCS})
    get_filename_component(localname "${mat_src}" NAME_WE)
    get_filename_component(fullname "${mat_src}" ABSOLUTE)
    set(output_path "${MATERIAL_DIR}/${localname}.filamat")
+
    add_custom_command(
            OUTPUT ${output_path}
-            COMMAND matc ${MATC_FLAGS} -o ${output_path} ${fullname}
+            COMMAND matc ${MATC_BASE_FLAGS} -o ${output_path} ${fullname}
            DEPENDS ${mat_src} matc
            COMMENT "Compiling material ${mat_src} to ${output_path}"
    )
@@ -323,9 +323,6 @@ public:
    //! Custom variables (all float4).
    MaterialBuilder& variable(Variable v, const char* name) noexcept;

-    MaterialBuilder& variable(Variable v, const char* name,
-            ParameterPrecision precision) noexcept;
-
    /**
     * Require a specified attribute.
     *
@@ -711,17 +708,11 @@ public:
        ShaderStage stage;
    };

-    struct CustomVariable {
-        utils::CString name;
-        Precision precision = Precision::DEFAULT;
-        bool hasPrecision = false;
-    };
-
    static constexpr size_t MATERIAL_PROPERTIES_COUNT = filament::MATERIAL_PROPERTIES_COUNT;
    using Property = filament::Property;

    using PropertyList = bool[MATERIAL_PROPERTIES_COUNT];
-    using VariableList = CustomVariable[MATERIAL_VARIABLES_COUNT];
+    using VariableList = utils::CString[MATERIAL_VARIABLES_COUNT];
    using OutputList = std::vector<Output>;

    static constexpr size_t MAX_COLOR_OUTPUT = filament::backend::MRT::MAX_SUPPORTED_RENDER_TARGET_COUNT;
@@ -671,15 +671,13 @@ 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
 //
-// Note: CreateSimplificationPass() used to creates a lot of problems:
+// CreateSimplificationPass() 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)
-//
-// 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
+// - 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
 // result is mismatched half / float assignments in MSL.


@@ -712,11 +710,11 @@ void GLSLPostProcessor::registerPerformancePasses(Optimizer& optimizer, Config c
    RegisterPass(CreateAggressiveDCEPass());
    RegisterPass(CreateRedundancyEliminationPass());
    RegisterPass(CreateCombineAccessChainsPass());
-    RegisterPass(CreateSimplificationPass());
+    RegisterPass(CreateSimplificationPass(), MaterialBuilder::TargetApi::METAL);
    RegisterPass(CreateVectorDCEPass());
    RegisterPass(CreateDeadInsertElimPass());
    RegisterPass(CreateDeadBranchElimPass());
-    RegisterPass(CreateSimplificationPass());
+    RegisterPass(CreateSimplificationPass(), MaterialBuilder::TargetApi::METAL);
    RegisterPass(CreateIfConversionPass());
    RegisterPass(CreateCopyPropagateArraysPass());
    RegisterPass(CreateReduceLoadSizePass());
@@ -725,7 +723,7 @@ void GLSLPostProcessor::registerPerformancePasses(Optimizer& optimizer, Config c
    RegisterPass(CreateRedundancyEliminationPass());
    RegisterPass(CreateDeadBranchElimPass());
    RegisterPass(CreateBlockMergePass());
-    RegisterPass(CreateSimplificationPass());
+    RegisterPass(CreateSimplificationPass(), MaterialBuilder::TargetApi::METAL);
 }

 void GLSLPostProcessor::registerSizePasses(Optimizer& optimizer, Config const& config) {
@@ -234,21 +234,7 @@ MaterialBuilder& MaterialBuilder::variable(Variable v, const char* name) noexcep
        case Variable::CUSTOM2:
        case Variable::CUSTOM3:
            assert(size_t(v) < MATERIAL_VARIABLES_COUNT);
-            mVariables[size_t(v)] = { CString(name), Precision::DEFAULT, false };
-            break;
-    }
-    return *this;
-}
-
-MaterialBuilder& MaterialBuilder::variable(Variable v,
-        const char* name, ParameterPrecision precision) noexcept {
-    switch (v) {
-        case Variable::CUSTOM0:
-        case Variable::CUSTOM1:
-        case Variable::CUSTOM2:
-        case Variable::CUSTOM3:
-            assert(size_t(v) < MATERIAL_VARIABLES_COUNT);
-            mVariables[size_t(v)] = { CString(name), precision, true };
+            mVariables[size_t(v)] = CString(name);
            break;
    }
    return *this;
@@ -1397,7 +1383,7 @@ bool MaterialBuilder::checkMaterialLevelFeatures(MaterialInfo const& info) const

 bool MaterialBuilder::hasCustomVaryings() const noexcept {
    for (const auto& variable : mVariables) {
-        if (!variable.name.empty()) {
+        if (!variable.empty()) {
            return true;
        }
    }
@@ -1623,7 +1609,6 @@ void MaterialBuilder::writeCommonChunks(ChunkContainer& container, MaterialInfo&
            }
        }
        container.emplace<uint64_t>(ChunkType::MaterialProperties, properties);
-        container.emplace<uint8_t>(ChunkType::MaterialStereoscopicType, static_cast<uint8_t>(mStereoscopicType));
    }

    // create a unique material id
@@ -451,20 +451,15 @@ io::sstream& CodeGenerator::generatePostProcessMain(io::sstream& out, ShaderStag
 }

 io::sstream& CodeGenerator::generateVariable(io::sstream& out, ShaderStage stage,
-        const MaterialBuilder::CustomVariable& variable, size_t index) {
-    auto const& name = variable.name;
-    const char* precisionString = getPrecisionQualifier(variable.precision);
+        const CString& name, size_t index) {
+
    if (!name.empty()) {
        if (stage == ShaderStage::VERTEX) {
            out << "\n#define VARIABLE_CUSTOM" << index << " " << name.c_str() << "\n";
            out << "\n#define VARIABLE_CUSTOM_AT" << index << " variable_" << name.c_str() << "\n";
-            out << "LAYOUT_LOCATION(" << index << ") VARYING " << precisionString << " vec4 variable_" << name.c_str() << ";\n";
+            out << "LAYOUT_LOCATION(" << index << ") VARYING vec4 variable_" << name.c_str() << ";\n";
        } else if (stage == ShaderStage::FRAGMENT) {
-            if (!variable.hasPrecision && variable.precision == Precision::DEFAULT) {
-                // for backward compatibility
-                precisionString = "highp";
-            }
-            out << "\nLAYOUT_LOCATION(" << index << ") VARYING " << precisionString << " vec4 variable_" << name.c_str() << ";\n";
+            out << "\nLAYOUT_LOCATION(" << index << ") VARYING highp vec4 variable_" << name.c_str() << ";\n";
        }
    }
    return out;
@@ -103,7 +103,7 @@ public:

    // generate declarations for custom interpolants
    static utils::io::sstream& generateVariable(utils::io::sstream& out, ShaderStage stage,
-            const MaterialBuilder::CustomVariable& variable, size_t index);
+            const utils::CString& name, size_t index);

    // generate declarations for non-custom "in" variables
    utils::io::sstream& generateShaderInputs(utils::io::sstream& out, ShaderStage type,
@@ -28,14 +28,8 @@

 class Cube {
 public:
-
    Cube(filament::Engine& engine, filament::Material const* material, filament::math::float3 linearColor, bool culling = true);

-    Cube(Cube const&) = delete;
-    Cube& operator=(Cube const&) = delete;
-
-    Cube(Cube&& rhs) noexcept;
-
    utils::Entity getSolidRenderable() {
        return mSolidRenderable;
    }
@@ -61,8 +55,8 @@ private:
    filament::Material const* mMaterial = nullptr;
    filament::MaterialInstance* mMaterialInstanceSolid = nullptr;
    filament::MaterialInstance* mMaterialInstanceWireFrame = nullptr;
-    utils::Entity mSolidRenderable{};
-    utils::Entity mWireFrameRenderable{};
+    utils::Entity mSolidRenderable;
+    utils::Entity mWireFrameRenderable;
 };


@@ -211,11 +211,11 @@ private:
        filament::Camera* mOrthoCamera;

        std::vector<std::unique_ptr<CView>> mViews;
-        CView* mMainView;   // well, the main view
-        CView* mUiView;     // the imgui ui
+        CView* mMainView;
+        CView* mUiView;
        CView* mDepthView;
-        GodView* mGodView;  // the debug view with "god" camera
-        CView* mOrthoView;  // directional shadow map view
+        GodView* mGodView;
+        CView* mOrthoView;

        size_t mWidth = 0;
        size_t mHeight = 0;
@@ -104,23 +104,11 @@ Cube::Cube(Engine& engine, filament::Material const* material, float3 linearColo
            .build(engine, mWireFrameRenderable);
 }

-Cube::Cube(Cube&& rhs) noexcept
-        : mEngine(rhs.mEngine) {
-    using std::swap;
-    swap(rhs.mVertexBuffer, mVertexBuffer);
-    swap(rhs.mIndexBuffer, mIndexBuffer);
-    swap(rhs.mMaterial, mMaterial);
-    swap(rhs.mMaterialInstanceSolid, mMaterialInstanceSolid);
-    swap(rhs.mMaterialInstanceWireFrame, mMaterialInstanceWireFrame);
-    swap(rhs.mSolidRenderable, mSolidRenderable);
-    swap(rhs.mWireFrameRenderable, mWireFrameRenderable);
-}
-
 void Cube::mapFrustum(filament::Engine& engine, Camera const* camera) {
    // the Camera far plane is at infinity, but we want it closer for display
    const mat4 vm(camera->getModelMatrix());
    mat4 p(vm * inverse(camera->getCullingProjectionMatrix()));
-    mapFrustum(engine, p);
+    return mapFrustum(engine, p);
 }

 void Cube::mapFrustum(filament::Engine& engine, filament::math::mat4 const& transform) {
@@ -134,7 +122,7 @@ void Cube::mapFrustum(filament::Engine& engine, filament::math::mat4 const& tran

 void Cube::mapAabb(filament::Engine& engine, filament::Box const& box) {
    mat4 p = mat4::translation(box.center) * mat4::scaling(box.halfExtent);
-    mapFrustum(engine, p);
+    return mapFrustum(engine, p);
 }

 Cube::~Cube() {
@@ -1,3 +1,4 @@
+#include <memory>

 /*
 * Copyright (C) 2015 The Android Open Source Project
@@ -55,13 +56,6 @@

 #include <stb_image.h>

-#include <algorithm>
-#include <cstdlib>
-#include <memory>
-#include <vector>
-
-#include <stdint.h>
-
 #include "generated/resources/filamentapp.h"

 using namespace filament;
@@ -144,17 +138,10 @@ void FilamentApp::run(const Config& config, SetupCallback setupCallback,
            .package(FILAMENTAPP_TRANSPARENTCOLOR_DATA, FILAMENTAPP_TRANSPARENTCOLOR_SIZE)
            .build(*mEngine);

-    std::unique_ptr<Cube> cameraCube{ new Cube(*mEngine, mTransparentMaterial, { 1, 0, 0 }) };
-
+    std::unique_ptr<Cube> cameraCube(new Cube(*mEngine, mTransparentMaterial, {1,0,0}));
    // we can't cull the light-frustum because it's not applied a rigid transform
    // and currently, filament assumes that for culling
-    std::vector<Cube> lightmapCubes;
-    lightmapCubes.reserve(4);
-    lightmapCubes.emplace_back(*mEngine, mTransparentMaterial, float3{ 0, 1, 0 }, false);
-    lightmapCubes.emplace_back(*mEngine, mTransparentMaterial, float3{ 0, 0, 1 }, false);
-    lightmapCubes.emplace_back(*mEngine, mTransparentMaterial, float3{ 1, 1, 0 }, false);
-    lightmapCubes.emplace_back(*mEngine, mTransparentMaterial, float3{ 1, 0, 0 }, false);
-
+    std::unique_ptr<Cube> lightmapCube(new Cube(*mEngine, mTransparentMaterial, {0,1,0}, false));
    mScene = mEngine->createScene();

    window->mMainView->getView()->setVisibleLayers(0x4, 0x4);
@@ -164,15 +151,16 @@ void FilamentApp::run(const Config& config, SetupCallback setupCallback,

        rcm.setLayerMask(rcm.getInstance(cameraCube->getSolidRenderable()), 0x3, 0x2);
        rcm.setLayerMask(rcm.getInstance(cameraCube->getWireFrameRenderable()), 0x3, 0x2);
+
+        rcm.setLayerMask(rcm.getInstance(lightmapCube->getSolidRenderable()), 0x3, 0x2);
+        rcm.setLayerMask(rcm.getInstance(lightmapCube->getWireFrameRenderable()), 0x3, 0x2);
+
+        // Create the camera mesh
        mScene->addEntity(cameraCube->getWireFrameRenderable());
        mScene->addEntity(cameraCube->getSolidRenderable());

-        for (auto&& cube : lightmapCubes) {
-            rcm.setLayerMask(rcm.getInstance(cube.getSolidRenderable()), 0x3, 0x2);
-            rcm.setLayerMask(rcm.getInstance(cube.getWireFrameRenderable()), 0x3, 0x2);
-            mScene->addEntity(cube.getWireFrameRenderable());
-            mScene->addEntity(cube.getSolidRenderable());
-        }
+        mScene->addEntity(lightmapCube->getWireFrameRenderable());
+        mScene->addEntity(lightmapCube->getSolidRenderable());

        window->mDepthView->getView()->setVisibleLayers(0x4, 0x4);
        window->mGodView->getView()->setVisibleLayers(0x6, 0x6);
@@ -437,26 +425,10 @@ void FilamentApp::run(const Config& config, SetupCallback setupCallback,
        window->mDebugCamera->lookAt(eye, center, up);

        // Update the cube distortion matrix used for frustum visualization.
-        auto& rcm = mEngine->getRenderableManager();
-        auto const csm = window->mMainView->getView()->getDirectionalShadowCameras();
-        // show/hide the cascades
-        for (size_t i = 0 ; i < 4; i++) {
-            rcm.setLayerMask(rcm.getInstance(lightmapCubes[i].getSolidRenderable()), 0x3, 0x0);
-            rcm.setLayerMask(rcm.getInstance(lightmapCubes[i].getWireFrameRenderable()), 0x3, 0x0);
+        const Camera* lightmapCamera = window->mMainView->getView()->getDirectionalShadowCamera();
+        if (lightmapCamera) {
+            lightmapCube->mapFrustum(*mEngine, lightmapCamera);
        }
-        if (!csm.empty()) {
-            for (size_t i = 0, c = csm.size(); i < c; i++) {
-                if (csm[i]) {
-                    lightmapCubes[i].mapFrustum(*mEngine, csm[i]);
-                }
-                uint8_t const layer = csm[i] ? 0x2 : 0x0;
-                rcm.setLayerMask(rcm.getInstance(lightmapCubes[i].getSolidRenderable()),
-                        0x3, layer);
-                rcm.setLayerMask(rcm.getInstance(lightmapCubes[i].getWireFrameRenderable()),
-                        0x3, layer);
-            }
-        }
-
        cameraCube->mapFrustum(*mEngine, window->mMainCamera);

        // Delay rendering for roughly one monitor refresh interval
@@ -480,14 +452,11 @@ void FilamentApp::run(const Config& config, SetupCallback setupCallback,

        if (config.splitView) {
            if(!window->mOrthoView->getView()->hasCamera()) {
-                auto const csm = window->mMainView->getView()->getDirectionalShadowCameras();
-                if (!csm.empty()) {
-                    // here we could choose the cascade
-                    Camera const* debugDirectionalShadowCamera = csm[0];
-                    if (debugDirectionalShadowCamera) {
-                        window->mOrthoView->setCamera(
-                                const_cast<Camera*>(debugDirectionalShadowCamera));
-                    }
+                Camera const* debugDirectionalShadowCamera =
+                        window->mMainView->getView()->getDirectionalShadowCamera();
+                if (debugDirectionalShadowCamera) {
+                    window->mOrthoView->setCamera(
+                            const_cast<Camera*>(debugDirectionalShadowCamera));
                }
            }
        }
@@ -515,7 +484,7 @@ void FilamentApp::run(const Config& config, SetupCallback setupCallback,
    cleanupCallback(mEngine, window->mMainView->getView(), mScene);

    cameraCube.reset();
-    lightmapCubes.clear();
+    lightmapCube.reset();
    window.reset();

    mIBL.reset();
@@ -767,6 +736,12 @@ FilamentApp::Window::Window(FilamentApp* filamentApp,
        mGodView->setCamera(mMainCamera);
        mGodView->setGodCamera(mDebugCamera);
        mGodView->setCameraManipulator(mDebugCameraMan);
+
+        // Ortho view obviously uses an ortho camera
+        Camera const* debugDirectionalShadowCamera = mMainView->getView()->getDirectionalShadowCamera();
+        if (debugDirectionalShadowCamera) {
+            mOrthoView->setCamera(const_cast<Camera *>(debugDirectionalShadowCamera));
+        }
    }

    // configure the cameras
@@ -932,7 +907,9 @@ void FilamentApp::Window::configureCamerasForWindow() {

    const bool splitview = mViews.size() > 2;

-    const uint32_t mainWidth = std::max(2, (int) width - sidebar);
+    // To trigger a floating-point exception, users could shrink the window to be smaller than
+    // the sidebar. To prevent this we simply clamp the width of the main viewport.
+    const uint32_t mainWidth = splitview ? width : std::max(1, (int) width - sidebar);

    double near = mFilamentApp->mCameraNear;
    double far = mFilamentApp->mCameraFar;
@@ -947,7 +924,7 @@ void FilamentApp::Window::configureCamerasForWindow() {
    } else {
        mMainCamera->setLensProjection(mFilamentApp->mCameraFocalLength, 1.0, near, far);
    }
-    mDebugCamera->setProjection(45.0, double(mainWidth) / height, 0.0625, 4096, Camera::Fov::VERTICAL);
+    mDebugCamera->setProjection(45.0, double(width) / height, 0.0625, 4096, Camera::Fov::VERTICAL);

    auto aspectRatio = double(mainWidth) / height;
    if (mMainView->getView()->getStereoscopicOptions().enabled) {
@@ -958,12 +935,12 @@ void FilamentApp::Window::configureCamerasForWindow() {

    // We're in split view when there are more views than just the Main and UI views.
    if (splitview) {
-        uint32_t const vpw = mainWidth / 2;
-        uint32_t const vph = height / 2;
-        mMainView->setViewport ({ sidebar +            0,            0, vpw, vph });
-        mDepthView->setViewport({ sidebar + int32_t(vpw),            0, vpw, vph });
-        mGodView->setViewport  ({ sidebar + int32_t(vpw), int32_t(vph), vpw, vph });
-        mOrthoView->setViewport({ sidebar +            0, int32_t(vph), vpw, vph });
+        uint32_t vpw = width / 2;
+        uint32_t vph = height / 2;
+        mMainView->setViewport ({            0,            0, vpw,         vph          });
+        mDepthView->setViewport({ int32_t(vpw),            0, width - vpw, vph          });
+        mGodView->setViewport  ({ int32_t(vpw), int32_t(vph), width - vpw, height - vph });
+        mOrthoView->setViewport({            0, int32_t(vph), vpw,         height - vph });
    } else {
        mMainView->setViewport({ sidebar, 0, mainWidth, height });
    }
@@ -96,8 +96,7 @@ static std::string getNodeName(cgltf_node const* node, char const* defaultNodeNa
        if (node->mesh && node->mesh->name) return node->mesh->name;
        if (node->light && node->light->name) return node->light->name;
        if (node->camera && node->camera->name) return node->camera->name;
-        if (defaultNodeName) return defaultNodeName;
-        return "<unknown>";
+        return defaultNodeName;
    };

    std::string strOrig(getNameImpl());
--- a/Show More
+++ b/Show More