Add WSI functions to GrVkInterface

src/gpu/vk/GrVkMemory.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 "GrVkMemory.h"
 
 #include "GrVkGpu.h"
@@ skipping 44 matching lines @@
     if (err) {
         return false;
     }
     return true;
 }
 
 bool GrVkMemory::AllocAndBindBufferMemory(const GrVkGpu* gpu,
                                           VkBuffer buffer,
                                           const VkMemoryPropertyFlags flags,
                                           VkDeviceMemory* memory) {
-    const GrVkInterface* interface = gpu->vkInterface();
+    const GrVkInterface* iface = gpu->vkInterface();
     VkDevice device = gpu->device();
 
     VkMemoryRequirements memReqs;
-    GR_VK_CALL(interface, GetBufferMemoryRequirements(device, buffer, &memReqs));
+    GR_VK_CALL(iface, GetBufferMemoryRequirements(device, buffer, &memReqs));
 
 
     if (!alloc_device_memory(gpu, &memReqs, flags, memory)) {
         return false;
     }
 
     // Bind Memory to queue
-    VkResult err = GR_VK_CALL(interface, BindBufferMemory(device, buffer, *memory, 0));
+    VkResult err = GR_VK_CALL(iface, BindBufferMemory(device, buffer, *memory, 0));
     if (err) {
-        GR_VK_CALL(interface, FreeMemory(device, *memory, nullptr));
+        GR_VK_CALL(iface, FreeMemory(device, *memory, nullptr));
         return false;
     }
     return true;
 }
 
 bool GrVkMemory::AllocAndBindImageMemory(const GrVkGpu* gpu,
                                          VkImage image,
                                          const VkMemoryPropertyFlags flags,
                                          VkDeviceMemory* memory) {
-    const GrVkInterface* interface = gpu->vkInterface();
+    const GrVkInterface* iface = gpu->vkInterface();
     VkDevice device = gpu->device();
 
     VkMemoryRequirements memReqs;
-    GR_VK_CALL(interface, GetImageMemoryRequirements(device, image, &memReqs));
+    GR_VK_CALL(iface, GetImageMemoryRequirements(device, image, &memReqs));
 
     if (!alloc_device_memory(gpu, &memReqs, flags, memory)) {
         return false;
     }
 
     // Bind Memory to queue
-    VkResult err = GR_VK_CALL(interface, BindImageMemory(device, image, *memory, 0));
+    VkResult err = GR_VK_CALL(iface, BindImageMemory(device, image, *memory, 0));
     if (err) {
-        GR_VK_CALL(interface, FreeMemory(device, *memory, nullptr));
+        GR_VK_CALL(iface, FreeMemory(device, *memory, nullptr));
         return false;
     }
     return true;
 }
 
 VkPipelineStageFlags GrVkMemory::LayoutToPipelineStageFlags(const VkImageLayout layout) {
     if (VK_IMAGE_LAYOUT_GENERAL == layout) {
         return VK_PIPELINE_STAGE_ALL_COMMANDS_BIT;
     } else if (VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL == layout ||
                VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL == layout) {
@@ skipping 35 matching lines @@
     } else if (VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL == layout) {
         flags = VK_ACCESS_TRANSFER_WRITE_BIT;
     } else if (VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL == layout) {
         flags = VK_ACCESS_TRANSFER_READ_BIT;
     } else if (VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL == layout) {
         flags = VK_ACCESS_SHADER_READ_BIT;
     }
     return flags;
 }