Consolidate GPU buffer implementations

src/gpu/vk/GrVkGpu.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 "GrContextOptions.h"
@@ skipping 371 matching lines @@
 
     // Release old command buffer and create a new one
     fCurrentCmdBuffer->unref(this);
     fCurrentCmdBuffer = fResourceProvider.createCommandBuffer();
     SkASSERT(fCurrentCmdBuffer);
 
     fCurrentCmdBuffer->begin(this);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-GrVertexBuffer* GrVkGpu::onCreateVertexBuffer(size_t size, bool dynamic) {
-    return GrVkVertexBuffer::Create(this, size, dynamic);
-}
-
-GrIndexBuffer* GrVkGpu::onCreateIndexBuffer(size_t size, bool dynamic) {
-    return GrVkIndexBuffer::Create(this, size, dynamic);
-}
-
-GrTransferBuffer* GrVkGpu::onCreateTransferBuffer(size_t size, TransferType type) {
-    GrVkBuffer::Type bufferType = kCpuToGpu_TransferType ? GrVkBuffer::kCopyRead_Type 
-                                                         : GrVkBuffer::kCopyWrite_Type;
-    return GrVkTransferBuffer::Create(this, size, bufferType);
+GrBuffer* GrVkGpu::onCreateBuffer(GrBufferType type, size_t size, GrAccessPattern accessPattern) {
+    switch (type) {
+        case kVertex_GrBufferType:
+            return GrVkVertexBuffer::Create(this, size, accessPattern);
+        case kIndex_GrBufferType:
+            return GrVkIndexBuffer::Create(this, size, accessPattern);
+        case kXferCpuToGpu_GrBufferType:
+        case kXferGpuToCpu_GrBufferType:
+            return GrVkTransferBuffer::Create(this, size, type);
+        default:
+            SkFAIL("Unknown buffer type.");
+            return nullptr;
+    }
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 bool GrVkGpu::onGetWritePixelsInfo(GrSurface* dstSurface, int width, int height,
                                    GrPixelConfig srcConfig, DrawPreference* drawPreference,
                                    WritePixelTempDrawInfo* tempDrawInfo) {
     if (kIndex_8_GrPixelConfig == srcConfig || GrPixelConfigIsCompressed(dstSurface->config())) {
         return false;
     }
 
@@ skipping 135 matching lines @@
                 memcpy(mapPtr, data, trimRowBytes * height);
             } else {
                 SkRectMemcpy(mapPtr, static_cast<size_t>(layout.rowPitch), data, rowBytes,
                              trimRowBytes, height);
             }
         }
 
         GR_VK_CALL(interface, UnmapMemory(fDevice, tex->textureMemory()));
     } else {
         GrVkTransferBuffer* transferBuffer =
-            GrVkTransferBuffer::Create(this, trimRowBytes * height, GrVkBuffer::kCopyRead_Type);
+            GrVkTransferBuffer::Create(this, trimRowBytes * height, kXferCpuToGpu_GrBufferType);
 
         void* mapPtr = transferBuffer->map();
 
         if (kBottomLeft_GrSurfaceOrigin == desc.fOrigin) {
             // copy into buffer by rows
             const char* srcRow = reinterpret_cast<const char*>(data);
             char* dstRow = reinterpret_cast<char*>(mapPtr)+(height - 1)*trimRowBytes;
             for (int y = 0; y < height; y++) {
                 memcpy(dstRow, srcRow, trimRowBytes);
                 srcRow += rowBytes;
@@ skipping 864 matching lines @@
     VkAccessFlags dstAccessMask = VK_ACCESS_TRANSFER_READ_BIT;
     tgt->setImageLayout(this,
                         VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL,
                         srcAccessMask,
                         dstAccessMask,
                         srcStageMask,
                         dstStageMask,
                         false);
 
     GrVkTransferBuffer* transferBuffer = 
-        reinterpret_cast<GrVkTransferBuffer*>(this->createTransferBuffer(rowBytes * height, 
-                                                                         kGpuToCpu_TransferType));
+        GrVkTransferBuffer::Create(this, rowBytes * height, kXferGpuToCpu_GrBufferType);
 
     bool flipY = kBottomLeft_GrSurfaceOrigin == surface->origin();
     VkOffset3D offset = {
         left,
         flipY ? surface->height() - top - height : top,
         0
     };
 
     // Copy the image to a buffer so we can map it to cpu memory
     VkBufferImageCopy region;
@@ skipping 205 matching lines @@
     int set_a_break_pt_here = 9;
     aglSwapBuffers(aglGetCurrentContext());
 #elif defined(SK_BUILD_FOR_WIN32)
     SwapBuf();
     int set_a_break_pt_here = 9;
     SwapBuf();
 #endif
 #endif
 }