Merge branch 'rc/1.9.13' into release

README.md

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

RELEASE_NOTES.md

@@ -5,6 +5,13 @@ A new header is inserted each time a *tag* is created.
 
 ## Next release (main branch)
 
+## v1.9.13
+
+- Android: fix "No implementation found" error.
+- Android: fix compilation error in UbershaderLoader.
+- engine: computeDataSize now returns correct value for USHORT_565.
+- Vulkan: various internal improvements.
+
 ## v1.9.12
 
 - engine: Fixed GL errors seen with MSAA on WebGL.

android/filament-android/src/main/cpp/nativewindow/Win32.cpp

@@ -1,67 +1,67 @@
-/*
- * Copyright (C) 2018 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 <stdio.h>
-
-#include <jawt.h>
-#include <win32/jawt_md.h>
-#include <windows.h>
-
-#include <utils/unwindows.h>
-
-#include "JAWTUtils.h"
-#include <filament/Engine.h>
-
-extern "C" {
-
-void* getNativeWindow(JNIEnv* env, jclass, jobject surface) {
-    JAWT_DrawingSurface* ds = nullptr;
-    JAWT_DrawingSurfaceInfo* dsi = nullptr;
-
-    if (!acquireDrawingSurface(env, surface, &ds, &dsi)) {
-        return nullptr;
-    }
-
-    JAWT_Win32DrawingSurfaceInfo* dsi_win32 = (JAWT_Win32DrawingSurfaceInfo*) dsi->platformInfo;
-    HWND hWnd = dsi_win32->hwnd;
-
-    releaseDrawingSurface(ds, dsi);
-
-    return (void*) hWnd;
-}
-
-
-jlong createNativeSurface(jint width, jint height) {
-    // We need to adjust the window size so the "client area" matches width and height requested.
-    // Otherwise, the window itself will be of dimension width-height but the "client area" and the
-    // resulting surface will be smaller than requested.
-    RECT dimension = {0, 0, width, height};
-    AdjustWindowRect(&dimension, WS_OVERLAPPEDWINDOW, FALSE);
-    width = dimension.right - dimension.left;
-    height = dimension.bottom - dimension.top;
-
-    HWND window = CreateWindowA("STATIC", "dummy", 0, 0, 0, width, height, NULL, NULL, NULL, NULL);
-    SetWindowLong(window, GWL_STYLE, 0); //remove all window styles
-
-    return (jlong) window;
-}
-
-void destroyNativeSurface(jlong surface) {
-    HWND window = (HWND) surface;
-    DestroyWindow(window);
-}
-
-}
+/*
+ * Copyright (C) 2018 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 <stdio.h>
+
+#include <jawt.h>
+#include <win32/jawt_md.h>
+#include <windows.h>
+
+#include <utils/unwindows.h>
+
+#include "JAWTUtils.h"
+#include <filament/Engine.h>
+
+extern "C" {
+
+void* getNativeWindow(JNIEnv* env, jclass, jobject surface) {
+    JAWT_DrawingSurface* ds = nullptr;
+    JAWT_DrawingSurfaceInfo* dsi = nullptr;
+
+    if (!acquireDrawingSurface(env, surface, &ds, &dsi)) {
+        return nullptr;
+    }
+
+    JAWT_Win32DrawingSurfaceInfo* dsi_win32 = (JAWT_Win32DrawingSurfaceInfo*) dsi->platformInfo;
+    HWND hWnd = dsi_win32->hwnd;
+
+    releaseDrawingSurface(ds, dsi);
+
+    return (void*) hWnd;
+}
+
+
+jlong createNativeSurface(jint width, jint height) {
+    // We need to adjust the window size so the "client area" matches width and height requested.
+    // Otherwise, the window itself will be of dimension width-height but the "client area" and the
+    // resulting surface will be smaller than requested.
+    RECT dimension = {0, 0, width, height};
+    AdjustWindowRect(&dimension, WS_OVERLAPPEDWINDOW, FALSE);
+    width = dimension.right - dimension.left;
+    height = dimension.bottom - dimension.top;
+
+    HWND window = CreateWindowA("STATIC", "dummy", 0, 0, 0, width, height, NULL, NULL, NULL, NULL);
+    SetWindowLong(window, GWL_STYLE, 0); //remove all window styles
+
+    return (jlong) window;
+}
+
+void destroyNativeSurface(jlong surface) {
+    HWND window = (HWND) surface;
+    DestroyWindow(window);
+}
+
+}