Merge branch 'rc/1.9.20' into release

CMakeLists.txt

@@ -400,6 +400,13 @@ else()
     option(FILAMENT_ENABLE_MATDBG "Enable the material debugger" OFF)
 endif()
 
+# Only optimize materials in Release mode (so error message lines match the source code)
+if (CMAKE_BUILD_TYPE MATCHES Release)
+    option(FILAMENT_DISABLE_MATOPT "Disable material optimizations" OFF)
+else()
+    option(FILAMENT_DISABLE_MATOPT "Disable material optimizations" ON)
+endif()
+
 # ==================================================================================================
 # Material compilation flags
 # ==================================================================================================
@@ -423,8 +430,7 @@ if (FILAMENT_SUPPORTS_METAL)
     set(MATC_API_FLAGS ${MATC_API_FLAGS} -a metal)
 endif()
 
-# Only optimize materials in Release mode (so error message lines match the source code)
-if (NOT CMAKE_BUILD_TYPE MATCHES Release)
+if (FILAMENT_DISABLE_MATOPT)
     set(MATC_OPT_FLAGS -g)
 endif()
 

README.md

@@ -31,7 +31,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'com.google.android.filament:filament-android:1.9.19'
+    implementation 'com.google.android.filament:filament-android:1.9.20'
 }
 ```
 
@@ -63,7 +63,7 @@ A much smaller alternative to `filamat-android` that can only generate OpenGL sh
 iOS projects can use CocoaPods to install the latest release:
 
 ```
