Enable extension support and debug layer.

src/gpu/vk/GrVkInterface.cpp

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "vk/GrVkInterface.h"
+#include "vk/GrVkUtil.h"
 
 GrVkInterface::GrVkInterface() {
 }
 
 #define GET_PROC(F) functions->f ## F = (PFN_vk ## F) vkGetInstanceProcAddr(instance, "vk" #F)
+#define GET_PROC_LOCAL(inst, F) PFN_vk ## F F = (PFN_vk ## F) vkGetInstanceProcAddr(inst, "vk" #F)
 
 const GrVkInterface* GrVkCreateInterface(VkInstance instance) {
 
+    GET_PROC_LOCAL(nullptr, EnumerateInstanceExtensionProperties);
+    GET_PROC_LOCAL(instance, EnumerateDeviceExtensionProperties);
+    GET_PROC_LOCAL(nullptr, EnumerateInstanceLayerProperties);
+    GET_PROC_LOCAL(instance, EnumerateDeviceLayerProperties);
+
+    GrVkExtensions extensions;
+    if (!extensions.init(kGrVkMinimumVersion,
+                         EnumerateInstanceExtensionProperties,
+                         EnumerateDeviceExtensionProperties,
+                         EnumerateInstanceLayerProperties,
+                         EnumerateDeviceLayerProperties)) {
+        return nullptr;
+    }
+
     GrVkInterface* interface = new GrVkInterface();
     GrVkInterface::Functions* functions = &interface->fFunctions;
 
     GET_PROC(CreateInstance);
     GET_PROC(DestroyInstance);
     GET_PROC(EnumeratePhysicalDevices);
     GET_PROC(GetPhysicalDeviceFeatures);
     GET_PROC(GetPhysicalDeviceFormatProperties);
     GET_PROC(GetPhysicalDeviceImageFormatProperties);
     GET_PROC(GetPhysicalDeviceProperties);
@@ skipping 118 matching lines @@
     GET_PROC(CmdBeginQuery);
     GET_PROC(CmdEndQuery);
     GET_PROC(CmdResetQueryPool);
     GET_PROC(CmdWriteTimestamp);
     GET_PROC(CmdCopyQueryPoolResults);
     GET_PROC(CmdPushConstants);
     GET_PROC(CmdBeginRenderPass);
     GET_PROC(CmdNextSubpass);
     GET_PROC(CmdEndRenderPass);
     GET_PROC(CmdExecuteCommands);
+    // TODO: break these out with extension checks
     GET_PROC(DestroySurfaceKHR);
     GET_PROC(GetPhysicalDeviceSurfaceSupportKHR);
     GET_PROC(GetPhysicalDeviceSurfaceCapabilitiesKHR);
     GET_PROC(GetPhysicalDeviceSurfaceFormatsKHR);
     GET_PROC(GetPhysicalDeviceSurfacePresentModesKHR);
     GET_PROC(CreateSwapchainKHR);
     GET_PROC(DestroySwapchainKHR);
     GET_PROC(GetSwapchainImagesKHR);
     GET_PROC(AcquireNextImageKHR);
     GET_PROC(QueuePresentKHR);
     GET_PROC(GetPhysicalDeviceDisplayPropertiesKHR);
     GET_PROC(GetPhysicalDeviceDisplayPlanePropertiesKHR);
     GET_PROC(GetDisplayPlaneSupportedDisplaysKHR);
     GET_PROC(GetDisplayModePropertiesKHR);
     GET_PROC(CreateDisplayModeKHR);
     GET_PROC(GetDisplayPlaneCapabilitiesKHR);
     GET_PROC(CreateDisplayPlaneSurfaceKHR);
     GET_PROC(CreateSharedSwapchainsKHR);
 
+    if (extensions.hasInstanceExtension(VK_EXT_DEBUG_REPORT_EXTENSION_NAME)) {
+        GET_PROC(CreateDebugReportCallbackEXT);
+        GET_PROC(DebugReportMessageEXT);
+        GET_PROC(DestroyDebugReportCallbackEXT);
+    }
+
+    interface->fExtensions.swap(&extensions);
+
     return interface;
 }
 
 #define RETURN_FALSE_INTERFACE                                                                   \
     if (kIsDebug) { SkDebugf("%s:%d GrVkInterface::validate() failed.\n", __FILE__, __LINE__); } \
     return false;
 
 bool GrVkInterface::validate() const {
     // functions that are always required
     if (NULL == fFunctions.fCreateInstance ||
@@ skipping 141 matching lines @@
         NULL == fFunctions.fGetSwapchainImagesKHR ||
         NULL == fFunctions.fAcquireNextImageKHR ||
         NULL == fFunctions.fQueuePresentKHR ||
         NULL == fFunctions.fGetPhysicalDeviceDisplayPropertiesKHR ||
         NULL == fFunctions.fGetPhysicalDeviceDisplayPlanePropertiesKHR ||
         NULL == fFunctions.fGetDisplayPlaneSupportedDisplaysKHR ||
         NULL == fFunctions.fGetDisplayModePropertiesKHR ||
         NULL == fFunctions.fCreateDisplayModeKHR ||
         NULL == fFunctions.fGetDisplayPlaneCapabilitiesKHR ||
         NULL == fFunctions.fCreateDisplayPlaneSurfaceKHR ||
-        NULL == fFunctions.fCreateSharedSwapchainsKHR) {
+        NULL == fFunctions.fCreateSharedSwapchainsKHR ||
+        NULL == fFunctions.fCreateDebugReportCallbackEXT ||
+        NULL == fFunctions.fDebugReportMessageEXT ||
+        NULL == fFunctions.fDestroyDebugReportCallbackEXT) {
         return false;
     }
     return true;
 }