From 59a6758fce8a0b7efcc36d97f59e38226a9081f3 Mon Sep 17 00:00:00 2001
From: Philip Rideout <philiprideout@gmail.com>
Date: Mon, 10 May 2021 15:06:59 -0700
Subject: [PATCH] DO NOT COMMIT

---
 .../main/java/com/google/android/filament/utils/ModelViewer.kt | 2 +-
 android/samples/sample-gltf-viewer/build.gradle                | 3 +++
 filament/backend/src/vulkan/VulkanConstants.h                  | 2 +-
 samples/hellopbr.cpp                                           | 1 +
 samples/hellotriangle.cpp                                      | 1 +
 5 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/android/filament-utils-android/src/main/java/com/google/android/filament/utils/ModelViewer.kt b/android/filament-utils-android/src/main/java/com/google/android/filament/utils/ModelViewer.kt
index 005473eb92..3e4f242bbc 100644
--- a/android/filament-utils-android/src/main/java/com/google/android/filament/utils/ModelViewer.kt
+++ b/android/filament-utils-android/src/main/java/com/google/android/filament/utils/ModelViewer.kt
@@ -129,7 +129,7 @@ class ModelViewer(val engine: Engine) : android.view.View.OnTouchListener {
         scene.addEntity(light)
     }
 
-    constructor(surfaceView: SurfaceView, engine: Engine = Engine.create(), manipulator: Manipulator? = null) : this(engine) {
+    constructor(surfaceView: SurfaceView, engine: Engine = Engine.create(Engine.Backend.VULKAN), manipulator: Manipulator? = null) : this(engine) {
         cameraManipulator = manipulator ?: Manipulator.Builder()
                 .targetPosition(kDefaultObjectPosition.x, kDefaultObjectPosition.y, kDefaultObjectPosition.z)
                 .viewport(surfaceView.width, surfaceView.height)
diff --git a/android/samples/sample-gltf-viewer/build.gradle b/android/samples/sample-gltf-viewer/build.gradle
index ec503fccf7..8b74ad2190 100644
--- a/android/samples/sample-gltf-viewer/build.gradle
+++ b/android/samples/sample-gltf-viewer/build.gradle
@@ -29,6 +29,9 @@ android {
         targetSdkVersion versions.targetSdk
         missingDimensionStrategy 'functionality', 'full'
     }
+    sourceSets.main.jniLibs {
+        srcDirs = ["/Users/prideout/Library/Android/sdk/ndk/22.1.7171670/sources/third_party/vulkan/src/build-android/jniLibs"]
+    }
 }
 
 dependencies {
diff --git a/filament/backend/src/vulkan/VulkanConstants.h b/filament/backend/src/vulkan/VulkanConstants.h
index 65b1bcba64..e59219bc03 100644
--- a/filament/backend/src/vulkan/VulkanConstants.h
+++ b/filament/backend/src/vulkan/VulkanConstants.h
@@ -32,7 +32,7 @@
 // }
 //
 #if defined(NDEBUG)
-#define VK_ENABLE_VALIDATION 0
+#define VK_ENABLE_VALIDATION 1
 #else
 #define VK_ENABLE_VALIDATION 1
 #endif
diff --git a/samples/hellopbr.cpp b/samples/hellopbr.cpp
index 44acda07bd..f4ced280b8 100644
--- a/samples/hellopbr.cpp
+++ b/samples/hellopbr.cpp
@@ -52,6 +52,7 @@ int main(int argc, char** argv) {
     Config config;
     config.title = "hellopbr";
     config.iblDirectory = FilamentApp::getRootAssetsPath() + IBL_FOLDER;
+    config.backend = Backend::VULKAN;
 
     App app;
     auto setup = [config, &app](Engine* engine, View* view, Scene* scene) {
diff --git a/samples/hellotriangle.cpp b/samples/hellotriangle.cpp
index 8c237c68b1..3fd0fd2e90 100644
--- a/samples/hellotriangle.cpp
+++ b/samples/hellotriangle.cpp
@@ -65,6 +65,7 @@ static constexpr uint16_t TRIANGLE_INDICES[3] = { 0, 1, 2 };
 int main(int argc, char** argv) {
     Config config;
     config.title = "hellotriangle";
+    config.backend = Engine::Backend::VULKAN;
 
     App app;
     auto setup = [&app](Engine* engine, View* view, Scene* scene) {