commit e50f3e75392d7be8ae89df8f55b1700100c34ad7
author jvanverth <jvanverth@google.com> Mon Mar 28 07:03:06 2016 -0700
committer Commit bot <commit-bot@chromium.org> Mon Mar 28 07:03:06 2016 -0700
tree a91573ec043630608157145afa4f414b422ed69b
parent 6d3763563630c56662b69a6a2063ece954a0c0cd

Add WSI functions to GrVkInterface

BUG=skia:5043
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1834903003

Review URL: https://codereview.chromium.org/1834903003

src/gpu/vk/GrVkMemory.cpp

diff --git a/src/gpu/vk/GrVkMemory.cpp b/src/gpu/vk/GrVkMemory.cpp
index 276fd4b..7e8c577 100644
--- a/src/gpu/vk/GrVkMemory.cpp
+++ b/src/gpu/vk/GrVkMemory.cpp
@@ -62,11 +62,11 @@
                                           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)) {
@@ -74,9 +74,9 @@
     }
 
     // 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;
@@ -86,20 +86,20 @@
                                          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;