Enable Vulkan validation layers for shell_test

flutter · Apr 13, 2020 · 6d9909d · 6d9909d
1 parent b241ec1
commit 6d9909d
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 21 deletions.
diff --git a/shell/common/BUILD.gn b/shell/common/BUILD.gn
@@ -5,6 +5,8 @@
 import("//flutter/common/config.gni")
 import("//flutter/shell/gpu/gpu.gni")
 import("//flutter/testing/testing.gni")
+import("//flutter/vulkan/config.gni")
+
 
 if (is_fuchsia) {
   import("//build/fuchsia/sdk.gni")
@@ -267,6 +269,11 @@ if (enable_unittests) {
           dest = "assets/shelltest_screenshot.png"
         },
       ]
+
+      if (test_enable_vulkan) {
+        libraries = vulkan_validation_libs
+        resources += vulkan_icds
+      }
     }
   }
 

diff --git a/shell/common/shell_test_platform_view_vulkan.cc b/shell/common/shell_test_platform_view_vulkan.cc
@@ -3,6 +3,7 @@
 // found in the LICENSE file.
 
 #include "flutter/shell/common/shell_test_platform_view_vulkan.h"
+#include "flutter/vulkan/vulkan_utilities.h"
 
 namespace flutter {
 namespace testing {
@@ -18,7 +19,9 @@ ShellTestPlatformViewVulkan::ShellTestPlatformViewVulkan(
       create_vsync_waiter_(std::move(create_vsync_waiter)),
       vsync_clock_(vsync_clock),
       proc_table_(fml::MakeRefCounted<vulkan::VulkanProcTable>()),
-      shell_test_external_view_embedder_(shell_test_external_view_embedder) {}
+      shell_test_external_view_embedder_(shell_test_external_view_embedder) {
+        vulkan::SetValidationLayersEnabled(true);
+      }
 
 ShellTestPlatformViewVulkan::~ShellTestPlatformViewVulkan() = default;
 

diff --git a/shell/platform/fuchsia/flutter/BUILD.gn b/shell/platform/fuchsia/flutter/BUILD.gn
@@ -34,10 +34,6 @@ flutter_runner("jit") {
     extra_defines += [ "FLUTTER_PROFILE" ]
   }
 
-  if (enable_vulkan_validation_layers) {
-    extra_defines += [ "VULKAN_VALIDATION_LAYERS_ENABLED" ]
-  }
-
   extra_deps = [
     "//third_party/dart/runtime:libdart_jit",
     "//third_party/dart/runtime/platform:libdart_platform_jit",
@@ -50,10 +46,6 @@ flutter_runner("jit_product") {
 
   extra_defines = [ "DART_PRODUCT" ]
 
-  if (enable_vulkan_validation_layers) {
-    extra_defines += [ "VULKAN_VALIDATION_LAYERS_ENABLED" ]
-  }
-
   extra_deps = [
     "//third_party/dart/runtime:libdart_jit_product",
     "//third_party/dart/runtime/platform:libdart_platform_jit_product",
@@ -69,10 +61,6 @@ flutter_runner("aot") {
     extra_defines += [ "FLUTTER_PROFILE" ]
   }
 
-  if (enable_vulkan_validation_layers) {
-    extra_defines += [ "VULKAN_VALIDATION_LAYERS_ENABLED" ]
-  }
-
   extra_deps = [
     "//third_party/dart/runtime:libdart_precompiled_runtime",
     "//third_party/dart/runtime/platform:libdart_platform_precompiled_runtime",
@@ -85,10 +73,6 @@ flutter_runner("aot_product") {
 
   extra_defines = [ "DART_PRODUCT" ]
 
-  if (enable_vulkan_validation_layers) {
-    extra_defines += [ "VULKAN_VALIDATION_LAYERS_ENABLED" ]
-  }
-
   extra_deps = [
     "//third_party/dart/runtime:libdart_precompiled_runtime_product",
     "//third_party/dart/runtime/platform:libdart_platform_precompiled_runtime_product",

diff --git a/tools/fuchsia/fuchsia_archive.gni b/tools/fuchsia/fuchsia_archive.gni
@@ -143,6 +143,10 @@ template("fuchsia_test_archive") {
       resources = invoker.resources
     }
 
+    if (defined(invoker.libraries)) {
+      libraries += invoker.libraries
+    }
+
     meta_dir = "//flutter/testing/fuchsia/meta"
     cmx_file = "$meta_dir/fuchsia_test.cmx"
   }

diff --git a/vulkan/vulkan_utilities.cc b/vulkan/vulkan_utilities.cc
@@ -10,16 +10,24 @@
 
 namespace vulkan {
 
+static bool sValidationLayersEnabled = false;
+
 bool IsDebuggingEnabled() {
 #ifndef NDEBUG
   return true;
-#elif defined(VULKAN_VALIDATION_LAYERS_ENABLED)
-  return true;
 #else
-  return false;
+  return ValidationLayersEnabled();
 #endif
 }
 
+void SetValidationLayersEnabled(bool enabled) {
+  sValidationLayersEnabled = enabled;
+}
+
+bool ValidationLayersEnabled() {
+  return sValidationLayersEnabled;
+}
+
 // Whether to show Vulkan validation layer info messages in addition
 // to the error messages.
 bool ValidationLayerInfoMessagesEnabled() {
@@ -36,7 +44,7 @@ bool ValidationErrorsFatal() {
 static std::vector<std::string> InstanceOrDeviceLayersToEnable(
     const VulkanProcTable& vk,
     VkPhysicalDevice physical_device) {
-  if (!IsDebuggingEnabled()) {
+  if (!ValidationLayersEnabled()) {
     return {};
   }
 

diff --git a/vulkan/vulkan_utilities.h b/vulkan/vulkan_utilities.h
@@ -15,6 +15,8 @@
 namespace vulkan {
 
 bool IsDebuggingEnabled();
+void SetValidationLayersEnabled(bool enabled);
+bool ValidationLayersEnabled();
 bool ValidationLayerInfoMessagesEnabled();
 bool ValidationErrorsFatal();