Add offset to memory allocations

src/gpu/vk/GrVkImage.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 "GrVkGpu.h"
 #include "GrVkImage.h"
 #include "GrVkMemory.h"
@@ skipping 45 matching lines @@
     };
 
     gpu->addImageMemoryBarrier(srcStageMask, dstStageMask, byRegion, &imageMemoryBarrier);
 
     fInfo.fImageLayout = newLayout;
 }
 
 bool GrVkImage::InitImageInfo(const GrVkGpu* gpu, const ImageDesc& imageDesc, GrVkImageInfo* info) {
     VkImage image = 0;
     VkDeviceMemory alloc;
+    VkDeviceSize offset;
 
     VkImageLayout initialLayout = (VK_IMAGE_TILING_LINEAR == imageDesc.fImageTiling)
         ? VK_IMAGE_LAYOUT_PREINITIALIZED
         : VK_IMAGE_LAYOUT_UNDEFINED;
 
     // Create Image
     VkSampleCountFlagBits vkSamples;
     if (!GrSampleCountToVkSampleCount(imageDesc.fSamples, &vkSamples)) {
         return false;
     }
@@ skipping 19 matching lines @@
         imageDesc.fUsageFlags,                       // VkImageUsageFlags
         VK_SHARING_MODE_EXCLUSIVE,                   // VkSharingMode
         0,                                           // queueFamilyCount
         0,                                           // pQueueFamilyIndices
         initialLayout                                // initialLayout
     };
 
     GR_VK_CALL_ERRCHECK(gpu->vkInterface(), CreateImage(gpu->device(), &imageCreateInfo, nullptr,
                                                         &image));
 
-    if (!GrVkMemory::AllocAndBindImageMemory(gpu, image, imageDesc.fMemProps, &alloc)) {
+    if (!GrVkMemory::AllocAndBindImageMemory(gpu, image, imageDesc.fMemProps, &alloc, &offset)) {
         VK_CALL(gpu, DestroyImage(gpu->device(), image, nullptr));
         return false;
     }
 
     info->fImage = image;
     info->fAlloc = alloc;
+    info->fOffset = offset;
     info->fImageTiling = imageDesc.fImageTiling;
     info->fImageLayout = initialLayout;
     info->fFormat = imageDesc.fFormat;
     info->fLevelCount = imageDesc.fLevels;
     return true;
 }
 
 void GrVkImage::DestroyImageInfo(const GrVkGpu* gpu, GrVkImageInfo* info) {
     VK_CALL(gpu, DestroyImage(gpu->device(), info->fImage, nullptr));
-    VK_CALL(gpu, FreeMemory(gpu->device(), info->fAlloc, nullptr));
+    GrVkMemory::FreeImageMemory(gpu, info->fAlloc, info->fOffset);
 }
 
-void GrVkImage::setNewResource(VkImage image, VkDeviceMemory alloc) {
-    fResource = new Resource(image, alloc);
+void GrVkImage::setNewResource(VkImage image, VkDeviceMemory alloc, VkDeviceSize offset) {
+    fResource = new Resource(image, alloc, offset);
 }
 
 GrVkImage::~GrVkImage() {
     // should have been released or abandoned first
     SkASSERT(!fResource);
 }
 
 void GrVkImage::releaseImage(const GrVkGpu* gpu) {
     if (fResource) {
         fResource->unref(gpu);
         fResource = nullptr;
     }
 }
 
 void GrVkImage::abandonImage() {
     if (fResource) {
         fResource->unrefAndAbandon();
         fResource = nullptr;
     }
 }
 
 void GrVkImage::Resource::freeGPUData(const GrVkGpu* gpu) const {
     VK_CALL(gpu, DestroyImage(gpu->device(), fImage, nullptr));
-    VK_CALL(gpu, FreeMemory(gpu->device(), fAlloc, nullptr));
+    GrVkMemory::FreeImageMemory(gpu, fAlloc, fOffset);
 }
 
 void GrVkImage::BorrowedResource::freeGPUData(const GrVkGpu* gpu) const {
 }