From 210a8c2260a7e6555521b92836ca8dff2e9bc22d Mon Sep 17 00:00:00 2001
From: Benjamin Doherty <bendoherty@google.com>
Date: Thu, 6 Jan 2022 10:47:54 -0800
Subject: [PATCH 01/13] Update Renderer comment

---
 .../src/main/java/com/google/android/filament/Renderer.java     | 2 +-
 filament/include/filament/Renderer.h                            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/android/filament-android/src/main/java/com/google/android/filament/Renderer.java b/android/filament-android/src/main/java/com/google/android/filament/Renderer.java
index 89cda98c58..79a3f536fb 100644
--- a/android/filament-android/src/main/java/com/google/android/filament/Renderer.java
+++ b/android/filament-android/src/main/java/com/google/android/filament/Renderer.java
@@ -309,7 +309,7 @@ public class Renderer {
      *
      * <p><code>render()</code> generates commands for each of the following stages:</p>
      * <ul>
-     * <li>Shadow map pass, if needed (currently only a single shadow map is supported)</li>
+     * <li>Shadow map passes, if needed</li>
      * <li>Depth pre-pass</li>
      * <li>SSAO pass, if enabled</li>
      * <li>Color pass</li>
diff --git a/filament/include/filament/Renderer.h b/filament/include/filament/Renderer.h
index d5f2250fcc..cbb3aa1989 100644
--- a/filament/include/filament/Renderer.h
+++ b/filament/include/filament/Renderer.h
@@ -252,7 +252,7 @@ public:
      *
      * render() generates commands for each of the following stages:
      *
-     * 1. Shadow map pass, if needed (currently only a single shadow map is supported).
+     * 1. Shadow map passes, if needed.
      * 2. Depth pre-pass.
      * 3. Color pass.
      * 4. Post-processing pass.

From 2596273a94e6a02a3c05db7d8726890b9730e7ff Mon Sep 17 00:00:00 2001
From: Ben Doherty <bendoherty@google.com>
Date: Thu, 6 Jan 2022 10:52:01 -0800
Subject: [PATCH 02/13] Avoid calling std::string(nullptr) in MockConfig.cpp
 (#5019)

---
 tools/matc/tests/MockConfig.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/matc/tests/MockConfig.cpp b/tools/matc/tests/MockConfig.cpp
index 08146ccbe5..6fd75b2c42 100644
--- a/tools/matc/tests/MockConfig.cpp
+++ b/tools/matc/tests/MockConfig.cpp
@@ -61,5 +61,5 @@ matc::Config::Input* MockConfig::getInput() const noexcept {
 }
 
 std::string MockConfig::toString() const noexcept {
-    return nullptr;
+    return {};
 }

From 9d7f5f593e998942628040cff7bcc9758a67652e Mon Sep 17 00:00:00 2001
From: jeanlemotan <10252034+jeanlemotan@users.noreply.github.com>
Date: Thu, 6 Jan 2022 22:07:32 +0100
Subject: [PATCH 03/13] Added line/triangle strip support (#5017)

* Added line/triangle strip support

* Added strip support for Java and JS
Changed README to indicate strip support for gltf
---
 README.md                                              |  4 ++--
 .../com/google/android/filament/RenderableManager.java |  4 +++-
 filament/backend/include/backend/DriverEnums.h         | 10 ++++++----
 filament/backend/src/metal/MetalEnums.h                |  2 ++
 filament/backend/src/ostream.cpp                       |  2 ++
 filament/backend/src/vulkan/VulkanHandles.cpp          |  6 ++++++
 libs/gltfio/src/GltfEnums.h                            |  8 ++++++--
 web/filament-js/filament.d.ts                          |  2 ++
 web/filament-js/jsenums.cpp                            |  2 ++
 9 files changed, 31 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index 0b273d956f..5a32d56711 100644
--- a/README.md
+++ b/README.md
@@ -151,9 +151,9 @@ steps:
   - [x] Points
   - [x] Lines
   - [ ] Line Loop
-  - [ ] Line Strip
+  - [x] Line Strip
   - [x] Triangles
-  - [ ] Triangle Strip
+  - [x] Triangle Strip
   - [ ] Triangle Fan
 
 - Animation
diff --git a/android/filament-android/src/main/java/com/google/android/filament/RenderableManager.java b/android/filament-android/src/main/java/com/google/android/filament/RenderableManager.java
index 437358c5ed..db4fdb8c83 100644
--- a/android/filament-android/src/main/java/com/google/android/filament/RenderableManager.java
+++ b/android/filament-android/src/main/java/com/google/android/filament/RenderableManager.java
@@ -96,7 +96,9 @@ public class RenderableManager {
     public enum PrimitiveType {
         POINTS(0),
         LINES(1),
-        TRIANGLES(4);
+        LINE_STRIP(3),
+        TRIANGLES(4),
+        TRIANGLE_STRIP(5);
 
         private final int mType;
         PrimitiveType(int value) { mType = value; }
diff --git a/filament/backend/include/backend/DriverEnums.h b/filament/backend/include/backend/DriverEnums.h
index 1b36256dea..b521f3a4e0 100644
--- a/filament/backend/include/backend/DriverEnums.h
+++ b/filament/backend/include/backend/DriverEnums.h
@@ -193,10 +193,12 @@ static constexpr size_t SHADER_MODEL_COUNT = 3;
  */
 enum class PrimitiveType : uint8_t {
     // don't change the enums values (made to match GL)
-    POINTS      = 0,    //!< points
-    LINES       = 1,    //!< lines
-    TRIANGLES   = 4,    //!< triangles
-    NONE        = 0xFF
+    POINTS         = 0,    //!< points
+    LINES          = 1,    //!< lines
+    LINE_STRIP     = 3,    //!< line strip
+    TRIANGLES      = 4,    //!< triangles
+    TRIANGLE_STRIP = 5,    //!< triangle strip
+    NONE           = 0xFF
 };
 
 /**
diff --git a/filament/backend/src/metal/MetalEnums.h b/filament/backend/src/metal/MetalEnums.h
index 7c84ee65bc..3de905a984 100644
--- a/filament/backend/src/metal/MetalEnums.h
+++ b/filament/backend/src/metal/MetalEnums.h
@@ -304,7 +304,9 @@ constexpr inline MTLPrimitiveType getMetalPrimitiveType(PrimitiveType type) noex
     switch (type) {
         case PrimitiveType::POINTS: return MTLPrimitiveTypePoint;
         case PrimitiveType::LINES: return MTLPrimitiveTypeLine;
+        case PrimitiveType::LINE_STRIP: return MTLPrimitiveTypeLineStrip;
         case PrimitiveType::TRIANGLES: return MTLPrimitiveTypeTriangle;
+        case PrimitiveType::TRIANGLE_STRIP: return MTLPrimitiveTypeTriangleStrip;
         case PrimitiveType::NONE:
             ASSERT_POSTCONDITION(false, "NONE is not a valid primitive type.");
     }
diff --git a/filament/backend/src/ostream.cpp b/filament/backend/src/ostream.cpp
index d9eed6106f..d909921dbb 100644
--- a/filament/backend/src/ostream.cpp
+++ b/filament/backend/src/ostream.cpp
@@ -51,7 +51,9 @@ io::ostream& operator<<(io::ostream& out, ShaderModel model) {
 io::ostream& operator<<(io::ostream& out, PrimitiveType type) {
     switch (type) {
         CASE(PrimitiveType, TRIANGLES)
+        CASE(PrimitiveType, TRIANGLE_STRIP)
         CASE(PrimitiveType, LINES)
+        CASE(PrimitiveType, LINE_STRIP)
         CASE(PrimitiveType, POINTS)
         CASE(PrimitiveType, NONE)
     }
diff --git a/filament/backend/src/vulkan/VulkanHandles.cpp b/filament/backend/src/vulkan/VulkanHandles.cpp
index 5f9bf0f427..1cd45ee92c 100644
--- a/filament/backend/src/vulkan/VulkanHandles.cpp
+++ b/filament/backend/src/vulkan/VulkanHandles.cpp
@@ -283,9 +283,15 @@ void VulkanRenderPrimitive::setPrimitiveType(backend::PrimitiveType pt) {
         case backend::PrimitiveType::LINES:
             primitiveTopology = VK_PRIMITIVE_TOPOLOGY_LINE_LIST;
             break;
+        case backend::PrimitiveType::LINE_STRIP:
+            primitiveTopology = VK_PRIMITIVE_TOPOLOGY_LINE_STRIP;
+            break;
         case backend::PrimitiveType::TRIANGLES:
             primitiveTopology = VK_PRIMITIVE_TOPOLOGY_TRIANGLE_LIST;
             break;
+        case backend::PrimitiveType::TRIANGLE_STRIP:
+            primitiveTopology = VK_PRIMITIVE_TOPOLOGY_TRIANGLE_STRIP;
+            break;
     }
 }
 
diff --git a/libs/gltfio/src/GltfEnums.h b/libs/gltfio/src/GltfEnums.h
index ad6a34aace..39e71b7a0c 100644
--- a/libs/gltfio/src/GltfEnums.h
+++ b/libs/gltfio/src/GltfEnums.h
@@ -122,12 +122,16 @@ inline bool getPrimitiveType(cgltf_primitive_type in,
         case cgltf_primitive_type_lines:
             *out = filament::RenderableManager::PrimitiveType::LINES;
             return true;
+        case cgltf_primitive_type_line_strip:
+            *out = filament::RenderableManager::PrimitiveType::LINE_STRIP;
+            return true;
         case cgltf_primitive_type_triangles:
             *out = filament::RenderableManager::PrimitiveType::TRIANGLES;
             return true;
-        case cgltf_primitive_type_line_loop:
-        case cgltf_primitive_type_line_strip:
         case cgltf_primitive_type_triangle_strip:
+            *out = filament::RenderableManager::PrimitiveType::TRIANGLE_STRIP;
+            return true;
+        case cgltf_primitive_type_line_loop:
         case cgltf_primitive_type_triangle_fan:
             return false;
     }
diff --git a/web/filament-js/filament.d.ts b/web/filament-js/filament.d.ts
index 5ab46b7c2e..9163ca7c7c 100644
--- a/web/filament-js/filament.d.ts
+++ b/web/filament-js/filament.d.ts
@@ -824,7 +824,9 @@ export enum PixelDataType {
 export enum RenderableManager$PrimitiveType {
     POINTS,
     LINES,
+    LINE_STRIP,
     TRIANGLES,
+    TRIANGLE_STRIP,
     NONE,
 }
 
diff --git a/web/filament-js/jsenums.cpp b/web/filament-js/jsenums.cpp
index 49bb7add4e..ed9d16fe55 100644
--- a/web/filament-js/jsenums.cpp
+++ b/web/filament-js/jsenums.cpp
@@ -116,7 +116,9 @@ enum_<LightManager::Type>("LightManager$Type")
 enum_<RenderableManager::PrimitiveType>("RenderableManager$PrimitiveType")
     .value("POINTS", RenderableManager::PrimitiveType::POINTS)
     .value("LINES", RenderableManager::PrimitiveType::LINES)
+    .value("LINE_STRIP", RenderableManager::PrimitiveType::LINE_STRIP)
     .value("TRIANGLES", RenderableManager::PrimitiveType::TRIANGLES)
+    .value("TRIANGLE_STRIP", RenderableManager::PrimitiveType::TRIANGLE_STRIP)
     .value("NONE", RenderableManager::PrimitiveType::NONE);
 
 enum_<View::QualityLevel>("View$QualityLevel")

From 2f3aac29da7e833378d75dd89fadcfc4bcb11623 Mon Sep 17 00:00:00 2001
From: Ben Doherty <bendoherty@google.com>
Date: Thu, 6 Jan 2022 13:17:31 -0800
Subject: [PATCH 04/13] Enable GL_ARB_shading_language_packing in vertex
 shaders (#5022)

---
 libs/filamat/src/GLSLPostProcessor.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libs/filamat/src/GLSLPostProcessor.cpp b/libs/filamat/src/GLSLPostProcessor.cpp
index 30d0f967f8..e5a7eed5db 100644
--- a/libs/filamat/src/GLSLPostProcessor.cpp
+++ b/libs/filamat/src/GLSLPostProcessor.cpp
@@ -357,7 +357,7 @@ void GLSLPostProcessor::fullOptimization(const TShader& tShader,
         CompilerGLSL glslCompiler(move(spirv));
         glslCompiler.set_common_options(glslOptions);
 
-        if (tShader.getStage() == EShLangFragment && !glslOptions.es) {
+        if (!glslOptions.es) {
             // enable GL_ARB_shading_language_packing if available
             glslCompiler.add_header_line("#extension GL_ARB_shading_language_packing : enable");
         }

From 9a8159ab047783a1eb47b52ad4dcacd494ff2bed Mon Sep 17 00:00:00 2001
From: jeanlemotan <10252034+jeanlemotan@users.noreply.github.com>
Date: Fri, 7 Jan 2022 16:58:34 +0100
Subject: [PATCH 05/13] Fixed compiler warning (int -> float conversion)

---
 filament/include/filament/RenderableManager.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/filament/include/filament/RenderableManager.h b/filament/include/filament/RenderableManager.h
index 0e602c3e1c..46ef09e429 100644
--- a/filament/include/filament/RenderableManager.h
+++ b/filament/include/filament/RenderableManager.h
@@ -105,8 +105,8 @@ public:
      * Clients can specify bones either using this quat-vec3 pair, or by using 4x4 matrices.
      */
     struct Bone {
-        math::quatf unitQuaternion = { 1, 0, 0, 0 };
-        math::float3 translation = { 0, 0, 0 };
+        math::quatf unitQuaternion = { 1.f, 0.f, 0.f, 0.f };
+        math::float3 translation = { 0.f, 0.f, 0.f };
         float reserved = 0;
     };
 

From 74ea3d50c2f3af8dc359ecfa706854f88d20a162 Mon Sep 17 00:00:00 2001
From: Mathias Agopian <mathias@google.com>
Date: Thu, 6 Jan 2022 15:43:12 -0800
Subject: [PATCH 06/13] Make sure to object are aligned properly when allocated
 in the renderstream

fix #4991
---
 filament/src/Scene.cpp                        |  2 +-
 filament/src/SkinningBuffer.cpp               | 18 +++++++++---------
 filament/src/components/RenderableManager.cpp |  6 +++---
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/filament/src/Scene.cpp b/filament/src/Scene.cpp
index e17400af84..d5cca3c3c2 100644
--- a/filament/src/Scene.cpp
+++ b/filament/src/Scene.cpp
@@ -203,7 +203,7 @@ void FScene::updateUBOs(utils::Range<uint32_t> visibleRenderables, backend::Hand
     const size_t size = visibleRenderables.size() * sizeof(PerRenderableUib);
 
     // allocate space into the command stream directly
-    void* const buffer = driver.allocate(size);
+    void* const buffer = driver.allocatePod<PerRenderableUib>(visibleRenderables.size());
 
     bool hasContactShadows = false;
     auto& sceneData = mRenderableData;
diff --git a/filament/src/SkinningBuffer.cpp b/filament/src/SkinningBuffer.cpp
index 58e757f2c0..5dc879ac5a 100644
--- a/filament/src/SkinningBuffer.cpp
+++ b/filament/src/SkinningBuffer.cpp
@@ -78,10 +78,10 @@ FSkinningBuffer::FSkinningBuffer(FEngine& engine, const Builder& builder)
 
     if (builder->mInitialize) {
         // initialize the bones to identity (before rounding up)
-        size_t size = mBoneCount * sizeof(PerRenderableUibBone);
-        auto* out = (PerRenderableUibBone*)driver.allocate(size);
+        auto* out = driver.allocatePod<PerRenderableUibBone>(mBoneCount);
         std::uninitialized_fill_n(out, mBoneCount, PerRenderableUibBone{});
-        driver.updateBufferObject(mHandle, { out, size }, 0);
+        driver.updateBufferObject(mHandle, {
+            out, mBoneCount * sizeof(PerRenderableUibBone) }, 0);
     }
 }
 
@@ -119,15 +119,15 @@ static uint32_t packHalf2x16(half2 v) noexcept {
 void FSkinningBuffer::setBones(FEngine& engine, Handle<backend::HwBufferObject> handle,
         RenderableManager::Bone const* transforms, size_t boneCount, size_t offset) noexcept {
     auto& driverApi = engine.getDriverApi();
-    size_t size = boneCount * sizeof(PerRenderableUibBone);
-    PerRenderableUibBone* UTILS_RESTRICT out = (PerRenderableUibBone*)driverApi.allocate(size);
+    PerRenderableUibBone* UTILS_RESTRICT out = driverApi.allocatePod<PerRenderableUibBone>(boneCount);
     for (size_t i = 0, c = boneCount; i < c; ++i) {
         // the transform is stored in row-major, last row is not stored.
         mat4f transform(transforms[i].unitQuaternion);
         transform[3] = float4{ transforms[i].translation, 1.0f };
         out[i] = makeBone(transform);
     }
-    driverApi.updateBufferObject(handle, { out, size },
+    driverApi.updateBufferObject(handle, {
+                    out, boneCount * sizeof(PerRenderableUibBone) },
             offset * sizeof(PerRenderableUibBone));
 }
 
@@ -155,13 +155,13 @@ PerRenderableUibBone FSkinningBuffer::makeBone(mat4f transform) noexcept {
 void FSkinningBuffer::setBones(FEngine& engine, Handle<backend::HwBufferObject> handle,
         mat4f const* transforms, size_t boneCount, size_t offset) noexcept {
     auto& driverApi = engine.getDriverApi();
-    size_t size = boneCount * sizeof(PerRenderableUibBone);
-    PerRenderableUibBone* UTILS_RESTRICT out = (PerRenderableUibBone*)driverApi.allocate(size);
+    PerRenderableUibBone* UTILS_RESTRICT out = driverApi.allocatePod<PerRenderableUibBone>(boneCount);
     for (size_t i = 0, c = boneCount; i < c; ++i) {
         // the transform is stored in row-major, last row is not stored.
         out[i] = makeBone(transforms[i]);
     }
-    driverApi.updateBufferObject(handle, { out, size },
+    driverApi.updateBufferObject(handle, {
+                    out, boneCount * sizeof(PerRenderableUibBone) },
             offset * sizeof(PerRenderableUibBone));
 }
 
diff --git a/filament/src/components/RenderableManager.cpp b/filament/src/components/RenderableManager.cpp
index ddd17662a5..7208771bb6 100644
--- a/filament/src/components/RenderableManager.cpp
+++ b/filament/src/components/RenderableManager.cpp
@@ -364,10 +364,10 @@ void FRenderableManager::create(
                                 builder->mUserBoneMatrices, count, 0);
                     } else {
                         // initialize the bones to identity
-                        size_t size = count * sizeof(PerRenderableUibBone);
-                        auto* out = (PerRenderableUibBone*)driver.allocate(size);
+                        auto* out = driver.allocatePod<PerRenderableUibBone>(count);
                         std::uninitialized_fill_n(out, count, PerRenderableUibBone{});
-                        driver.updateBufferObject(bones.handle, { out, size }, 0);
+                        driver.updateBufferObject(bones.handle, {
+                            out, count * sizeof(PerRenderableUibBone) }, 0);
                     }
                 }
             }

From 2eefbe11ae56a03531f3923745c0f83fc7a8cbc3 Mon Sep 17 00:00:00 2001
From: jeanlemotan <10252034+jeanlemotan@users.noreply.github.com>
Date: Wed, 5 Jan 2022 18:59:00 +0100
Subject: [PATCH 07/13] Fixed cubemap update

---
 filament/backend/src/opengl/OpenGLDriver.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/filament/backend/src/opengl/OpenGLDriver.cpp b/filament/backend/src/opengl/OpenGLDriver.cpp
index 02a45629ba..2f2dccdda6 100644
--- a/filament/backend/src/opengl/OpenGLDriver.cpp
+++ b/filament/backend/src/opengl/OpenGLDriver.cpp
@@ -1808,9 +1808,9 @@ void OpenGLDriver::updateCubeImage(Handle<HwTexture> th, uint32_t level,
 
     GLTexture* t = handle_cast<GLTexture *>(th);
     if (data.type == PixelDataType::COMPRESSED) {
-        setCompressedTextureData(t, level, 0, 0, 0, 0, 0, 0, std::move(data), &faceOffsets);
+        setCompressedTextureData(t, level, 0, 0, 0, t->width >> level, t->height >> level, 0, std::move(data), &faceOffsets);
     } else {
-        setTextureData(t, level, 0, 0, 0, 0, 0, 0, std::move(data), &faceOffsets);
+        setTextureData(t, level, 0, 0, 0, t->width >> level, t->height >> level, 0, std::move(data), &faceOffsets);
     }
 }
 

From 214e54f2ad7277ee012a1d103c8092397d11c60e Mon Sep 17 00:00:00 2001
From: jeanlemotan <10252034+jeanlemotan@users.noreply.github.com>
Date: Fri, 7 Jan 2022 16:49:02 +0100
Subject: [PATCH 08/13] Make sure the width/height don't reach zero.

---
 filament/backend/src/opengl/OpenGLDriver.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/filament/backend/src/opengl/OpenGLDriver.cpp b/filament/backend/src/opengl/OpenGLDriver.cpp
index 2f2dccdda6..02efed69a5 100644
--- a/filament/backend/src/opengl/OpenGLDriver.cpp
+++ b/filament/backend/src/opengl/OpenGLDriver.cpp
@@ -1808,9 +1808,9 @@ void OpenGLDriver::updateCubeImage(Handle<HwTexture> th, uint32_t level,
 
     GLTexture* t = handle_cast<GLTexture *>(th);
     if (data.type == PixelDataType::COMPRESSED) {
-        setCompressedTextureData(t, level, 0, 0, 0, t->width >> level, t->height >> level, 0, std::move(data), &faceOffsets);
+        setCompressedTextureData(t, level, 0, 0, 0, std::max(1u, t->width >> level), std::max(1u, t->height >> level), 0, std::move(data), &faceOffsets);
     } else {
-        setTextureData(t, level, 0, 0, 0, t->width >> level, t->height >> level, 0, std::move(data), &faceOffsets);
+        setTextureData(t, level, 0, 0, 0, std::max(1u, t->width >> level), std::max(1u, t->height >> level), 0, std::move(data), &faceOffsets);
     }
 }
 

From 4511af6f9ef1f4bc96804f077cd32c2a2ae8e866 Mon Sep 17 00:00:00 2001
From: jeanlemotan <10252034+jeanlemotan@users.noreply.github.com>
Date: Fri, 7 Jan 2022 23:10:52 +0100
Subject: [PATCH 09/13] Removed code duplication, better style.

---
 filament/backend/src/opengl/OpenGLDriver.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/filament/backend/src/opengl/OpenGLDriver.cpp b/filament/backend/src/opengl/OpenGLDriver.cpp
index 02efed69a5..9ed91b93d3 100644
--- a/filament/backend/src/opengl/OpenGLDriver.cpp
+++ b/filament/backend/src/opengl/OpenGLDriver.cpp
@@ -1807,10 +1807,12 @@ void OpenGLDriver::updateCubeImage(Handle<HwTexture> th, uint32_t level,
     DEBUG_MARKER()
 
     GLTexture* t = handle_cast<GLTexture *>(th);
+    auto width = std::max(1u, t->width >> level);
+    auto height = std::max(1u, t->height >> level);
     if (data.type == PixelDataType::COMPRESSED) {
-        setCompressedTextureData(t, level, 0, 0, 0, std::max(1u, t->width >> level), std::max(1u, t->height >> level), 0, std::move(data), &faceOffsets);
+        setCompressedTextureData(t, level, 0, 0, 0, width, height, 0, std::move(data), &faceOffsets);
     } else {
-        setTextureData(t, level, 0, 0, 0, std::max(1u, t->width >> level), std::max(1u, t->height >> level), 0, std::move(data), &faceOffsets);
+        setTextureData(t, level, 0, 0, 0, width, height, 0, std::move(data), &faceOffsets);
     }
 }
 

From 620a693c11e4aa645fb00523d02967408beaf70a Mon Sep 17 00:00:00 2001
From: Ben Doherty <bendoherty@google.com>
Date: Mon, 10 Jan 2022 10:28:34 -0800
Subject: [PATCH 10/13] FilamentApp: use PrtScn key to capture debug frame
 (#5032)

---
 libs/filamentapp/src/FilamentApp.cpp | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/libs/filamentapp/src/FilamentApp.cpp b/libs/filamentapp/src/FilamentApp.cpp
index 8b344bc242..dfc9631490 100644
--- a/libs/filamentapp/src/FilamentApp.cpp
+++ b/libs/filamentapp/src/FilamentApp.cpp
@@ -44,6 +44,10 @@
 #include <filament/Skybox.h>
 #include <filament/View.h>
 
+#ifndef NDEBUG
+#include <filament/DebugRegistry.h>
+#endif
+
 #include <filagui/ImGuiHelper.h>
 
 #include <filamentapp/Cube.h>
@@ -272,6 +276,14 @@ void FilamentApp::run(const Config& config, SetupCallback setupCallback,
                     if (event.key.keysym.scancode == SDL_SCANCODE_ESCAPE) {
                         mClosed = true;
                     }
+#ifndef NDEBUG
+                    if (event.key.keysym.scancode == SDL_SCANCODE_PRINTSCREEN) {
+                        DebugRegistry& debug = mEngine->getDebugRegistry();
+                        bool* captureFrame =
+                                debug.getPropertyAddress<bool>("d.renderer.doFrameCapture");
+                        *captureFrame = true;
+                    }
+#endif
                     window->keyDown(event.key.keysym.scancode);
                     break;
                 case SDL_KEYUP:

From a1a3adf8afa9393715b8d8677493a2869585276f Mon Sep 17 00:00:00 2001
From: Benjamin Doherty <bendoherty@google.com>
Date: Mon, 10 Jan 2022 10:42:41 -0800
Subject: [PATCH 11/13] Release Filament 1.16.0

---
 README.md                      | 4 ++--
 RELEASE_NOTES.md               | 8 +++++++-
 android/gradle.properties      | 2 +-
 ios/CocoaPods/Filament.podspec | 4 ++--
 web/filament-js/package.json   | 2 +-
 5 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index 5a32d56711..65b0e4930e 100644
--- a/README.md
+++ b/README.md
@@ -31,7 +31,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'com.google.android.filament:filament-android:1.15.2'
+    implementation 'com.google.android.filament:filament-android:1.16.0'
 }
 ```
 
@@ -52,7 +52,7 @@ Here are all the libraries available in the group `com.google.android.filament`:
 iOS projects can use CocoaPods to install the latest release:
 
 ```
-pod 'Filament', '~> 1.15.2'
+pod 'Filament', '~> 1.16.0'
 ```
 
 ### Snapshots
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index e53766fc7a..3c4c248a0a 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -3,11 +3,17 @@
 This file contains one line summaries of commits that are worthy of mentioning in release notes.
 A new header is inserted each time a *tag* is created.
 
-## v1.16.1 (currently main branch)
+## v1.16.2 (currently main branch)
+
+## v1.16.1
 
 ## v1.16.0
 
 - engine: Fixes skinning calculations (#4887) [⚠️ **Material breakage**].
+- engine: Add support for the glTF extension KHR_materials_emissive_strength.
+- engine: Improvements and fixes to skinning calculations.
+- engine: Fix debug checks for compressed textures.
+- Metal: Fix `readPixels` when dimensions are greater than the render target's.
 
 ## v1.15.2
 
diff --git a/android/gradle.properties b/android/gradle.properties
index 54e890d6d5..8dd051c616 100644
--- a/android/gradle.properties
+++ b/android/gradle.properties
@@ -1,5 +1,5 @@
 GROUP=com.google.android.filament
-VERSION_NAME=1.15.2
+VERSION_NAME=1.16.0
 
 POM_DESCRIPTION=Real-time physically based rendering engine for Android.
 
diff --git a/ios/CocoaPods/Filament.podspec b/ios/CocoaPods/Filament.podspec
index b6f36759d8..710d5a22d2 100644
--- a/ios/CocoaPods/Filament.podspec
+++ b/ios/CocoaPods/Filament.podspec
@@ -1,12 +1,12 @@
 Pod::Spec.new do |spec|
   spec.name = "Filament"
-  spec.version = "1.15.2"
+  spec.version = "1.16.0"
   spec.license = { :type => "Apache 2.0", :file => "LICENSE" }
   spec.homepage = "https://google.github.io/filament"
   spec.authors = "Google LLC."
   spec.summary = "Filament is a real-time physically based rendering engine for Android, iOS, Windows, Linux, macOS, and WASM/WebGL."
   spec.platform = :ios, "11.0"
-  spec.source = { :http => "https://github.com/google/filament/releases/download/v1.15.2/filament-v1.15.2-ios.tgz" }
+  spec.source = { :http => "https://github.com/google/filament/releases/download/v1.16.0/filament-v1.16.0-ios.tgz" }
 
   # Fix linking error with Xcode 12; we do not yet support the simulator on Apple silicon.
   spec.pod_target_xcconfig = {
diff --git a/web/filament-js/package.json b/web/filament-js/package.json
index 87b6d1e54e..b2a118e858 100644
--- a/web/filament-js/package.json
+++ b/web/filament-js/package.json
@@ -1,6 +1,6 @@
 {
   "name": "filament",
-  "version": "1.15.2",
+  "version": "1.16.0",
   "description": "Real-time physically based rendering engine",
   "main": "filament.js",
   "module": "filament.js",

From 1035e442ee5be1ca1ca366142189cfec246d7475 Mon Sep 17 00:00:00 2001
From: Benjamin Doherty <bendoherty@google.com>
Date: Mon, 10 Jan 2022 10:47:46 -0800
Subject: [PATCH 12/13] Bump version to 1.16.1

---
 README.md                      | 4 ++--
 android/gradle.properties      | 2 +-
 ios/CocoaPods/Filament.podspec | 4 ++--
 web/filament-js/package.json   | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 65b0e4930e..d66791b606 100644
--- a/README.md
+++ b/README.md
@@ -31,7 +31,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'com.google.android.filament:filament-android:1.16.0'
+    implementation 'com.google.android.filament:filament-android:1.16.1'
 }
 ```
 
@@ -52,7 +52,7 @@ Here are all the libraries available in the group `com.google.android.filament`:
 iOS projects can use CocoaPods to install the latest release:
 
 ```
-pod 'Filament', '~> 1.16.0'
+pod 'Filament', '~> 1.16.1'
 ```
 
 ### Snapshots
diff --git a/android/gradle.properties b/android/gradle.properties
index 8dd051c616..e3e89a33ee 100644
--- a/android/gradle.properties
+++ b/android/gradle.properties
@@ -1,5 +1,5 @@
 GROUP=com.google.android.filament
-VERSION_NAME=1.16.0
+VERSION_NAME=1.16.1
 
 POM_DESCRIPTION=Real-time physically based rendering engine for Android.
 
diff --git a/ios/CocoaPods/Filament.podspec b/ios/CocoaPods/Filament.podspec
index 710d5a22d2..759d3047e7 100644
--- a/ios/CocoaPods/Filament.podspec
+++ b/ios/CocoaPods/Filament.podspec
@@ -1,12 +1,12 @@
 Pod::Spec.new do |spec|
   spec.name = "Filament"
-  spec.version = "1.16.0"
+  spec.version = "1.16.1"
   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.16.0/filament-v1.16.0-ios.tgz" }
+  spec.source = { :http => "https://github.com/google/filament/releases/download/v1.16.1/filament-v1.16.1-ios.tgz" }
 
   # Fix linking error with Xcode 12; we do not yet support the simulator on Apple silicon.
   spec.pod_target_xcconfig = {
diff --git a/web/filament-js/package.json b/web/filament-js/package.json
index b2a118e858..bd0ec5807c 100644
--- a/web/filament-js/package.json
+++ b/web/filament-js/package.json
@@ -1,6 +1,6 @@
 {
   "name": "filament",
-  "version": "1.16.0",
+  "version": "1.16.1",
   "description": "Real-time physically based rendering engine",
   "main": "filament.js",
   "module": "filament.js",

From a4b371776270df1faf42da9dd5a026154d0bf000 Mon Sep 17 00:00:00 2001
From: Benjamin Doherty <bendoherty@google.com>
Date: Tue, 18 Jan 2022 13:48:36 -0800
Subject: [PATCH 13/13] Update RELEASE_NOTES for 1.16.1

---
 RELEASE_NOTES.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 3c4c248a0a..abb366bba3 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -7,6 +7,8 @@ A new header is inserted each time a *tag* is created.
 
 ## v1.16.1
 
+- engine: Added line/triangle strip support.
+
 ## v1.16.0
 
 - engine: Fixes skinning calculations (#4887) [⚠️ **Material breakage**].