wip: shader compilation benchmark

.github/workflows/android-continuous.yml

@@ -10,7 +10,7 @@ on:
 jobs:
   build-android:
     name: build-android
-    runs-on: macos-14
+    runs-on: macos-latest
 
     steps:
       - uses: actions/checkout@v3.3.0

.github/workflows/cocopods-deploy.yml

@@ -13,7 +13,7 @@ on:
 jobs:
   cocoapods-deploy:
     name: cocoapods-deploy
-    runs-on: macos-14
+    runs-on: macos-latest
     steps:
       - name: Check out iOS/CocoaPods directory
         uses: Bhacaz/checkout-files@49fc3050859046bf4f4873678d46099985640e89

.github/workflows/ios-continuous.yml

@@ -10,7 +10,7 @@ on:
 jobs:
   build-ios:
     name: build-ios
-    runs-on: macos-14
+    runs-on: macos-latest
 
     steps:
       - uses: actions/checkout@v3.3.0

.github/workflows/mac-continuous.yml

@@ -10,7 +10,7 @@ on:
 jobs:
   build-mac:
     name: build-mac
-    runs-on: macos-14
+    runs-on: macos-latest
 
     steps:
       - uses: actions/checkout@v3.3.0

.github/workflows/npm-deploy.yml

@@ -11,7 +11,7 @@ on:
 jobs:
   npm-deploy:
     name: npm-deploy
-    runs-on: macos-14
+    runs-on: macos-latest
     steps:
       - uses: actions/checkout@v3.3.0
         with:

.github/workflows/presubmit.yml

@@ -15,7 +15,7 @@ jobs:
 
     strategy:
       matrix:
-        os: [macos-14, ubuntu-22.04]
+        os: [macos-latest, ubuntu-22.04]
 
     steps:
       - uses: actions/checkout@v3.3.0
@@ -40,7 +40,7 @@ jobs:
 
   build-android:
     name: build-android
-    runs-on: macos-14
+    runs-on: macos-latest
 
     steps:
       - uses: actions/checkout@v3.3.0
@@ -54,7 +54,7 @@ jobs:
 
   build-ios:
     name: build-iOS
-    runs-on: macos-14
+    runs-on: macos-latest
 
     steps:
       - uses: actions/checkout@v3.3.0
@@ -67,7 +67,7 @@ jobs:
 
   build-web:
     name: build-web
-    runs-on: macos-14
+    runs-on: macos-latest
 
     steps:
       - uses: actions/checkout@v3.3.0

.github/workflows/release.yml

@@ -31,7 +31,7 @@ jobs:
 
     strategy:
       matrix:
-        os: [macos-14, ubuntu-22.04]
+        os: [macos-latest, ubuntu-22.04]
 
     steps:
       - name: Decide Git ref
@@ -65,7 +65,7 @@ jobs:
 
   build-web:
     name: build-web
-    runs-on: macos-14
+    runs-on: macos-latest
     if: github.event_name == 'release' || github.event.inputs.platform == 'web'
 
     steps:
@@ -98,7 +98,7 @@ jobs:
 
   build-android:
     name: build-android
-    runs-on: macos-14
+    runs-on: macos-latest
     if: github.event_name == 'release' || github.event.inputs.platform == 'android'
 
     steps:
@@ -129,7 +129,7 @@ jobs:
       - name: Sign sample-gltf-viewer
         run: |
           echo "${APK_KEYSTORE_BASE64}" > filament.jks.base64
-          base64 --decode -i filament.jks.base64 > filament.jks
+          base64 --decode filament.jks.base64 > filament.jks
           BUILD_TOOLS_VERSION=$(ls ${ANDROID_HOME}/build-tools | sort -V | tail -n 1)
           APKSIGNER=${ANDROID_HOME}/build-tools/${BUILD_TOOLS_VERSION}/apksigner
           IN_FILE="out/sample-gltf-viewer-release.apk"
@@ -152,7 +152,7 @@ jobs:
 
   build-ios:
     name: build-ios
-    runs-on: macos-14
+    runs-on: macos-latest
     if: github.event_name == 'release' || github.event.inputs.platform == 'ios'
 
     steps:

.github/workflows/web-continuous.yml

@@ -10,7 +10,7 @@ on:
 jobs:
   build-web:
     name: build-web
-    runs-on: macos-14
+    runs-on: macos-latest
 
     steps:
       - uses: actions/checkout@v3.3.0

CMakeLists.txt

@@ -634,9 +634,9 @@ function(combine_static_libs TARGET OUTPUT DEPS)
     # Loop through the dependent libraries and query their location on disk.
     set(DEPS_FILES )
     foreach(DEPENDENCY ${DEPS})
-        if (TARGET ${DEPENDENCY})
+        if(TARGET ${DEPENDENCY})
             get_property(dep_type TARGET ${DEPENDENCY} PROPERTY TYPE)
-            if (dep_type STREQUAL "STATIC_LIBRARY")
+            if(dep_type STREQUAL "STATIC_LIBRARY")
                 list(APPEND DEPS_FILES "$<TARGET_FILE:${DEPENDENCY}>")
             endif()
         endif()
@@ -721,6 +721,7 @@ add_subdirectory(${LIBRARIES}/filabridge)
 add_subdirectory(${LIBRARIES}/filaflat)
 add_subdirectory(${LIBRARIES}/filagui)
 add_subdirectory(${LIBRARIES}/filameshio)
+add_subdirectory(${LIBRARIES}/geometry)
 add_subdirectory(${LIBRARIES}/gltfio)
 add_subdirectory(${LIBRARIES}/ibl)
 add_subdirectory(${LIBRARIES}/iblprefilter)
@@ -748,9 +749,6 @@ add_subdirectory(${EXTERNAL}/jsmn/tnt)
 add_subdirectory(${EXTERNAL}/stb/tnt)
 add_subdirectory(${EXTERNAL}/getopt)
 
-# Note that this has to be placed after mikktspace in order for combine_static_libs to work.
-add_subdirectory(${LIBRARIES}/geometry)
-
 if (FILAMENT_BUILD_FILAMAT OR IS_HOST_PLATFORM)
     # spirv-tools must come before filamat, as filamat relies on the presence of the
     # spirv-tools_SOURCE_DIR variable.

NEW_RELEASE_NOTES.md

@@ -7,3 +7,5 @@ for next branch cut* header.
 appropriate header in [RELEASE_NOTES.md](./RELEASE_NOTES.md).
 
 ## Release notes for next branch cut
+
+- Metal: fix some shader artifacts by disabling fast math optimizations.

README.md

@@ -31,7 +31,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'com.google.android.filament:filament-android:1.50.2'
+    implementation 'com.google.android.filament:filament-android:1.49.3'
 }
 ```
 
@@ -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.50.2'
+pod 'Filament', '~> 1.49.3'
 ```
 
 ### Snapshots

RELEASE_NOTES.md

@@ -7,15 +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.50.2
-
-
-## v1.50.1
-
-- Metal: fix some shader artifacts by disabling fast math optimizations.
-- backend: remove `atan2` overload which had a typo and wasn't useful. Fixes b/320856413.
-- utils: remove usages of `SpinLock`. Fixes b/321101014.
-
 ## v1.50.0
 - engine: TAA now supports 4x upscaling [BETA] [⚠️ **New Material Version**]
 

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

