smoke: Allow Android to specify layers other than standard_validation

5 files changed, 11 insertions, 2 deletions

diff --git a/demos/smoke/Shell.cpp b/demos/smoke/Shell.cpp
index 5a088523..e0149584 100644
--- a/demos/smoke/Shell.cpp
+++ b/demos/smoke/Shell.cpp
@@ -32,9 +32,7 @@ Shell::Shell(Game &game)
     instance_extensions_.push_back(VK_KHR_SURFACE_EXTENSION_NAME);
     device_extensions_.push_back(VK_KHR_SWAPCHAIN_EXTENSION_NAME);
 
-    // require "standard" validation layers
     if (settings_.validate) {
-        instance_layers_.push_back("VK_LAYER_LUNARG_standard_validation");
         instance_extensions_.push_back(VK_EXT_DEBUG_REPORT_EXTENSION_NAME);
     }
 }
diff --git a/demos/smoke/ShellAndroid.cpp b/demos/smoke/ShellAndroid.cpp
index b587336e..4fab5bdc 100644
--- a/demos/smoke/ShellAndroid.cpp
+++ b/demos/smoke/ShellAndroid.cpp
@@ -67,6 +67,14 @@ private:
 
 ShellAndroid::ShellAndroid(android_app &app, Game &game) : Shell(game), app_(app)
 {
+    instance_layers_.push_back("VK_LAYER_GOOGLE_threading");
+    instance_layers_.push_back("VK_LAYER_LUNARG_parameter_validation");
+    instance_layers_.push_back("VK_LAYER_LUNARG_object_tracker");
+    instance_layers_.push_back("VK_LAYER_LUNARG_image");
+    instance_layers_.push_back("VK_LAYER_LUNARG_core_validation");
+    instance_layers_.push_back("VK_LAYER_LUNARG_swapchain");
+    instance_layers_.push_back("VK_LAYER_GOOGLE_unique_objects");
+
     instance_extensions_.push_back(VK_KHR_ANDROID_SURFACE_EXTENSION_NAME);
 
     app_dummy();
diff --git a/demos/smoke/ShellWayland.cpp b/demos/smoke/ShellWayland.cpp
index 0d4bcbcf..a4d5eb27 100644
--- a/demos/smoke/ShellWayland.cpp
+++ b/demos/smoke/ShellWayland.cpp
@@ -109,6 +109,7 @@ void ShellWayland::handle_popup_done(
     void *data UNUSED, struct wl_shell_surface *shell_surface UNUSED) {}
 
 ShellWayland::ShellWayland(Game &game) : Shell(game) {
+    instance_layers_.push_back("VK_LAYER_LUNARG_standard_validation");
     instance_extensions_.push_back(VK_KHR_WAYLAND_SURFACE_EXTENSION_NAME);
 
     init_connection();
diff --git a/demos/smoke/ShellWin32.cpp b/demos/smoke/ShellWin32.cpp
index c31d11db..11e03aeb 100644
--- a/demos/smoke/ShellWin32.cpp
+++ b/demos/smoke/ShellWin32.cpp
@@ -57,6 +57,7 @@ private:
 
 ShellWin32::ShellWin32(Game &game) : Shell(game), hwnd_(nullptr)
 {
+    instance_layers_.push_back("VK_LAYER_LUNARG_standard_validation");
     instance_extensions_.push_back(VK_KHR_WIN32_SURFACE_EXTENSION_NAME);
     init_vk();
 }
diff --git a/demos/smoke/ShellXcb.cpp b/demos/smoke/ShellXcb.cpp
index 5df3e47d..55f0e8fb 100644
--- a/demos/smoke/ShellXcb.cpp
+++ b/demos/smoke/ShellXcb.cpp
@@ -83,6 +83,7 @@ xcb_atom_t intern_atom(xcb_connection_t *c, xcb_intern_atom_cookie_t cookie)
 
 ShellXcb::ShellXcb(Game &game) : Shell(game)
 {
+    instance_layers_.push_back("VK_LAYER_LUNARG_standard_validation");
     instance_extensions_.push_back(VK_KHR_XCB_SURFACE_EXTENSION_NAME);
 
     init_connection();