chinmays vulkan patch

Author: gaaclarke

impeller/BUILD.gn

@@ -34,10 +34,6 @@ config("impeller_public_config") {
     defines += [ "IMPELLER_ENABLE_VULKAN=1" ]
   }
 
-  if (impeller_enable_vulkan_playgrounds) {
-    defines += [ "IMPELLER_ENABLE_VULKAN_PLAYGROUNDS=1" ]
-  }
-
   if (impeller_trace_all_gl_calls) {
     defines += [ "IMPELLER_TRACE_ALL_GL_CALLS" ]
   }

impeller/playground/backend/vulkan/playground_impl_vk.cc

@@ -175,10 +175,38 @@ void PlaygroundImplVK::InitGlobalVulkanInstance() {
   application_info.setPEngineName("PlaygroundImplVK");
   application_info.setPApplicationName("PlaygroundImplVK");
 
-  auto instance_result =
-      vk::createInstanceUnique(vk::InstanceCreateInfo({}, &application_info));
+  CapabilitiesVK caps(false);
+  auto enabled_layers = caps.GetEnabledLayers();
+  auto enabled_extensions = caps.GetEnabledInstanceExtensions();
+
+  FML_CHECK(enabled_layers.has_value() && enabled_extensions.has_value());
+
+  std::vector<const char*> enabled_layers_c;
+  std::vector<const char*> enabled_extensions_c;
+
+  for (const auto& layer : enabled_layers.value()) {
+    enabled_layers_c.push_back(layer.c_str());
+  }
+
+  for (const auto& ext : enabled_extensions.value()) {
+    enabled_extensions_c.push_back(ext.c_str());
+  }
+
+  vk::InstanceCreateInfo instance_info;
+  instance_info.setPEnabledLayerNames(enabled_layers_c);
+  instance_info.setPEnabledExtensionNames(enabled_extensions_c);
+  instance_info.setPApplicationInfo(&application_info);
+
+  if (std::find(enabled_extensions->begin(), enabled_extensions->end(),
+                "VK_KHR_portability_enumeration") !=
+      enabled_extensions->end()) {
+    instance_info.flags |= vk::InstanceCreateFlagBits::eEnumeratePortabilityKHR;
+  }
+
+  auto instance_result = vk::createInstanceUnique(instance_info);
   FML_CHECK(instance_result.result == vk::Result::eSuccess)
-      << "Unable to initialize global Vulkan instance";
+      << "Unable to initialize global Vulkan instance: "
+      << vk::to_string(instance_result.result);
   global_instance_ = std::move(instance_result.value);
 }
 

impeller/playground/playground.cc

@@ -102,7 +102,7 @@ bool Playground::SupportsBackend(PlaygroundBackend backend) {
       return false;
 #endif  // IMPELLER_ENABLE_OPENGLES
     case PlaygroundBackend::kVulkan:
-#if IMPELLER_ENABLE_VULKAN && IMPELLER_ENABLE_VULKAN_PLAYGROUNDS
+#if IMPELLER_ENABLE_VULKAN
       return true;
 #else   // IMPELLER_ENABLE_VULKAN
       return false;

impeller/tools/impeller.gni

@@ -25,13 +25,6 @@ declare_args() {
   impeller_enable_vulkan = (is_linux || is_win || is_android ||
                             enable_unittests) && target_os != "fuchsia"
 
-  # Whether playgrounds should run with Vulkan.
-  #
-  # impeller_enable_vulkan may be true in build environments that run tests but
-  # do not have a Vulkan ICD present.
-  impeller_enable_vulkan_playgrounds =
-      (is_linux || is_win || is_android) && target_os != "fuchsia"
-
   # Whether to use a prebuilt impellerc.
   # If this is the empty string, impellerc will be built.
   # If it is non-empty, it should be the absolute path to impellerc.