@@ -1882,7 +1882,7 @@ public class View {
      * Options for Temporal Anti-aliasing (TAA)
      * Most TAA parameters are extremely costly to change, as they will trigger the TAA post-process
      * shaders to be recompiled. These options should be changed or set during initialization.
-     * `filterWidth`, `feedback` and `jitterPattern`, however, can be changed at any time.
+     * `filterWidth`, `feedback` and `jitterPattern`, however, could be changed at any time.
      *
      * `feedback` of 0.1 effectively accumulates a maximum of 19 samples in steady state.
      * see "A Survey of Temporal Antialiasing Techniques" by Lei Yang and all for more information.
@@ -1925,7 +1925,6 @@ public class View {
             UNIFORM_HELIX_X4,
             HALTON_23_X8,
             HALTON_23_X16,
-            HALTON_23_X32,
         }
 
         /**
@@ -1940,10 +1939,6 @@ public class View {
          * texturing lod bias (typically -1 or -2)
          */
         public float lodBias = -1.0f;
-        /**
-         * post-TAA sharpen, especially useful when upscaling is true.
-         */
-        public float sharpness = 0.0f;
         /**
          * enables or disables temporal anti-aliasing
          */

android/gradle.properties

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

filament/CMakeLists.txt

@@ -238,7 +238,6 @@ set(MATERIAL_SRCS
         src/materials/resolveDepth.mat
         src/materials/separableGaussianBlur.mat
         src/materials/skybox.mat
-        src/materials/shadowmap.mat
         src/materials/ssao/bilateralBlur.mat
         src/materials/ssao/bilateralBlurBentNormals.mat
         src/materials/ssao/mipmapDepth.mat

filament/backend/include/backend/BufferDescriptor.h

@@ -23,6 +23,7 @@
 #include <utils/ostream.h>
 
 #include <stddef.h>
+#include <stdint.h>
 
 namespace filament::backend {
 

filament/backend/include/backend/CallbackHandler.h

@@ -17,6 +17,8 @@
 #ifndef TNT_FILAMENT_BACKEND_CALLBACKHANDLER_H
 #define TNT_FILAMENT_BACKEND_CALLBACKHANDLER_H
 
+#include <utils/compiler.h>
+
 namespace filament::backend {
 
 /**

filament/backend/include/backend/DriverEnums.h

@@ -28,8 +28,7 @@
 
 #include <math/vec4.h>
 
-#include <array>        // FIXME: STL headers are not allowed in public headers
-#include <type_traits>  // FIXME: STL headers are not allowed in public headers
+#include <array>    // FIXME: STL headers are not allowed in public headers
 
 #include <stddef.h>
 #include <stdint.h>

filament/backend/include/backend/Handle.h

@@ -17,15 +17,17 @@
 #ifndef TNT_FILAMENT_BACKEND_HANDLE_H
 #define TNT_FILAMENT_BACKEND_HANDLE_H
 
+#include <utils/compiler.h>
 #if !defined(NDEBUG)
-#include <utils/ostream.h>
+#include <utils/Log.h>
 #endif
 #include <utils/debug.h>
 
-#include <type_traits> // FIXME: STL headers are not allowed in public headers
-
 #include <stdint.h>
 
+#include <limits>
+#include <type_traits>
+
 namespace filament::backend {
 
 struct HwBufferObject;
@@ -52,7 +54,7 @@ struct HwVertexBuffer;
 class HandleBase {
 public:
     using HandleId = uint32_t;
-    static constexpr const HandleId nullid = HandleId{ UINT32_MAX };
+    static constexpr const HandleId nullid = HandleId{ std::numeric_limits<HandleId>::max() };
 
     constexpr HandleBase() noexcept: object(nullid) {}
 

filament/backend/include/backend/PipelineState.h

@@ -20,7 +20,7 @@
 #include <backend/DriverEnums.h>
 #include <backend/Handle.h>
 
-#include <utils/ostream.h>
+#include <limits>
 
 #include <stdint.h>
 
@@ -33,7 +33,10 @@ struct PipelineState {
     RasterState rasterState;
     StencilState stencilState;
     PolygonOffset polygonOffset;
-    Viewport scissor{ 0, 0, (uint32_t)INT32_MAX, (uint32_t)INT32_MAX };
+    Viewport scissor{ 0, 0,
+                      (uint32_t)std::numeric_limits<int32_t>::max(),
+                      (uint32_t)std::numeric_limits<int32_t>::max()
+    };
 };
 
 } // namespace filament::backend

filament/backend/include/backend/PixelBufferDescriptor.h

@@ -24,7 +24,6 @@
 
 #include <utils/compiler.h>
 #include <utils/debug.h>
-#include <utils/ostream.h>
 
 #include <stddef.h>
 #include <stdint.h>

filament/backend/include/backend/Platform.h

@@ -19,11 +19,11 @@
 #ifndef TNT_FILAMENT_BACKEND_PLATFORM_H
 #define TNT_FILAMENT_BACKEND_PLATFORM_H
 
+#include <backend/DriverEnums.h>
+
 #include <utils/compiler.h>
 #include <utils/Invocable.h>
 
-#include <stddef.h>
-
 namespace filament::backend {
 
 class Driver;
@@ -41,24 +41,18 @@ public:
     struct Stream {};
 
     struct DriverConfig {
-        /**
-         * Size of handle arena in bytes. Setting to 0 indicates default value is to be used.
+        /*
+         * size of handle arena in bytes. Setting to 0 indicates default value is to be used.
          * Driver clamps to valid values.
          */
         size_t handleArenaSize = 0;
 
-        /**
-         * This number of most-recently destroyed textures will be tracked for use-after-free.
+        /*
+         * this number of most-recently destroyed textures will be tracked for use-after-free.
          * Throws an exception when a texture is freed but still bound to a SamplerGroup and used in
          * a draw call. 0 disables completely. Currently only respected by the Metal backend.
          */
         size_t textureUseAfterFreePoolSize = 0;
-
-        /**
-         * Set to `true` to forcibly disable parallel shader compilation in the backend.
-         * Currently only honored by the GL backend.
-         */
-        bool disableParallelShaderCompile = false;
     };
 
     Platform() noexcept;

filament/backend/include/backend/PresentCallable.h

@@ -21,7 +21,8 @@
 
 #include <utils/compiler.h>
 
-namespace filament::backend {
+namespace filament {
+namespace backend {
 
 /**
  * A PresentCallable is a callable object that, when called, schedules a frame for presentation on
@@ -97,6 +98,7 @@ private:
  */
 using FrameFinishedCallback UTILS_DEPRECATED = void(*)(PresentCallable callable, void* user);
 
-} // namespace filament::backend
+} // namespace backend
+} // namespace filament
 
 #endif // TNT_FILAMENT_BACKEND_PRESENTCALLABLE

filament/backend/include/backend/Program.h

@@ -17,19 +17,17 @@
 #ifndef TNT_FILAMENT_BACKEND_PRIVATE_PROGRAM_H
 #define TNT_FILAMENT_BACKEND_PRIVATE_PROGRAM_H
 
+#include <utils/compiler.h>
 #include <utils/CString.h>
 #include <utils/FixedCapacityVector.h>
 #include <utils/Invocable.h>
+#include <utils/Log.h>
 #include <utils/ostream.h>
 
 #include <backend/DriverEnums.h>
 
-#include <array>    // FIXME: STL headers are not allowed in public headers
-#include <utility>  // FIXME: STL headers are not allowed in public headers
-#include <variant>  // FIXME: STL headers are not allowed in public headers
-
-#include <stddef.h>
-#include <stdint.h>
+#include <array>
+#include <variant>
 
 namespace filament::backend {
 

filament/backend/include/backend/SamplerDescriptor.h

@@ -24,6 +24,9 @@
 
 #include <utils/compiler.h>
 
+#include <stddef.h>
+#include <stdint.h>
+
 namespace filament::backend {
 
 struct UTILS_PUBLIC SamplerDescriptor {

filament/backend/include/backend/TargetBufferInfo.h

@@ -17,11 +17,9 @@
 #ifndef TNT_FILAMENT_BACKEND_TARGETBUFFERINFO_H
 #define TNT_FILAMENT_BACKEND_TARGETBUFFERINFO_H
 
+#include <backend/DriverEnums.h>
 #include <backend/Handle.h>
 
-#include <utils/ostream.h>
-
-#include <stddef.h>
 #include <stdint.h>
 
 namespace filament::backend {

filament/backend/include/backend/platforms/OpenGLPlatform.h

@@ -18,11 +18,8 @@
 #define TNT_FILAMENT_BACKEND_PRIVATE_OPENGLPLATFORM_H
 
 #include <backend/AcquiredImage.h>
-#include <backend/DriverEnums.h>
 #include <backend/Platform.h>
 
-#include <stdint.h>
-
 namespace filament::backend {
 
 class Driver;

filament/backend/include/backend/platforms/PlatformCocoaGL.h

@@ -17,10 +17,11 @@
 #ifndef TNT_FILAMENT_BACKEND_OPENGL_OPENGL_PLATFORM_COCOA_GL_H
 #define TNT_FILAMENT_BACKEND_OPENGL_OPENGL_PLATFORM_COCOA_GL_H
 
-#include <backend/DriverEnums.h>
+#include <stdint.h>
+
 #include <backend/platforms/OpenGLPlatform.h>
 
-#include <stdint.h>
+#include <backend/DriverEnums.h>
 
 namespace filament::backend {
 

filament/backend/include/backend/platforms/PlatformCocoaTouchGL.h

@@ -30,7 +30,7 @@ struct PlatformCocoaTouchGLImpl;
 class PlatformCocoaTouchGL : public OpenGLPlatform {
 public:
     PlatformCocoaTouchGL();
-    ~PlatformCocoaTouchGL() noexcept override;
+    ~PlatformCocoaTouchGL() noexcept;
 
     // --------------------------------------------------------------------------------------------
     // Platform Interface

filament/backend/include/backend/platforms/PlatformEGL.h

@@ -17,21 +17,18 @@
 #ifndef TNT_FILAMENT_BACKEND_OPENGL_OPENGL_PLATFORM_EGL_H
 #define TNT_FILAMENT_BACKEND_OPENGL_OPENGL_PLATFORM_EGL_H
 
-#include <backend/DriverEnums.h>
-#include <backend/Platform.h>
-#include <backend/platforms/OpenGLPlatform.h>
+#include <stdint.h>
 
 #include <EGL/egl.h>
 #include <EGL/eglext.h>
-#include <EGL/eglplatform.h>
 
-#include <initializer_list>
+#include <backend/platforms/OpenGLPlatform.h>
+
+#include <backend/DriverEnums.h>
+
 #include <utility>
 #include <vector>
 
-#include <stddef.h>
-#include <stdint.h>
-
 namespace filament::backend {
 
 /**

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

@@ -17,14 +17,8 @@
 #ifndef TNT_FILAMENT_BACKEND_OPENGL_OPENGL_PLATFORM_EGL_ANDROID_H
 #define TNT_FILAMENT_BACKEND_OPENGL_OPENGL_PLATFORM_EGL_ANDROID_H
 
-#include <backend/AcquiredImage.h>
-#include <backend/Platform.h>
-#include <backend/platforms/OpenGLPlatform.h>
 #include <backend/platforms/PlatformEGL.h>
 
-#include <stddef.h>
-#include <stdint.h>
-
 namespace filament::backend {
 
 class ExternalStreamManagerAndroid;

filament/backend/include/backend/platforms/VulkanPlatform.h

@@ -20,18 +20,13 @@
 #include <backend/Platform.h>
 
 #include <bluevk/BlueVK.h>
-
 #include <utils/CString.h>
 #include <utils/FixedCapacityVector.h>
 #include <utils/PrivateImplementation.h>
 
-#include <string_view>
 #include <tuple>
 #include <unordered_set>
 
-#include <stddef.h>
-#include <stdint.h>
-
 namespace filament::backend {
 
 using SwapChain = Platform::SwapChain;

filament/backend/include/private/backend/CircularBuffer.h

@@ -17,7 +17,10 @@
 #ifndef TNT_FILAMENT_BACKEND_PRIVATE_CIRCULARBUFFER_H
 #define TNT_FILAMENT_BACKEND_PRIVATE_CIRCULARBUFFER_H
 
+#include <utils/compiler.h>
+
 #include <stddef.h>
+#include <stdint.h>
 
 namespace filament::backend {
 

filament/backend/include/private/backend/CommandBufferQueue.h

@@ -19,14 +19,12 @@
 
 #include "private/backend/CircularBuffer.h"
 
+#include <utils/compiler.h>
 #include <utils/Condition.h>
 #include <utils/Mutex.h>
 
 #include <vector>
 
-#include <stddef.h>
-#include <stdint.h>
-
 namespace filament::backend {
 
 /*

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

@@ -32,13 +32,11 @@
 #include <backend/TargetBufferInfo.h>
 
 #include <utils/compiler.h>
-#include <utils/debug.h>
 #include <utils/ThreadUtils.h>
 
 #include <cstddef>
 #include <functional>
 #include <tuple>
-#include <type_traits>
 #include <utility>
 
 #ifndef NDEBUG
@@ -154,14 +152,14 @@ struct CommandType<void (Driver::*)(ARGS...)> {
         }
 
         // placement new declared as "throw" to avoid the compiler's null-check
-        inline void* operator new(std::size_t, void* ptr) {
+        inline void* operator new(std::size_t size, void* ptr) {
             assert_invariant(ptr);
             return ptr;
         }
     };
 };
 
-// convert a method of "class Driver" into a Command<> type
+// convert an method of "class Driver" into a Command<> type
 #define COMMAND_TYPE(method) CommandType<decltype(&Driver::method)>::Command<&Driver::method>
 
 // ------------------------------------------------------------------------------------------------

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

@@ -29,7 +29,6 @@
 
 #include <functional>
 
-#include <stddef.h>
 #include <stdint.h>
 
 // Command debugging off. debugging virtuals are not called.

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

@@ -22,18 +22,9 @@
 #include <utils/Allocator.h>
 #include <utils/Log.h>
 #include <utils/compiler.h>
-#include <utils/debug.h>
-#include <utils/ostream.h>
-
 #include <tsl/robin_map.h>
-
-#include <exception>
-#include <type_traits>
 #include <unordered_map>
 
-#include <stddef.h>
-#include <stdint.h>
-
 #if !defined(NDEBUG) && UTILS_HAS_RTTI
 #   define HANDLE_TYPE_SAFETY 1
 #else
@@ -231,7 +222,7 @@ private:
         explicit Allocator(const utils::AreaPolicy::HeapArea& area);
 
         // this is in fact always called with a constexpr size argument
-        [[nodiscard]] inline void* alloc(size_t size, size_t, size_t extra) noexcept {
+        [[nodiscard]] inline void* alloc(size_t size, size_t alignment, size_t extra) noexcept {
             void* p = nullptr;
                  if (size <= mPool0.getSize()) p = mPool0.alloc(size, 16, extra);
             else if (size <= mPool1.getSize()) p = mPool1.alloc(size, 16, extra);

filament/backend/include/private/backend/PlatformFactory.h

@@ -19,9 +19,9 @@
 #ifndef TNT_FILAMENT_BACKEND_PLATFORM_FACTORY_H
 #define TNT_FILAMENT_BACKEND_PLATFORM_FACTORY_H
 
-#include <backend/DriverEnums.h>
+#include "backend/DriverEnums.h"
 
-#include <utils/compiler.h>
+#include "utils/compiler.h"
 
 namespace filament::backend {
 

filament/backend/include/private/backend/SamplerGroup.h

@@ -17,12 +17,14 @@
 #ifndef TNT_FILAMENT_BACKEND_PRIVATE_SAMPLERGROUP_H
 #define TNT_FILAMENT_BACKEND_PRIVATE_SAMPLERGROUP_H
 
-#include <backend/DriverApiForward.h>
-#include <backend/DriverEnums.h>
-#include <backend/SamplerDescriptor.h>
+#include "backend/DriverApiForward.h"
 
+#include <utils/compiler.h>
 #include <utils/FixedCapacityVector.h>
-#include <utils/ostream.h>
+
+#include <backend/DriverEnums.h>
+#include <backend/Handle.h>
+#include <backend/SamplerDescriptor.h>
 
 #include <stddef.h>
 

filament/backend/src/DataReshaper.h

@@ -19,7 +19,6 @@
 
 #include <backend/PixelBufferDescriptor.h>
 
-#include <cstring>
 #include <stddef.h>
 #include <stdint.h>
 

filament/backend/src/Driver.cpp

@@ -21,12 +21,7 @@
 
 #include <backend/AcquiredImage.h>
 #include <backend/BufferDescriptor.h>
-#include <backend/DriverEnums.h>
 
-#include <utils/compiler.h>
-#include <utils/debug.h>
-#include <utils/Log.h>
-#include <utils/ostream.h>
 #include <utils/Systrace.h>
 
 #include <math/half.h>
@@ -34,13 +29,6 @@
 #include <math/vec3.h>
 #include <math/vec4.h>
 
-#include <functional>
-#include <mutex>
-#include <utility>
-
-#include <stddef.h>
-#include <stdint.h>
-
 using namespace utils;
 using namespace filament::math;
 
@@ -131,8 +119,7 @@ void DriverBase::purge() noexcept {
 // ------------------------------------------------------------------------------------------------
 
 void DriverBase::scheduleDestroySlow(BufferDescriptor&& buffer) noexcept {
-    auto const handler = buffer.getHandler();
-    scheduleCallback(handler, [buffer = std::move(buffer)]() {
+    scheduleCallback(buffer.getHandler(), [buffer = std::move(buffer)]() {
         // user callback is called when BufferDescriptor gets destroyed
     });
 }

filament/backend/src/metal/MetalBlitter.mm

@@ -20,7 +20,6 @@
 #include "MetalUtils.h"
 
 #include <utils/Panic.h>
-#include <utils/Log.h>
 
 namespace filament::backend {
 

filament/backend/src/metal/MetalBufferPool.mm

@@ -19,7 +19,6 @@
 #include "MetalContext.h"
 
 #include <utils/Panic.h>
-#include <utils/Log.h>
 #include <utils/trap.h>
 
 #include <thread>

filament/backend/src/metal/MetalExternalImage.mm

@@ -21,7 +21,6 @@
 #include "MetalUtils.h"
 
 #include <utils/Panic.h>
-#include <utils/Log.h>
 #include <utils/trap.h>
 
 #define NSERROR_CHECK(message)                                                                     \

filament/backend/src/metal/MetalHandles.mm

@@ -245,53 +245,30 @@ void MetalSwapChain::present() {
     }
 }
 
-#ifndef FILAMENT_RELEASE_PRESENT_DRAWABLE_MAIN_THREAD
-#define FILAMENT_RELEASE_PRESENT_DRAWABLE_MAIN_THREAD 1
-#endif
-
-class PresentDrawableData {
-public:
-    PresentDrawableData() = delete;
-    PresentDrawableData(const PresentDrawableData&) = delete;
-    PresentDrawableData& operator=(const PresentDrawableData&) = delete;
-
-    static PresentDrawableData* create(id<CAMetalDrawable> drawable, MetalDriver* driver) {
-        assert_invariant(driver);
-        return new PresentDrawableData(drawable, driver);
-    }
-
-    static void maybePresentAndDestroyAsync(PresentDrawableData* that, bool shouldPresent) {
-        if (shouldPresent) {
-           [that->mDrawable present];
-        }
-
-#if FILAMENT_RELEASE_PRESENT_DRAWABLE_MAIN_THREAD == 1
-        // mDrawable is acquired on the driver thread. Typically, we would release this object on
-        // the same thread, but after receiving consistent crash reports from within
-        // [CAMetalDrawable dealloc], we suspect this object requires releasing on the main thread.
-        dispatch_async(dispatch_get_main_queue(), ^{ cleanupAndDestroy(that); });
-#else
-        that->mDriver->runAtNextTick([that]() { cleanupAndDestroy(that); });
-#endif
-    }
-
-private:
-    PresentDrawableData(id<CAMetalDrawable> drawable, MetalDriver* driver)
-        : mDrawable(drawable), mDriver(driver) {}
-
-    static void cleanupAndDestroy(PresentDrawableData *that) {
-        that->mDrawable = nil;
-        that->mDriver = nullptr;
-        delete that;
-    }
-
-    id<CAMetalDrawable> mDrawable;
-    MetalDriver* mDriver = nullptr;
+struct PresentDrawableData {
+    void* drawable = nullptr;
+    MetalDriver* driver = nullptr;
 };
 
 void presentDrawable(bool presentFrame, void* user) {
     auto* presentDrawableData = static_cast<PresentDrawableData*>(user);
-    PresentDrawableData::maybePresentAndDestroyAsync(presentDrawableData, presentFrame);
+
+    // CFBridgingRelease here is used to balance the CFBridgingRetain inside acquireDrawable.
+    id<CAMetalDrawable> drawable =
+            (id<CAMetalDrawable>)CFBridgingRelease(presentDrawableData->drawable);
+    if (presentFrame) {
+        [drawable present];
+    }
+
+    // Schedule the drawable destruction on the driver thread.
+    void* voidDrawable = (void*) CFBridgingRetain(drawable);
+    MetalDriver* driver = presentDrawableData->driver;
+    driver->runAtNextTick([voidDrawable]() {
+        // The drawable is released here.
+        CFBridgingRelease(voidDrawable);
+    });
+
+    delete presentDrawableData;
 }
 
 void MetalSwapChain::scheduleFrameScheduledCallback() {
@@ -300,16 +277,21 @@ void MetalSwapChain::scheduleFrameScheduledCallback() {
     }
 
     assert_invariant(drawable);
-
-    // Destroy this by calling maybePresentAndDestroyAsync() later.
-    auto* presentData = PresentDrawableData::create(drawable, context.driver);
-
-    FrameScheduledCallback userCallback = frameScheduledCallback;
+    FrameScheduledCallback callback = frameScheduledCallback;
+    // This block strongly captures drawable to keep it alive until the handler executes.
+    // We cannot simply reference this->drawable inside the block because the block would then only
+    // capture the _this_ pointer (MetalSwapChain*) instead of the drawable.
+    id<CAMetalDrawable> d = drawable;
     void* userData = frameScheduledUserData;
-
+    MetalDriver* driver = context.driver;
     [getPendingCommandBuffer(&context) addScheduledHandler:^(id<MTLCommandBuffer> cb) {
-        PresentCallable callable(presentDrawable, static_cast<void*>(presentData));
-        userCallback(callable, userData);
+        // CFBridgingRetain is used here to give the drawable a +1 retain count before
+        // casting it to a void*.
+        auto* presentDrawableData = new PresentDrawableData;
+        presentDrawableData->drawable = (void*) CFBridgingRetain(d);
+        presentDrawableData->driver = driver;
+        PresentCallable callable(presentDrawable, (void*) presentDrawableData);
+        callback(callable, userData);
     }];
 }
 

filament/backend/src/metal/MetalState.mm

@@ -18,8 +18,6 @@
 
 #include "MetalEnums.h"
 
-#include <utils/Log.h>
-
 namespace filament {
 namespace backend {
 

filament/backend/src/opengl/OpenGLContext.cpp

@@ -427,6 +427,7 @@ void OpenGLContext::initBugs(Bugs* bugs, Extensions const& exts,
             if (strstr(renderer, "Mali-T")) {
                 bugs->disable_glFlush = true;
                 bugs->disable_shared_context_draws = true;
+                bugs->texture_external_needs_rebind = true;
                 // We have not verified that timer queries work on Mali-T, so we disable to be safe.
                 bugs->dont_use_timer_query = true;
             }

filament/backend/src/opengl/OpenGLContext.h

@@ -222,6 +222,10 @@ public:
         // Some drivers have gl state issues when drawing from shared contexts
         bool disable_shared_context_draws;
 
+        // Some drivers require the GL_TEXTURE_EXTERNAL_OES target to be bound when
+        // the texture image changes, even if it's already bound to that texture
+        bool texture_external_needs_rebind;
+
         // Some web browsers seem to immediately clear the default framebuffer when calling
         // glInvalidateFramebuffer with WebGL 2.0
         bool disable_invalidate_framebuffer;
@@ -429,6 +433,9 @@ private:
             {   bugs.disable_shared_context_draws,
                     "disable_shared_context_draws",
                     ""},
+            {   bugs.texture_external_needs_rebind,
+                    "texture_external_needs_rebind",
+                    ""},
             {   bugs.disable_invalidate_framebuffer,
                     "disable_invalidate_framebuffer",
                     ""},
@@ -704,7 +711,7 @@ void OpenGLContext::bindTexture(GLuint unit, GLuint target, GLuint texId, size_t
     update_state(state.textures.units[unit].targets[targetIndex].texture_id, texId, [&]() {
         activeTexture(unit);
         glBindTexture(target, texId);
-    }, target == GL_TEXTURE_EXTERNAL_OES);
+    }, (target == GL_TEXTURE_EXTERNAL_OES) && bugs.texture_external_needs_rebind);
 }
 
 void OpenGLContext::bindTexture(GLuint unit, GLuint target, GLuint texId) noexcept {

filament/backend/src/opengl/OpenGLDriver.cpp

@@ -147,9 +147,9 @@ Driver* OpenGLDriver::create(OpenGLPlatform* const platform,
 #endif
 
     size_t const defaultSize = FILAMENT_OPENGL_HANDLE_ARENA_SIZE_IN_MB * 1024U * 1024U;
-    Platform::DriverConfig validConfig{ driverConfig };
+    Platform::DriverConfig validConfig {driverConfig};
     validConfig.handleArenaSize = std::max(driverConfig.handleArenaSize, defaultSize);
-    OpenGLDriver* const driver = new(std::nothrow) OpenGLDriver(ec, validConfig);
+    OpenGLDriver* const driver = new OpenGLDriver(ec, validConfig);
     return driver;
 }
 
@@ -171,8 +171,7 @@ OpenGLDriver::OpenGLDriver(OpenGLPlatform* platform, const Platform::DriverConfi
           mContext(),
           mShaderCompilerService(*this),
           mHandleAllocator("Handles", driverConfig.handleArenaSize),
-          mSamplerMap(32),
-          mDriverConfig(driverConfig) {
+          mSamplerMap(32) {
 
     std::fill(mSamplerBindings.begin(), mSamplerBindings.end(), nullptr);
 

filament/backend/src/opengl/OpenGLDriver.h

@@ -400,9 +400,6 @@ private:
     // timer query implementation
     OpenGLTimerQueryInterface* mTimerQueryImpl = nullptr;
 
-    const Platform::DriverConfig mDriverConfig;
-    Platform::DriverConfig const& getDriverConfig() const noexcept { return mDriverConfig; }
-
     // for ES2 sRGB support
     GLSwapChain* mCurrentDrawSwapChain = nullptr;
     bool mRec709OutputColorspace = false;

filament/backend/src/opengl/ShaderCompilerService.cpp

@@ -151,12 +151,6 @@ bool ShaderCompilerService::isParallelShaderCompileSupported() const noexcept {
 }
 
 void ShaderCompilerService::init() noexcept {
-    if (UTILS_UNLIKELY(mDriver.getDriverConfig().disableParallelShaderCompile)) {
-        // user disabled parallel shader compile
-        mMode = Mode::SYNCHRONOUS;
-        return;
-    }
-
     // Here we decide which mode we'll be using. We always prefer our own thread-pool if
     // that mode is available because, we have no control on how the compilation queues are
     // handled if done by the driver (so at the very least we'd need to decode this per-driver).

filament/backend/src/opengl/ShaderCompilerService.h

@@ -109,7 +109,7 @@ private:
     };
 
     enum class Mode {
-        UNDEFINED,      // init() has not been called yet.
+        UNDEFINED,      // init() has not beed called yet.
         SYNCHRONOUS,    // synchronous shader compilation
         THREAD_POOL,    // asynchronous shader compilation using a thread-pool (most common)
         ASYNCHRONOUS    // asynchronous shader compilation using KHR_parallel_shader_compile

filament/backend/src/vulkan/platform/VulkanPlatformAndroidLinuxWindows.cpp

@@ -15,7 +15,6 @@
  */
 
 #include <backend/platforms/VulkanPlatform.h>
-#include <backend/DriverEnums.h>
 
 #include "vulkan/VulkanConstants.h"
 #include "vulkan/VulkanDriverFactory.h"
@@ -24,11 +23,6 @@
 
 #include <bluevk/BlueVK.h>
 
-#include <tuple>
-
-#include <stdint.h>
-#include <stddef.h>
-
 #if defined(__linux__) || defined(__FreeBSD__)
 #define LINUX_OR_FREEBSD 1
 #endif

filament/include/filament/Box.h

@@ -21,14 +21,10 @@
 
 #include <utils/compiler.h>
 
-#include <math/mat3.h>
+#include <limits>
+
 #include <math/mat4.h>
 #include <math/vec3.h>
-#include <math/vec4.h>
-
-#include <float.h>
-
-#include <stddef.h>
 
 namespace filament {
 
@@ -74,7 +70,7 @@ public:
      * @return This bounding box
      */
     Box& set(const math::float3& min, const math::float3& max) noexcept {
-        // float3 ctor needed for Visual Studio
+        // float3 ctor needed for visual studio
         center     = (max + min) * math::float3(0.5f);
         halfExtent = (max - min) * math::float3(0.5f);
         return *this;
@@ -134,17 +130,17 @@ public:
 struct UTILS_PUBLIC Aabb {
 
     /** min coordinates */
-    math::float3 min = FLT_MAX;
+    math::float3 min = std::numeric_limits<float>::max();
 
     /** max coordinates */
-    math::float3 max = -FLT_MAX;
+    math::float3 max = std::numeric_limits<float>::lowest();
 
     /**
      * Computes the center of the box.
      * @return (max + min)/2
      */
     math::float3 center() const noexcept {
-        // float3 ctor needed for Visual Studio
+        // float3 ctor needed for visual studio
         return (max + min) * math::float3(0.5f);
     }
 
@@ -153,7 +149,7 @@ struct UTILS_PUBLIC Aabb {
      * @return (max - min)/2
      */
     math::float3 extent() const noexcept {
-        // float3 ctor needed for Visual Studio
+        // float3 ctor needed for visual studio
         return (max - min) * math::float3(0.5f);
     }
 
@@ -202,14 +198,12 @@ struct UTILS_PUBLIC Aabb {
      * @return the maximum signed distance to the box. Negative if p is in the box
      */
     float contains(math::float3 p) const noexcept {
-        // we don't use std::max to avoid a dependency on <algorithm>
-        auto const maximum = [](auto a, auto b) { return a > b ? a : b; };
         float d = min.x - p.x;
-        d = maximum(d, min.y - p.y);
-        d = maximum(d, min.z - p.z);
-        d = maximum(d, p.x - max.x);
-        d = maximum(d, p.y - max.y);
-        d = maximum(d, p.z - max.z);
+        d = std::max(d, min.y - p.y);
+        d = std::max(d, min.z - p.z);
+        d = std::max(d, p.x - max.x);
+        d = std::max(d, p.y - max.y);
+        d = std::max(d, p.z - max.z);
         return d;
     }
 

filament/include/filament/BufferObject.h

@@ -22,13 +22,11 @@
 #include <filament/FilamentAPI.h>
 
 #include <backend/DriverEnums.h>
+
 #include <backend/BufferDescriptor.h>
 
 #include <utils/compiler.h>
 
-#include <stdint.h>
-#include <stddef.h>
-
 namespace filament {
 
 class FBufferObject;

filament/include/filament/Camera.h

@@ -28,11 +28,6 @@
 #include <math/vec4.h>
 #include <math/mat4.h>
 
-#include <math.h>
-
-#include <stdint.h>
-#include <stddef.h>
-
 namespace utils {
 class Entity;
 } // namespace utils
@@ -189,7 +184,7 @@ public:
      * @see Fov.
      */
     static math::mat4 projection(Fov direction, double fovInDegrees,
-            double aspect, double near, double far = INFINITY);
+            double aspect, double near, double far = std::numeric_limits<double>::infinity());
 
     /** Returns the projection matrix from the focal length.
      *
@@ -199,7 +194,7 @@ public:
      * @param far         distance in world units from the camera to the far plane. \p far > \p near.
      */
     static math::mat4 projection(double focalLengthInMillimeters,
-            double aspect, double near, double far = INFINITY);
+            double aspect, double near, double far = std::numeric_limits<double>::infinity());
 
 
     /** Sets the projection matrix from a frustum defined by six planes.

filament/include/filament/Color.h

@@ -24,9 +24,6 @@
 #include <math/vec3.h>
 #include <math/vec4.h>
 
-#include <stdint.h>
-#include <stddef.h>
-
 namespace filament {
 
 //! RGB color in linear space

filament/include/filament/ColorGrading.h

@@ -26,9 +26,6 @@
 
 #include <math/mathfwd.h>
 
-#include <stdint.h>
-#include <stddef.h>
-
 namespace filament {
 
 class Engine;

filament/include/filament/ColorSpace.h

@@ -18,6 +18,7 @@
 #define TNT_FILAMENT_COLOR_SPACE_H
 
 #include <math/vec2.h>
+#include <math/vec3.h>
 
 namespace filament::color {
 

filament/include/filament/DebugRegistry.h

@@ -25,7 +25,7 @@
 
 #include <math/mathfwd.h>
 
-#include <stddef.h>
+#include <stdint.h>
 
 namespace filament {
 

filament/include/filament/Engine.h

@@ -19,14 +19,9 @@
 
 #include <filament/FilamentAPI.h>
 
-#include <backend/DriverEnums.h>
 #include <backend/Platform.h>
 
 #include <utils/compiler.h>
-#include <utils/Invocable.h>
-
-#include <stdint.h>
-#include <stddef.h>
 
 namespace utils {
 class Entity;

filament/include/filament/Fence.h

@@ -25,8 +25,6 @@
 
 #include <utils/compiler.h>
 
-#include <stdint.h>
-
 namespace filament {
 
 /**

filament/include/filament/Frustum.h

@@ -23,12 +23,9 @@
 
 #include <math/mat4.h>
 #include <math/vec3.h>
-#include <math/vec4.h>
 
 #include <utils/unwindows.h> // Because we define NEAR and FAR in the Plane enum.
 
-#include <stdint.h>
-
 namespace filament {
 
 class Box;

filament/include/filament/IndexBuffer.h

@@ -27,7 +27,6 @@
 
 #include <utils/compiler.h>
 
-#include <stdint.h>
 #include <stddef.h>
 
 namespace filament {

filament/include/filament/IndirectLight.h

@@ -25,8 +25,6 @@
 
 #include <math/mathfwd.h>
 
-#include <stdint.h>
-
 namespace filament {
 
 class Engine;

filament/include/filament/InstanceBuffer.h

@@ -18,14 +18,11 @@
 #define TNT_FILAMENT_INSTANCEBUFFER_H
 
 #include <filament/FilamentAPI.h>
+
 #include <filament/Engine.h>
 
-#include <utils/compiler.h>
-
 #include <math/mathfwd.h>
 
-#include <stddef.h>
-
 namespace filament {
 
 /**
@@ -48,7 +45,7 @@ public:
          *                      >= 1 and <= \c Engine::getMaxAutomaticInstances()
          * @see Engine::getMaxAutomaticInstances
          */
-        explicit Builder(size_t instanceCount) noexcept;
+        Builder(size_t instanceCount) noexcept;
 
         Builder(Builder const& rhs) noexcept;
         Builder(Builder&& rhs) noexcept;

filament/include/filament/LightManager.h

@@ -27,9 +27,6 @@
 #include <math/mathfwd.h>
 #include <math/quat.h>
 
-#include <stdint.h>
-#include <stddef.h>
-
 namespace utils {
     class Entity;
 } // namespace utils

filament/include/filament/Material.h

@@ -30,12 +30,7 @@
 
 #include <math/mathfwd.h>
 
-#include <type_traits>
-#include <utility>
-
-#include <stddef.h>
 #include <stdint.h>
-#include <string.h>
 
 namespace utils {
     class CString;

filament/include/filament/MaterialInstance.h

@@ -28,12 +28,6 @@
 
 #include <math/mathfwd.h>
 
-#include <type_traits>
-
-#include <stddef.h>
-#include <stdint.h>
-#include <string.h>
-
 namespace filament {
 
 class Material;

filament/include/filament/MorphTargetBuffer.h

@@ -21,11 +21,8 @@
 
 #include <filament/Engine.h>
 
-#include <utils/compiler.h>
-
 #include <math/mathfwd.h>
 
-#include <stddef.h>
 
 namespace filament {
 

filament/include/filament/Options.h

@@ -19,13 +19,10 @@
 
 #include <filament/Color.h>
 
-#include <math/vec2.h>
-#include <math/vec3.h>
+#include <stdint.h>
 
 #include <math.h>
 
-#include <stdint.h>
-
 namespace filament {
 
 class Texture;
@@ -441,7 +438,6 @@ struct TemporalAntiAliasingOptions {
     float filterWidth = 1.0f;   //!< reconstruction filter width typically between 0.2 (sharper, aliased) and 1.5 (smoother)
     float feedback = 0.12f;     //!< history feedback, between 0 (maximum temporal AA) and 1 (no temporal AA).
     float lodBias = -1.0f;      //!< texturing lod bias (typically -1 or -2)
-    float sharpness = 0.0f;     //!< post-TAA sharpen, especially useful when upscaling is true.
     bool enabled = false;       //!< enables or disables temporal anti-aliasing
     bool upscaling = false;     //!< 4x TAA upscaling. Disables Dynamic Resolution. [BETA]
 
@@ -461,8 +457,7 @@ struct TemporalAntiAliasingOptions {
         RGSS_X4,             //!  4-samples, rotated grid sampling
         UNIFORM_HELIX_X4,    //!  4-samples, uniform grid in helix sequence
         HALTON_23_X8,        //!  8-samples of halton 2,3
-        HALTON_23_X16,       //! 16-samples of halton 2,3
-        HALTON_23_X32        //! 32-samples of halton 2,3
+        HALTON_23_X16        //! 16-samples of halton 2,3
     };
 
     bool filterHistory = true;      //!< whether to filter the history buffer

filament/include/filament/RenderTarget.h

@@ -24,10 +24,7 @@
 #include <backend/DriverEnums.h>
 #include <backend/TargetBufferInfo.h>
 
-#include <utils/compiler.h>
-
 #include <stddef.h>
-#include <stdint.h>
 
 namespace filament {
 

filament/include/filament/RenderableManager.h

@@ -29,15 +29,9 @@
 #include <utils/FixedCapacityVector.h>
 
 #include <math/mathfwd.h>
-#include <math/vec3.h>
-#include <math/vec4.h>
 
 #include <type_traits>
 
-#include <float.h>
-#include <stddef.h>
-#include <stdint.h>
-
 namespace utils {
     class Entity;
 } // namespace utils
@@ -879,8 +873,8 @@ void RenderableManager::setMorphTargetBufferAt(Instance instance, uint8_t level,
 template<typename VECTOR, typename INDEX, typename, typename>
 Box RenderableManager::computeAABB(VECTOR const* vertices, INDEX const* indices, size_t count,
         size_t stride) noexcept {
-    math::float3 bmin(FLT_MAX);
-    math::float3 bmax(-FLT_MAX);
+    math::float3 bmin(std::numeric_limits<float>::max());
+    math::float3 bmax(std::numeric_limits<float>::lowest());
     for (size_t i = 0; i < count; ++i) {
         VECTOR const* p = reinterpret_cast<VECTOR const*>(
                 (char const*)vertices + indices[i] * stride);

filament/include/filament/Renderer.h

@@ -23,6 +23,9 @@
 
 #include <utils/compiler.h>
 
+#include <backend/PresentCallable.h>
+#include <backend/DriverEnums.h>
+
 #include <math/vec4.h>
 
 #include <stdint.h>

filament/include/filament/Scene.h

@@ -24,8 +24,6 @@
 #include <utils/compiler.h>
 #include <utils/Invocable.h>
 
-#include <stddef.h>
-
 namespace utils {
     class Entity;
 } // namespace utils

filament/include/filament/SkinningBuffer.h

@@ -26,7 +26,7 @@
 #include <math/mathfwd.h>
 
 #include <stddef.h>
-#include <stdint.h>
+
 
 namespace filament {
 

filament/include/filament/Skybox.h

@@ -23,9 +23,8 @@
 
 #include <utils/compiler.h>
 
-#include <math/mathfwd.h>
-
 #include <stdint.h>
+#include <math/mathfwd.h>
 
 namespace filament {
 

filament/include/filament/Stream.h

@@ -20,12 +20,12 @@
 #include <filament/FilamentAPI.h>
 
 #include <backend/DriverEnums.h>
+
+#include <backend/PixelBufferDescriptor.h>
 #include <backend/CallbackHandler.h>
 
 #include <utils/compiler.h>
 
-#include <stdint.h>
-
 namespace filament {
 
 class FStream;

filament/include/filament/SwapChain.h

@@ -21,12 +21,11 @@
 
 #include <backend/CallbackHandler.h>
 #include <backend/DriverEnums.h>
+#include <backend/PresentCallable.h>
 
 #include <utils/compiler.h>
 #include <utils/Invocable.h>
 
-#include <stdint.h>
-
 namespace filament {
 
 class Engine;

filament/include/filament/Texture.h

@@ -20,16 +20,12 @@
 #define TNT_FILAMENT_TEXTURE_H
 
 #include <filament/FilamentAPI.h>
-
 #include <backend/DriverEnums.h>
 #include <backend/PixelBufferDescriptor.h>
 
 #include <utils/compiler.h>
 
-#include <utility>
-
 #include <stddef.h>
-#include <stdint.h>
 
 namespace filament {
 

filament/include/filament/TextureSampler.h

@@ -25,8 +25,6 @@
 
 #include <math.h>
 
-#include <stdint.h>
-
 namespace filament {
 
 /**

filament/include/filament/ToneMapper.h

@@ -21,8 +21,6 @@
 
 #include <math/mathfwd.h>
 
-#include <stdint.h>
-
 namespace filament {
 
 /**

filament/include/filament/TransformManager.h

@@ -26,7 +26,6 @@
 
 #include <iterator>
 
-#include <stddef.h>
 
 namespace utils {
 class Entity;

filament/include/filament/VertexBuffer.h

@@ -27,9 +27,6 @@
 
 #include <utils/compiler.h>
 
-#include <stddef.h>
-#include <stdint.h>
-
 namespace filament {
 
 class FVertexBuffer;

filament/include/filament/View.h

@@ -19,19 +19,17 @@
 #ifndef TNT_FILAMENT_VIEW_H
 #define TNT_FILAMENT_VIEW_H
 
+#include <filament/Color.h>
 #include <filament/FilamentAPI.h>
 #include <filament/Options.h>
 
+#include <backend/DriverEnums.h>
+
 #include <utils/compiler.h>
 #include <utils/Entity.h>
 
 #include <math/mathfwd.h>
 
-#include <utility>
-
-#include <stddef.h>
-#include <stdint.h>
-
 namespace filament {
 
 namespace backend {

filament/include/filament/Viewport.h

@@ -23,6 +23,9 @@
 
 #include <utils/compiler.h>
 
+#include <math/scalar.h>
+#include <math/mathfwd.h>
+
 #include <stddef.h>
 #include <stdint.h>
 

filament/src/PostProcessManager.cpp

@@ -64,7 +64,6 @@
 #include <math/mat3.h>
 #include <math/mat4.h>
 #include <math/scalar.h>
-#include <math/vec2.h>
 #include <math/vec3.h>
 #include <math/vec4.h>
 
@@ -75,7 +74,6 @@
 #include <utils/FixedCapacityVector.h>
 
 #include <algorithm>
-#include <array>
 #include <cmath>
 #include <limits>
 #include <string_view>
@@ -115,7 +113,7 @@ PostProcessManager::PostProcessMaterial::PostProcessMaterial() noexcept {
 }
 
 PostProcessManager::PostProcessMaterial::PostProcessMaterial(MaterialInfo const& info) noexcept
-        : PostProcessMaterial() {
+    : PostProcessMaterial() {
     mData = info.data; // aliased to mMaterial
     mSize = info.size;
     mConstants = info.constants;
@@ -167,7 +165,7 @@ void PostProcessManager::PostProcessMaterial::loadMaterial(FEngine& engine) cons
     mHasMaterial = true;
     auto builder = Material::Builder();
     builder.package(mData, mSize);
-    for (auto const& constant: mConstants) {
+    for (auto const& constant : mConstants) {
         std::visit([&](auto&& arg) {
             builder.constant(constant.name.data(), constant.name.size(), arg);
         }, constant.value);
@@ -189,60 +187,63 @@ PipelineState PostProcessManager::PostProcessMaterial::getPipelineState(
     FMaterial* const material = getMaterial(engine);
     material->prepareProgram(Variant{ variantKey });
     return {
-            .program = material->getProgram(Variant{ variantKey }),
+            .program = material->getProgram(Variant{variantKey}),
             .rasterState = material->getRasterState(),
             .scissor = material->getDefaultInstance()->getScissor()
     };
 }
 
 UTILS_NOINLINE
-FMaterialInstance* PostProcessManager::PostProcessMaterial::getMaterialInstance(
-        FEngine& engine) const noexcept {
+FMaterialInstance* PostProcessManager::PostProcessMaterial::getMaterialInstance(FEngine& engine) const noexcept {
     FMaterial* const material = getMaterial(engine);
     return material->getDefaultInstance();
 }
 
 // ------------------------------------------------------------------------------------------------
 
-const PostProcessManager::JitterSequence<4> PostProcessManager::sRGSS4 = {{{
+const PostProcessManager::JitterSequence<4> PostProcessManager::sRGSS4 = {{
         { 0.625f, 0.125f },
         { 0.125f, 0.375f },
         { 0.875f, 0.625f },
         { 0.375f, 0.875f }
-}}};
+}};
 
-const PostProcessManager::JitterSequence<4> PostProcessManager::sUniformHelix4 = {{{
+const PostProcessManager::JitterSequence<4> PostProcessManager::sUniformHelix4 = {{
         { 0.25f, 0.25f },
         { 0.75f, 0.75f },
         { 0.25f, 0.75f },
         { 0.75f, 0.25f },
-}}};
+}};
 
-template<size_t COUNT>
-constexpr auto halton() {
-    std::array<float2, COUNT> h;
-    for (size_t i = 0; i < COUNT; i++) {
-        h[i] = {
-                filament::halton(i, 2),
-                filament::halton(i, 3) };
-    }
-    return h;
-}
-
-const PostProcessManager::JitterSequence<32>
-        PostProcessManager::sHaltonSamples = { halton<32>() };
+const PostProcessManager::JitterSequence<16> PostProcessManager::sHaltonSamples = {{
+        { filament::halton( 0, 2), filament::halton( 0, 3) },
+        { filament::halton( 1, 2), filament::halton( 1, 3) },
+        { filament::halton( 2, 2), filament::halton( 2, 3) },
+        { filament::halton( 3, 2), filament::halton( 3, 3) },
+        { filament::halton( 4, 2), filament::halton( 4, 3) },
+        { filament::halton( 5, 2), filament::halton( 5, 3) },
+        { filament::halton( 6, 2), filament::halton( 6, 3) },
+        { filament::halton( 7, 2), filament::halton( 7, 3) },
+        { filament::halton( 8, 2), filament::halton( 8, 3) },
+        { filament::halton( 9, 2), filament::halton( 9, 3) },
+        { filament::halton(10, 2), filament::halton(10, 3) },
+        { filament::halton(11, 2), filament::halton(11, 3) },
+        { filament::halton(12, 2), filament::halton(12, 3) },
+        { filament::halton(13, 2), filament::halton(13, 3) },
+        { filament::halton(14, 2), filament::halton(14, 3) },
+        { filament::halton(15, 2), filament::halton(15, 3) }
+}};
 
 PostProcessManager::PostProcessManager(FEngine& engine) noexcept
         : mEngine(engine),
-          mWorkaroundSplitEasu(false),
-          mWorkaroundAllowReadOnlyAncillaryFeedbackLoop(false) {
+         mWorkaroundSplitEasu(false),
+         mWorkaroundAllowReadOnlyAncillaryFeedbackLoop(false) {
 }
 
 PostProcessManager::~PostProcessManager() noexcept = default;
 
 UTILS_NOINLINE
-void PostProcessManager::registerPostProcessMaterial(std::string_view name,
-        MaterialInfo const& info) {
+void PostProcessManager::registerPostProcessMaterial(std::string_view name, MaterialInfo const& info) {
     mMaterialRegistry.try_emplace(name, info);
 }
 
@@ -307,7 +308,6 @@ static const PostProcessManager::MaterialInfo sMaterialList[] = {
         { "fsr_rcas",                   MATERIAL(FSR_RCAS) },
         { "debugShadowCascades",        MATERIAL(DEBUGSHADOWCASCADES) },
         { "resolveDepth",               MATERIAL(RESOLVEDEPTH) },
-        { "shadowmap",                  MATERIAL(SHADOWMAP) },
 };
 
 void PostProcessManager::init() noexcept {
@@ -326,13 +326,13 @@ void PostProcessManager::init() noexcept {
             driver.isWorkaroundNeeded(Workaround::ALLOW_READ_ONLY_ANCILLARY_FEEDBACK_LOOP);
 
     #pragma nounroll
-    for (auto const& info: sMaterialListFeatureLevel0) {
+    for (auto const& info : sMaterialListFeatureLevel0) {
         registerPostProcessMaterial(info.name, info);
     }
 
     if (mEngine.getActiveFeatureLevel() >= FeatureLevel::FEATURE_LEVEL_1) {
         #pragma nounroll
-        for (auto const& info: sMaterialList) {
+        for (auto const& info : sMaterialList) {
             registerPostProcessMaterial(info.name, info);
         }
     }
@@ -1683,8 +1683,8 @@ FrameGraphId<FrameGraphTexture> PostProcessManager::dof(FrameGraph& fg,
 
     // we assume the width/height is already multiple of 16
     assert_invariant(!(colorDesc.width  & 0xF) && !(colorDesc.height & 0xF));
-    const uint32_t tileBufferWidth  = width;
-    const uint32_t tileBufferHeight = height;
+    const uint32_t tileBufferWidth  = colorDesc.width  / dofResolution;
+    const uint32_t tileBufferHeight = colorDesc.height / dofResolution;
     const size_t tileReductionCount = ctz(tileSize / dofResolution);
 
     struct PostProcessDofTiling1 {
@@ -2569,8 +2569,6 @@ void PostProcessManager::prepareTaa(FrameGraph& fg,
             case JitterPattern::HALTON_23_X8:
                 return sHaltonSamples(frameIndex % 8);
             case JitterPattern::HALTON_23_X16:
-                return sHaltonSamples(frameIndex % 16);
-            case JitterPattern::HALTON_23_X32:
                 return sHaltonSamples(frameIndex);
         }
     };
@@ -2620,7 +2618,6 @@ void PostProcessManager::configureTemporalAntiAliasingMaterial(
         }
     };
 
-    setConstantParameter(ma, "upscaling", taaOptions.upscaling);
     setConstantParameter(ma, "historyReprojection", taaOptions.historyReprojection);
     setConstantParameter(ma, "filterHistory", taaOptions.filterHistory);
     setConstantParameter(ma, "filterInput", taaOptions.filterInput);
@@ -2770,77 +2767,24 @@ FrameGraphId<FrameGraphTexture> PostProcessManager::taa(FrameGraph& fg,
             });
 
     input = colorGradingConfig.asSubpass ? taaPass->tonemappedOutput : taaPass->output;
-    auto history = input;
-
-    // optional sharpen pass from FSR1
-    if (taaOptions.sharpness > 0.0f) {
-        input = rcas(fg, taaOptions.sharpness,
-                input, fg.getDescriptor(input), colorGradingConfig.translucent);
-    }
 
     struct ExportColorHistoryData {
         FrameGraphId<FrameGraphTexture> color;
     };
-    fg.addPass<ExportColorHistoryData>("Export TAA history",
+    auto& exportHistoryPass = fg.addPass<ExportColorHistoryData>("Export TAA history",
             [&](FrameGraph::Builder& builder, auto& data) {
                 // We need to use sideEffect here to ensure this pass won't be culled.
                 // The "output" of this pass is going to be used during the next frame as
                 // an "import".
                 builder.sideEffect();
-                data.color = builder.sample(history); // FIXME: an access must be declared for detach(), why?
-            }, [&current](FrameGraphResources const& resources, auto const& data, auto&) {
-                resources.detach(data.color, &current.color, &current.desc);
+                data.color = builder.sample(input); // FIXME: an access must be declared for detach(), why?
+            }, [&current](FrameGraphResources const& resources, auto const& data,
+                    backend::DriverApi&) {
+                resources.detach(data.color,
+                        &current.color, &current.desc);
             });
 
-    return input;
-}
-
-FrameGraphId<FrameGraphTexture> PostProcessManager::rcas(
-        FrameGraph& fg,
-        float sharpness,
-        FrameGraphId<FrameGraphTexture> input,
-        FrameGraphTexture::Descriptor const& outDesc,
-        bool translucent) {
-
-    struct QuadBlitData {
-        FrameGraphId<FrameGraphTexture> input;
-        FrameGraphId<FrameGraphTexture> output;
-    };
-
-    auto& ppFsrRcas = fg.addPass<QuadBlitData>("FidelityFX FSR1 Rcas",
-            [&](FrameGraph::Builder& builder, auto& data) {
-                data.input = builder.sample(input);
-                data.output = builder.createTexture("FFX FSR1 Rcas output", outDesc);
-                data.output = builder.declareRenderPass(data.output);
-            },
-            [=](FrameGraphResources const& resources,
-                    auto const& data, DriverApi& driver) {
-
-                auto input = resources.getTexture(data.input);
-                auto out = resources.getRenderPassInfo();
-                auto const& outputDesc = resources.getDescriptor(data.input);
-
-                auto& material = getPostProcessMaterial("fsr_rcas");
-                FMaterialInstance* const mi = material.getMaterialInstance(mEngine);
-
-                FSRUniforms uniforms;
-                FSR_SharpeningSetup(&uniforms, { .sharpness = 2.0f - 2.0f * sharpness });
-                mi->setParameter("RcasCon", uniforms.RcasCon);
-                mi->setParameter("color", input, {}); // uses texelFetch
-                mi->setParameter("resolution", float4{
-                        outputDesc.width, outputDesc.height,
-                        1.0f / outputDesc.width, 1.0f / outputDesc.height });
-                mi->commit(driver);
-                mi->use(driver);
-
-                const uint8_t variant = uint8_t(
-                        translucent ? PostProcessVariant::TRANSLUCENT : PostProcessVariant::OPAQUE);
-
-                PipelineState const pipeline(material.getPipelineState(mEngine, variant));
-                render(out, pipeline, driver);
-            });
-
-    return ppFsrRcas->output;
+    return exportHistoryPass->color;
 }
 
 FrameGraphId<FrameGraphTexture> PostProcessManager::upscale(FrameGraph& fg, bool translucent,
@@ -3003,9 +2947,41 @@ FrameGraphId<FrameGraphTexture> PostProcessManager::upscale(FrameGraph& fg, bool
     auto output = ppQuadBlit->output;
 
     // if we had to take the low quality fallback, we still do the "sharpen pass"
-    if (dsrOptions.sharpness > 0.0f &&
-            (dsrOptions.quality != QualityLevel::LOW || lowQualityFallback)) {
-        output = rcas(fg, dsrOptions.sharpness, output, outDesc, translucent);
+    if (dsrOptions.sharpness > 0.0f && (dsrOptions.quality != QualityLevel::LOW || lowQualityFallback)) {
+        auto& ppFsrRcas = fg.addPass<QuadBlitData>("FidelityFX FSR1 Rcas",
+                [&](FrameGraph::Builder& builder, auto& data) {
+                    data.input = builder.sample(output);
+                    data.output = builder.createTexture("FFX FSR1 Rcas output", outDesc);
+                    data.output = builder.declareRenderPass(data.output);
+                },
+                [=](FrameGraphResources const& resources,
+                        auto const& data, DriverApi& driver) {
+
+                    auto color = resources.getTexture(data.input);
+                    auto out = resources.getRenderPassInfo();
+                    auto const& outputDesc = resources.getDescriptor(data.output);
+
+                    auto& material = getPostProcessMaterial("fsr_rcas");
+                    FMaterialInstance* const mi = material.getMaterialInstance(mEngine);
+
+                    FSRUniforms uniforms;
+                    FSR_SharpeningSetup(&uniforms, { .sharpness = 2.0f - 2.0f * dsrOptions.sharpness });
+                    mi->setParameter("RcasCon", uniforms.RcasCon);
+                    mi->setParameter("color", color, { }); // uses texelFetch
+                    mi->setParameter("resolution", float4{
+                            outputDesc.width, outputDesc.height,
+                            1.0f / outputDesc.width, 1.0f / outputDesc.height });
+                    mi->commit(driver);
+                    mi->use(driver);
+
+                    const uint8_t variant = uint8_t(translucent ?
+                            PostProcessVariant::TRANSLUCENT : PostProcessVariant::OPAQUE);
+
+                    PipelineState const pipeline(material.getPipelineState(mEngine, variant));
+                    render(out, pipeline, driver);
+                });
+
+        output = ppFsrRcas->output;
     }
 
     // we rely on automatic culling of unused render passes
@@ -3274,51 +3250,4 @@ FrameGraphId<FrameGraphTexture> PostProcessManager::debugShadowCascades(FrameGra
     return debugShadowCascadePass->output;
 }
 
-FrameGraphId<FrameGraphTexture> PostProcessManager::debugDisplayShadowTexture(
-        FrameGraph& fg,
-        FrameGraphId<FrameGraphTexture> input,
-        FrameGraphId<FrameGraphTexture> shadowmap, float scale,
-        uint8_t layer, uint8_t level, uint8_t channel, float power) noexcept {
-    if (shadowmap) {
-        struct ShadowMapData {
-            FrameGraphId<FrameGraphTexture> color;
-            FrameGraphId<FrameGraphTexture> depth;
-        };
-
-        auto const& desc = fg.getDescriptor(input);
-        float const ratio = float(desc.height) / float(desc.width);
-        float const screenScale = float(fg.getDescriptor(shadowmap).height) / float(desc.height);
-        float2 const s = { screenScale * scale * ratio, screenScale * scale };
-
-        auto& shadomapDebugPass = fg.addPass<ShadowMapData>("shadowmap debug pass",
-                [&](FrameGraph::Builder& builder, auto& data) {
-                    data.color = builder.read(input,
-                            FrameGraphTexture::Usage::COLOR_ATTACHMENT);
-                    data.color = builder.write(data.color,
-                            FrameGraphTexture::Usage::COLOR_ATTACHMENT);
-                    data.depth = builder.sample(shadowmap);
-                    builder.declareRenderPass("color target", {
-                            .attachments = { .color = { data.color }}
-                    });
-                },
-                [=](FrameGraphResources const& resources, auto const& data, DriverApi& driver) {
-                    auto out = resources.getRenderPassInfo();
-                    auto in = resources.getTexture(data.depth);
-                    auto const& material = getPostProcessMaterial("shadowmap");
-                    FMaterialInstance* const mi = material.getMaterialInstance(mEngine);
-                    mi->setParameter("shadowmap", in, {
-                        .filterMin = SamplerMinFilter::NEAREST_MIPMAP_NEAREST });
-                    mi->setParameter("scale", s);
-                    mi->setParameter("layer", (uint32_t)layer);
-                    mi->setParameter("level", (uint32_t)level);
-                    mi->setParameter("channel", (uint32_t)channel);
-                    mi->setParameter("power", power);
-                    commitAndRender(out, material, driver);
-                });
-        input = shadomapDebugPass->color;
-    }
-    return input;
-}
-
-
 } // namespace filament

filament/src/PostProcessManager.h

@@ -36,7 +36,6 @@
 
 #include <tsl/robin_map.h>
 
-#include <array>
 #include <random>
 #include <string_view>
 #include <variant>
@@ -242,13 +241,6 @@ public:
             filament::Viewport const& vp, FrameGraphTexture::Descriptor const& outDesc,
             backend::SamplerMagFilter filter) noexcept;
 
-    FrameGraphId<FrameGraphTexture> rcas(
-            FrameGraph& fg,
-            float sharpness,
-            FrameGraphId<FrameGraphTexture> input,
-            FrameGraphTexture::Descriptor const& outDesc,
-            bool translucent);
-
     // upscale/downscale blitter using shaders
     FrameGraphId<FrameGraphTexture> blit(FrameGraph& fg, bool translucent,
             FrameGraphId<FrameGraphTexture> input,
@@ -282,11 +274,6 @@ public:
             FrameGraphId<FrameGraphTexture> input,
             FrameGraphId<FrameGraphTexture> depth) noexcept;
 
-    FrameGraphId<FrameGraphTexture> debugDisplayShadowTexture(FrameGraph& fg,
-            FrameGraphId<FrameGraphTexture> input,
-            FrameGraphId<FrameGraphTexture> shadowmap, float scale,
-            uint8_t layer, uint8_t level, uint8_t channel, float power) noexcept;
-
     backend::Handle<backend::HwTexture> getOneTexture() const;
     backend::Handle<backend::HwTexture> getZeroTexture() const;
     backend::Handle<backend::HwTexture> getOneTextureArray() const;
@@ -375,12 +362,12 @@ private:
     template<size_t SIZE>
     struct JitterSequence {
         auto operator()(size_t i) const noexcept { return positions[i % SIZE] - 0.5f; }
-        const std::array<math::float2, SIZE> positions;
+        const math::float2 positions[SIZE];
     };
 
     static const JitterSequence<4> sRGSS4;
     static const JitterSequence<4> sUniformHelix4;
-    static const JitterSequence<32> sHaltonSamples;
+    static const JitterSequence<16> sHaltonSamples;
 
     bool mWorkaroundSplitEasu : 1;
     bool mWorkaroundAllowReadOnlyAncillaryFeedbackLoop : 1;

filament/src/ShadowMapManager.cpp

@@ -294,8 +294,6 @@ FrameGraphId<FrameGraphTexture> ShadowMapManager::render(FEngine& engine, FrameG
     // Shadow Passes
     // -------------------------------------------------------------------------------------------
 
-    fg.getBlackboard()["shadowmap"] = prepareShadowPass->shadows;
-
     struct ShadowPassData {
         FrameGraphId<FrameGraphTexture> tempBlurSrc{};  // temporary shadowmap when blurring
         FrameGraphId<FrameGraphTexture> output;
@@ -945,10 +943,6 @@ void ShadowMapManager::calculateTextureRequirements(FEngine& engine, FView& view
         mipLevels = std::max(1, FTexture::maxLevelCount(maxDimension) - lowMipmapLevel);
     }
 
-    // publish the debugging data
-    engine.debug.shadowmap.display_shadow_texture_layer_count = layersNeeded;
-    engine.debug.shadowmap.display_shadow_texture_level_count = mipLevels;
-
     mTextureAtlasRequirements = {
             (uint16_t)maxDimension,
             layersNeeded,

filament/src/details/ColorGrading.cpp

@@ -30,12 +30,11 @@
 #include <math/vec4.h>
 
 #include <utils/JobSystem.h>
-#include <utils/Mutex.h>
+#include <utils/SpinLock.h>
 #include <utils/Systrace.h>
 
 #include <cmath>
 #include <cstdlib>
-#include <mutex>
 #include <tuple>
 
 namespace filament {
@@ -649,9 +648,9 @@ FColorGrading::FColorGrading(FEngine& engine, const Builder& builder) {
     Config c;
     // This lock protects the data inside Config, which is written to by the Filament thread,
     // and read from multiple Job threads.
-    utils::Mutex configLock;
+    utils::SpinLock configLock;
     {
-        std::lock_guard<utils::Mutex> const lock(configLock);
+        std::lock_guard<utils::SpinLock> lock(configLock);
         c.lutDimension          = builder->dimension;
         c.adaptationTransform   = adaptationTransform(builder->whiteBalance);
         c.colorGradingIn        = selectColorGradingTransformIn(builder->toneMapping);
@@ -688,7 +687,7 @@ FColorGrading::FColorGrading(FEngine& engine, const Builder& builder) {
                 [data, converted, b, &c, &configLock, builder](JobSystem&, JobSystem::Job*) {
             Config config;
             {
-                std::lock_guard<utils::Mutex> lock(configLock);
+                std::lock_guard<utils::SpinLock> lock(configLock);
                 config = c;
             }
             half4* UTILS_RESTRICT p = (half4*) data + b * config.lutDimension * config.lutDimension;

filament/src/details/Engine.h

@@ -548,20 +548,12 @@ public:
     struct {
         struct {
             bool debug_directional_shadowmap = false;
-            bool display_shadow_texture = false;
             bool far_uses_shadowcasters = true;
             bool focus_shadowcasters = true;
             bool visualize_cascades = false;
             bool tightly_bound_scene = true;
             float dzn = -1.0f;
             float dzf =  1.0f;
-            float display_shadow_texture_scale = 0.25f;
-            int display_shadow_texture_layer = 0;
-            int display_shadow_texture_level = 0;
-            int display_shadow_texture_channel = 0;
-            int display_shadow_texture_layer_count = 0;
-            int display_shadow_texture_level_count = 0;
-            float display_shadow_texture_power = 1;
         } shadowmap;
         struct {
             bool camera_at_origin = true;

filament/src/details/Material.h

@@ -33,7 +33,6 @@
 #include <utils/Mutex.h>
 
 #include <atomic>
-#include <optional>
 
 namespace filament {
 

filament/src/details/Renderer.cpp

@@ -70,22 +70,6 @@ FRenderer::FRenderer(FEngine& engine) :
             &engine.debug.renderer.doFrameCapture);
     debugRegistry.registerProperty("d.renderer.disable_buffer_padding",
             &engine.debug.renderer.disable_buffer_padding);
-    debugRegistry.registerProperty("d.shadowmap.display_shadow_texture",
-            &engine.debug.shadowmap.display_shadow_texture);
-    debugRegistry.registerProperty("d.shadowmap.display_shadow_texture_scale",
-            &engine.debug.shadowmap.display_shadow_texture_scale);
-    debugRegistry.registerProperty("d.shadowmap.display_shadow_texture_layer",
-            &engine.debug.shadowmap.display_shadow_texture_layer);
-    debugRegistry.registerProperty("d.shadowmap.display_shadow_texture_level",
-            &engine.debug.shadowmap.display_shadow_texture_level);
-    debugRegistry.registerProperty("d.shadowmap.display_shadow_texture_channel",
-            &engine.debug.shadowmap.display_shadow_texture_channel);
-    debugRegistry.registerProperty("d.shadowmap.display_shadow_texture_layer_count",
-            &engine.debug.shadowmap.display_shadow_texture_layer_count);
-    debugRegistry.registerProperty("d.shadowmap.display_shadow_texture_level_count",
-            &engine.debug.shadowmap.display_shadow_texture_level_count);
-    debugRegistry.registerProperty("d.shadowmap.display_shadow_texture_power",
-            &engine.debug.shadowmap.display_shadow_texture_power);
 
     DriverApi& driver = engine.getDriverApi();
 
@@ -1001,7 +985,8 @@ void FRenderer::renderJob(ArenaScope& arena, FView& view) {
                     auto& history = view.getFrameHistory();
                     auto& current = history.getCurrent();
                     current.ssr.projection = projection;
-                    resources.detach(data.history, &current.ssr.color, &current.ssr.desc);
+                    resources.detach(data.history,
+                            &current.ssr.color, &current.ssr.desc);
                 });
     }
 
@@ -1149,16 +1134,6 @@ void FRenderer::renderJob(ArenaScope& arena, FView& view) {
                 "SwapChain::CONFIG_HAS_STENCIL_BUFFER flag set.");
     }
 
-    if (UTILS_UNLIKELY(engine.debug.shadowmap.display_shadow_texture)) {
-        auto shadowmap = blackboard.get<FrameGraphTexture>("shadowmap");
-        input = ppm.debugDisplayShadowTexture(fg, input, shadowmap,
-                engine.debug.shadowmap.display_shadow_texture_scale,
-                engine.debug.shadowmap.display_shadow_texture_layer,
-                engine.debug.shadowmap.display_shadow_texture_level,
-                engine.debug.shadowmap.display_shadow_texture_channel,
-                engine.debug.shadowmap.display_shadow_texture_power);
-    }
-
 //    auto debug = structure
 //    fg.forwardResource(fgViewRenderTarget, debug ? debug : input);
 

filament/src/fg/details/Resource.h

@@ -132,7 +132,7 @@ public:
     Descriptor descriptor;
     SubResourceDescriptor subResourceDescriptor;
 
-    // whether the resource was detached
+    // weather the resource was detached
     bool detached = false;
 
     // An Edge with added data from this resource

filament/src/materials/antiAliasing/taa.mat

@@ -34,11 +34,6 @@ material {
         }
     ],
     constants : [
-        {
-            type : bool,
-            name : upscaling,
-            default : false
-        },
         {
             type : bool,
             name : historyReprojection,
@@ -114,41 +109,12 @@ fragment {
 // no clipping (for debugging only)
 #define BOX_CLIPPING_NONE       2
 
-float rcp(float x) {
-    return 1.0 / x;
-}
-
-float lumaRGB(const vec3 c) {
-    return luminance(c);
-}
-
-float lumaYCoCg(const vec3 c) {
-    return c.x;
-}
-
-float luma(const vec3 c) {
-    return materialConstants_useYCoCg ? lumaYCoCg(c) : lumaRGB(c);
-}
-
-vec3 tonemap(const vec3 c) {
-    return c * rcp(1.0 + max3(c));
-}
-
-vec4 tonemap(const vec4 c) {
-    return vec4(c.rgb * rcp(1.0 + max3(c.rgb)), c.a);
-}
-
-vec3 tonemap(const float w, const vec3 c) {
-    return c * (w * rcp(1.0 + max3(c)));
-}
-
-vec4 tonemap(const float w, const vec4 c) {
-    return vec4(c.rgb * (w * rcp(1.0 + max3(c.rgb))), c.a);
-}
-
-vec3 untonemap(const vec3 c) {
-    const float epsilon = 1.0 / 65504.0;
-    return c * rcp(max(epsilon, 1.0 - max3(c)));
+float luma(const vec3 color) {
+    if (materialConstants_useYCoCg) {
+        return color.x;
+    } else {
+        return luminance(color);
+    }
 }
 
 vec3 RGB_YCoCg(const vec3 c) {
@@ -193,16 +159,15 @@ vec4 clipToBox(const int quality,
 // Optimized to 5 taps by removing the corner samples
 // And modified for mediump support
 vec4 sampleTextureCatmullRom(const sampler2D tex, const highp vec2 uv, const highp vec2 texSize) {
-    // We're going to sample a a 4x4 grid of texels surrounding the target UV coordinate.
-    // We'll do this by rounding down the sample location to get the exact center of our "starting"
-    // texel. The starting texel will be at location [1, 1] in the grid, where [0, 0] is the
-    // top left corner.
+    // We're going to sample a a 4x4 grid of texels surrounding the target UV coordinate. We'll do this by rounding
+    // down the sample location to get the exact center of our "starting" texel. The starting texel will be at
+    // location [1, 1] in the grid, where [0, 0] is the top left corner.
 
     highp vec2 samplePos = uv * texSize;
     highp vec2 texPos1 = floor(samplePos - 0.5) + 0.5;
 
-    // Compute the fractional offset from our starting texel to our original sample location,
-    // which we'll feed into the Catmull-Rom spline function to get our filter weights.
+    // Compute the fractional offset from our starting texel to our original sample location, which we'll
+    // feed into the Catmull-Rom spline function to get our filter weights.
     highp vec2 f = samplePos - texPos1;
     highp vec2 f2 = f * f;
     highp vec2 f3 = f2 * f;
@@ -235,20 +200,13 @@ vec4 sampleTextureCatmullRom(const sampler2D tex, const highp vec2 uv, const hig
     float k3 = w3.x  * w12.y;
     float k4 = w12.x * w3.y;
 
-    vec4 s[5];
-    s[0] = textureLod(tex, vec2(texPos12.x, texPos0.y),  0.0);
-    s[1] = textureLod(tex, vec2(texPos0.x,  texPos12.y), 0.0);
-    s[2] = textureLod(tex, vec2(texPos12.x, texPos12.y), 0.0);
-    s[3] = textureLod(tex, vec2(texPos3.x,  texPos12.y), 0.0);
-    s[4] = textureLod(tex, vec2(texPos12.x, texPos3.y),  0.0);
+    vec4 result =   textureLod(tex, vec2(texPos12.x, texPos0.y),  0.0) * k0
+                  + textureLod(tex, vec2(texPos0.x,  texPos12.y), 0.0) * k1
+                  + textureLod(tex, vec2(texPos12.x, texPos12.y), 0.0) * k2
+                  + textureLod(tex, vec2(texPos3.x,  texPos12.y), 0.0) * k3
+                  + textureLod(tex, vec2(texPos12.x, texPos3.y),  0.0) * k4;
 
-    vec4 result =   k0 * s[0]
-                  + k1 * s[1]
-                  + k2 * s[2]
-                  + k3 * s[3]
-                  + k4 * s[4];
-
-    result *= rcp(k0 + k1 + k2 + k3 + k4);
+    result *= 1.0 / (k0 + k1 + k2 + k3 + k4);
 
     // we could end-up with negative values
     result = max(vec4(0), result);
@@ -284,7 +242,7 @@ void postProcess(inout PostProcessInputs postProcess) {
 
     highp vec2 size = vec2(textureSize(materialParams_color, 0));
     highp vec2 p = (floor(uv.xy * size) + 0.5) / size;
-    vec4 filtered = textureLod(materialParams_color, p, 0.0);
+    vec4 color = textureLod(materialParams_color, p, 0.0);
 
     vec3 s[9];
     if (materialConstants_filterInput || materialConstants_boxClipping != BOX_CLIPPING_NONE) {
@@ -292,12 +250,16 @@ void postProcess(inout PostProcessInputs postProcess) {
         s[1] = textureLodOffset(materialParams_color, p, 0.0, ivec2( 0, -1)).rgb;
         s[2] = textureLodOffset(materialParams_color, p, 0.0, ivec2( 1, -1)).rgb;
         s[3] = textureLodOffset(materialParams_color, p, 0.0, ivec2(-1,  0)).rgb;
-        s[4] = filtered.rgb;
+        s[4] = color.rgb;
         s[5] = textureLodOffset(materialParams_color, p, 0.0, ivec2( 1,  0)).rgb;
         s[6] = textureLodOffset(materialParams_color, p, 0.0, ivec2(-1,  1)).rgb;
         s[7] = textureLodOffset(materialParams_color, p, 0.0, ivec2( 0,  1)).rgb;
         s[8] = textureLodOffset(materialParams_color, p, 0.0, ivec2( 1,  1)).rgb;
-        if (materialConstants_useYCoCg) {
+    }
+
+    if (materialConstants_useYCoCg) {
+        color.rgb = RGB_YCoCg(color.rgb);
+        if (materialConstants_filterInput || materialConstants_boxClipping != BOX_CLIPPING_NONE) {
             for (int i = 0; i < 9; i++) {
                 s[i] = RGB_YCoCg(s[i]);
             }
@@ -305,35 +267,24 @@ void postProcess(inout PostProcessInputs postProcess) {
     }
 
     vec2 subPixelOffset = p - uv.xy;  // +/- [0.25, 0.25]
-    float confidence = materialConstants_upscaling ? 0.0 : 1.0;
+    float confidence = 0.0;
 
+    vec4 filtered = color;
     if (materialConstants_filterInput) {
         // unjitter/filter input
         // figure out which set of coeficients to use
-        filtered = vec4(0, 0, 0, filtered.a);
-        if (materialConstants_upscaling) {
-            int jxp = subPixelOffset.y > 0.0 ? 3 : 0;
-            int jxn = subPixelOffset.y > 0.0 ? 2 : 1;
-            int j   = subPixelOffset.x > 0.0 ? jxp : jxn;
-            for (int i = 0; i < 9; i++) {
-                float w = materialParams.filterWeights[i][j];
-                filtered.rgb += s[i] * w;
-                confidence = max(confidence, w);
-            }
-        } else {
-            for (int i = 0; i < 9; i++) {
-                float w = materialParams.filterWeights[i][0];
-                filtered.rgb += s[i] * w;
-            }
+        int jxp = subPixelOffset.y > 0.0 ? 3 : 0;
+        int jxn = subPixelOffset.y > 0.0 ? 2 : 1;
+        int j   = subPixelOffset.x > 0.0 ? jxp : jxn;
+        filtered = vec4(0, 0, 0, color.a);
+        for (int i = 0; i < 9; i++) {
+            float w = materialParams.filterWeights[i][j];
+            filtered.rgb += s[i] * w;
+            confidence = max(confidence, w);
         }
     } else {
-        if (materialConstants_useYCoCg) {
-            filtered.rgb = RGB_YCoCg(filtered.rgb);
-        }
-        if (materialConstants_upscaling) {
-            confidence = float(materialParams.jitter.x * subPixelOffset.x > 0.0 &&
-                               materialParams.jitter.y * subPixelOffset.y > 0.0);
-        }
+        confidence = float(materialParams.jitter.x * subPixelOffset.x > 0.0 &&
+                           materialParams.jitter.y * subPixelOffset.y > 0.0);
     }
 
     // build the history clamping box
@@ -378,30 +329,29 @@ void postProcess(inout PostProcessInputs postProcess) {
         history = clipToBox(materialConstants_boxClipping, boxmin, boxmax, filtered, history);
     }
 
+    float lumaColor   = luma(filtered.rgb);
+    float lumaHistory = luma(history.rgb);
+
     float alpha = materialParams.alpha * confidence;
     if (materialConstants_preventFlickering) {
         // [Lottes] prevents flickering by modulating the blend weight by the difference in luma
-        float lumaColor = luma(filtered.rgb);
-        float lumaHistory = luma(history.rgb);
         float diff = 1.0 - abs(lumaColor - lumaHistory) / (0.001 + max(lumaColor, lumaHistory));
         alpha *= diff * diff;
     }
 
-    // go back to RGB space before tonemapping
-    if (materialConstants_useYCoCg) {
-        filtered.rgb = YCoCg_RGB(filtered.rgb);
-        history.rgb = YCoCg_RGB(history.rgb);
-    }
-
-    // tonemap before mixing
-    filtered.rgb = tonemap(filtered.rgb);
-    history.rgb = tonemap(history.rgb);
+    // tonemapping for handling HDR
+    filtered.rgb *= 1.0 / (1.0 + lumaColor);
+    history.rgb  *= 1.0 / (1.0 + lumaHistory);
 
     // combine history and current frame
     vec4 result = mix(history, filtered, alpha);
 
     // untonemap result
-    result.rgb = untonemap(result.rgb);
+    result.rgb *= 1.0 / (1.0 - luma(result.rgb));
+
+    if (materialConstants_useYCoCg) {
+        result.rgb = YCoCg_RGB(result.rgb);
+    }
 
 #if POST_PROCESS_OPAQUE
     // kill the work performed above

filament/src/materials/fsr/fsr_rcas.mat

@@ -43,8 +43,6 @@ fragment {
     #define FSR_RCAS_F 1
     #if !POST_PROCESS_OPAQUE
     #   define FSR_RCAS_PASSTHROUGH_ALPHA
-    // todo: make this a spec constant
-    #   define FSR_RCAS_DENOISE
     #endif
     #include "ffx_fsr1.h"
 
@@ -63,9 +61,6 @@ fragment {
 #endif
             p, materialParams.RcasCon);
 
-        // todo: make this an option
-        postProcess.color.rgb = max(vec3(0), postProcess.color.rgb);
-
 #if POST_PROCESS_OPAQUE
         postProcess.color.a = 1.0;
 #endif

filament/src/materials/shadowmap.mat

@@ -1,59 +0,0 @@
-material {
-    name : shadowmap,
-    parameters : [
-        {
-           type : sampler2dArray,
-           name : shadowmap,
-           precision : high
-        },
-        {
-           type : float,
-           name : power,
-           precision : high
-        },
-        {
-           type : float2,
-           name : scale,
-        },
-        {
-            type : int,
-            name : layer
-        },
-        {
-            type : int,
-            name : level
-        },
-        {
-            type : int,
-            name : channel
-        }
-    ],
-    variables : [
-        vertex
-    ],
-    vertexDomain : device,
-    depthWrite : false,
-    depthCulling : false,
-    domain: postprocess
-}
-
-vertex {
-    void postProcessVertex(inout PostProcessVertexInputs postProcess) {
-        postProcess.vertex.xy = postProcess.normalizedUV;
-        postProcess.position.xy = 1.0 + (postProcess.position.xy - 1.0) * materialParams.scale;
-    }
-}
-
-fragment {
-    void dummy(){}
-
-    void postProcess(inout PostProcessInputs postProcess) {
-        highp vec2 uv = uvToRenderTargetUV(variable_vertex.xy);
-        highp vec3 p = vec3(uv, float(materialParams.layer));
-        float m = float(materialParams.level);
-        highp float c = textureLod(materialParams_shadowmap, p, m)[materialParams.channel];
-        c = pow(abs(c), materialParams.power);
-        postProcess.color.rgb = vec3(c);
-        postProcess.color.a = 1.0;
-    }
-}

ios/CocoaPods/Filament.podspec

@@ -1,12 +1,12 @@
 Pod::Spec.new do |spec|
   spec.name = "Filament"
-  spec.version = "1.50.2"
+  spec.version = "1.49.3"
   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.50.2/filament-v1.50.2-ios.tgz" }
+  spec.source = { :http => "https://github.com/google/filament/releases/download/v1.49.3/filament-v1.49.3-ios.tgz" }
 
   # Fix linking error with Xcode 12; we do not yet support the simulator on Apple silicon.
   spec.pod_target_xcconfig = {