-pod 'Filament', '~> 1.9.19'
+pod 'Filament', '~> 1.9.20'
 ```
 
 ### Snapshots

RELEASE_NOTES.md

@@ -5,6 +5,20 @@ A new header is inserted each time a *tag* is created.
 
 ## Next release (main branch)
 
+## v1.9.20
+
+Android: Fix VSM.
+engine: Introduce BufferObject API.
+engine: Add new isTextureSwizzleSupported API on Texture.
+engine: Add support to Metal and Vulkan backends for texture swizzling.
+engine: Add new DoF settings (native/half res, gather kernel ring counts, CoC radius clamp).
+engine: DoF quality and performance improvements.
+engine: Fix high-quality upsampling issue with SSAO.
+Java: Expose `TransformManager.getParent(int)`.
+samples: Add Metal and Vulkan backend support to Suzanne sample.
+WebGL: expose fitIntoUnitCube to JS.
+WebGL: support for multiple <canvas> elements.
+
 ## v1.9.19
 
 - engine: Fix Metal bug when setGeometryAt is called multiple times.

android/filament-android/CMakeLists.txt

@@ -2,6 +2,7 @@ cmake_minimum_required(VERSION 3.6)
 
 option(FILAMENT_SUPPORTS_VULKAN "Enables Vulkan on Android" OFF)
 option(FILAMENT_ENABLE_MATDBG "Enables Material debugger" OFF)
+option(FILAMENT_DISABLE_MATOPT "Disables material optimizations" OFF)
 
 set(FILAMENT_DIR ${FILAMENT_DIST_DIR})
 
@@ -55,6 +56,7 @@ set(VERSION_SCRIPT "${CMAKE_CURRENT_SOURCE_DIR}/libfilament-jni.map")
 set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} -Wl,--version-script=${VERSION_SCRIPT}")
 
 add_library(filament-jni SHARED
+    src/main/cpp/BufferObject.cpp
     src/main/cpp/Camera.cpp
     src/main/cpp/Colors.cpp
     src/main/cpp/ColorGrading.cpp

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

@@ -0,0 +1,99 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <jni.h>
+
+#include <functional>
+#include <stdlib.h>
+#include <string.h>
+
+#include <filament/BufferObject.h>
+
+#include <backend/BufferDescriptor.h>
+
+#include "common/CallbackUtils.h"
+#include "common/NioUtils.h"
+
+using namespace filament;
+using namespace backend;
+
+extern "C" JNIEXPORT jlong JNICALL
+Java_com_google_android_filament_BufferObject_nCreateBuilder(JNIEnv *env, jclass type) {
+    return (jlong) new BufferObject::Builder();
+}
+
+extern "C" JNIEXPORT void JNICALL
+Java_com_google_android_filament_BufferObject_nDestroyBuilder(JNIEnv *env, jclass type,
+        jlong nativeBuilder) {
+    BufferObject::Builder* builder = (BufferObject::Builder *) nativeBuilder;
+    delete builder;
+}
+
+extern "C" JNIEXPORT void JNICALL
+Java_com_google_android_filament_BufferObject_nBuilderSize(JNIEnv *env, jclass type,
+        jlong nativeBuilder, jint byteCount) {
+    BufferObject::Builder* builder = (BufferObject::Builder *) nativeBuilder;
+    builder->size((uint32_t) byteCount);
+}
+
+extern "C" JNIEXPORT void JNICALL
+Java_com_google_android_filament_BufferObject_nBuilderBindingType(JNIEnv *env, jclass type,
+        jlong nativeBuilder, jint bindingType) {
+    using BindingType = BufferObject::BindingType;
+    BufferObject::Builder* builder = (BufferObject::Builder *) nativeBuilder;
+    BindingType types[] = {BindingType::VERTEX};
+    builder->bindingType(types[bindingType]);
+}
+
+extern "C" JNIEXPORT jlong JNICALL
+Java_com_google_android_filament_BufferObject_nBuilderBuild(JNIEnv *env, jclass type,
+        jlong nativeBuilder, jlong nativeEngine) {
+    BufferObject::Builder* builder = (BufferObject::Builder *) nativeBuilder;
+    Engine *engine = (Engine *) nativeEngine;
+    return (jlong) builder->build(*engine);
+}
+
+extern "C" JNIEXPORT jint JNICALL
+Java_com_google_android_filament_BufferObject_nGetByteCount(JNIEnv *env, jclass type,
+        jlong nativeBufferObject) {
+    BufferObject *bufferObject = (BufferObject *) nativeBufferObject;
+    return (jint) bufferObject->getByteCount();
+}
+
+extern "C" JNIEXPORT int JNICALL
+Java_com_google_android_filament_BufferObject_nSetBuffer(JNIEnv *env, jclass type,
+        jlong nativeBufferObject, jlong nativeEngine, jobject buffer, int remaining,
+        jint destOffsetInBytes, jint count,
+        jobject handler, jobject runnable) {
+    BufferObject *bufferObject = (BufferObject *) nativeBufferObject;
+    Engine *engine = (Engine *) nativeEngine;
+
+    AutoBuffer nioBuffer(env, buffer, count);
+    void* data = nioBuffer.getData();
+    size_t sizeInBytes = nioBuffer.getSize();
+    if (sizeInBytes > (remaining << nioBuffer.getShift())) {
+        // BufferOverflowException
+        return -1;
+    }
+
+    auto* callback = JniBufferCallback::make(engine, env, handler, runnable, std::move(nioBuffer));
+
+    BufferDescriptor desc(data, sizeInBytes, &JniBufferCallback::invoke, callback);
+
+    bufferObject->setBuffer(*engine, std::move(desc), (uint32_t) destOffsetInBytes);
+
+    return 0;
+}

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

@@ -51,6 +51,13 @@ Java_com_google_android_filament_Texture_nIsTextureFormatSupported(JNIEnv*, jcla
             (Texture::InternalFormat) internalFormat);
 }
 
+extern "C" JNIEXPORT jboolean JNICALL
+Java_com_google_android_filament_Texture_nIsTextureSwizzleSupported(JNIEnv*, jclass,
+        jlong nativeEngine) {
+    Engine *engine = (Engine *) nativeEngine;
+    return (jboolean) Texture::isTextureSwizzleSupported(*engine);
+}
+
 // Texture::Builder...
 
 extern "C" JNIEXPORT jlong JNICALL

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

@@ -86,6 +86,13 @@ Java_com_google_android_filament_TransformManager_nSetParent(JNIEnv*, jclass,
             (TransformManager::Instance) newParent);
 }
 
+extern "C" JNIEXPORT jint JNICALL
+Java_com_google_android_filament_TransformManager_nGetParent(JNIEnv*, jclass,
+        jlong nativeTransformManager, jint i) {
+    TransformManager* tm = (TransformManager*) nativeTransformManager;
+    return tm->getParent((TransformManager::Instance) i).getId();
+}
+
 extern "C" JNIEXPORT void JNICALL
 Java_com_google_android_filament_TransformManager_nSetTransform(JNIEnv* env,
         jclass, jlong nativeTransformManager, jint i,

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

@@ -50,6 +50,13 @@ Java_com_google_android_filament_VertexBuffer_nBuilderVertexCount(JNIEnv *env, j
     builder->vertexCount((uint32_t) vertexCount);
 }
 
+extern "C" JNIEXPORT void JNICALL
+Java_com_google_android_filament_VertexBuffer_nBuilderEnableBufferObjects(JNIEnv *env, jclass type,
+        jlong nativeBuilder, jboolean enabled) {
+    VertexBuffer::Builder* builder = (VertexBuffer::Builder *) nativeBuilder;
+    builder->enableBufferObjects(enabled);
+}
+
 extern "C" JNIEXPORT void JNICALL
 Java_com_google_android_filament_VertexBuffer_nBuilderBufferCount(JNIEnv *env, jclass type,
         jlong nativeBuilder, jint bufferCount) {
@@ -115,6 +122,15 @@ Java_com_google_android_filament_VertexBuffer_nSetBufferAt(JNIEnv *env, jclass t
     return 0;
 }
 
+extern "C" JNIEXPORT void JNICALL
+Java_com_google_android_filament_VertexBuffer_nSetBufferObjectAt(JNIEnv *env, jclass type,
+        jlong nativeVertexBuffer, jlong nativeEngine, jint bufferIndex, jlong nativeBufferObject) {
+    VertexBuffer *vertexBuffer = (VertexBuffer *) nativeVertexBuffer;
+    Engine *engine = (Engine *) nativeEngine;
+    BufferObject *bufferObject = (BufferObject *) nativeBufferObject;
+    vertexBuffer->setBufferObjectAt(*engine, (uint8_t) bufferIndex, bufferObject);
+}
+
 extern "C" [[deprecated]] JNIEXPORT void JNICALL
 Java_com_google_android_filament_VertexBuffer_nPopulateTangentQuaternions(JNIEnv *env,
         jclass type, jint quatType, jint quatCount, jobject outBuffer, jint outRemaining,

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

@@ -300,15 +300,24 @@ Java_com_google_android_filament_View_nSetBlendMode(JNIEnv *, jclass , jlong nat
 
 extern "C" JNIEXPORT void JNICALL
 Java_com_google_android_filament_View_nSetDepthOfFieldOptions(JNIEnv *, jclass ,
-        jlong nativeView, jfloat focusDistance, jfloat cocScale, jfloat maxApertureDiameter, jboolean enabled, jint filter) {
+        jlong nativeView, jfloat focusDistance, jfloat cocScale, jfloat maxApertureDiameter, jboolean enabled, jint filter,
+        jboolean nativeResolution, jint foregroundRingCount, jint backgroundRingCount, jint fastGatherRingCount,
+        jint maxForegroundCOC, jint maxBackgroundCOC) {
     View* view = (View*) nativeView;
     View::DepthOfFieldOptions::Filter eFilter{};
     if (filter == 1) {
         // View::DepthOfFieldOptions::Filter::MEDIAN value is actually 2
         eFilter = View::DepthOfFieldOptions::Filter::MEDIAN;
     }
     view->setDepthOfFieldOptions({.focusDistance = focusDistance, .cocScale = cocScale,
-            .maxApertureDiameter = maxApertureDiameter, .enabled = (bool)enabled, .filter = eFilter});
+            .maxApertureDiameter = maxApertureDiameter, .enabled = (bool)enabled, .filter = eFilter,
+            .nativeResolution = (bool)nativeResolution,
+            .foregroundRingCount = (uint8_t)foregroundRingCount,
+            .backgroundRingCount = (uint8_t)backgroundRingCount,
+            .fastGatherRingCount = (uint8_t)fastGatherRingCount,
+            .maxForegroundCOC = (uint8_t)maxForegroundCOC,
+            .maxBackgroundCOC = (uint8_t)maxBackgroundCOC,
+    });
 }
 
 extern "C"