Consolidate GPU buffer implementations

src/gpu/vk/GrVkGpu.h

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef GrVkGpu_DEFINED
 #define GrVkGpu_DEFINED
 
@@ skipping 129 matching lines @@
     GrTexture* onWrapBackendTexture(const GrBackendTextureDesc&, GrWrapOwnership) override;
 
     GrRenderTarget* onWrapBackendRenderTarget(const GrBackendRenderTargetDesc&,
                                               GrWrapOwnership) override;
     GrRenderTarget* onWrapBackendTextureAsRenderTarget(const GrBackendTextureDesc&,
                                                        GrWrapOwnership) override {
         SkDebugf("onWrapBackendTextureAsRenderTarget not yet implemented for Vulkan\n");
         return NULL;
     }
 
-    GrVertexBuffer* onCreateVertexBuffer(size_t size, bool dynamic) override;
-    GrIndexBuffer* onCreateIndexBuffer(size_t size, bool dynamic) override;
+    GrBuffer* onCreateVertexBuffer(size_t size, bool dynamic) override;
+    GrBuffer* onCreateIndexBuffer(size_t size, bool dynamic) override;
     GrTransferBuffer* onCreateTransferBuffer(size_t size, TransferType type) override;
 
     void onClear(GrRenderTarget*, const SkIRect& rect, GrColor color) override;
 
     void onClearStencilClip(GrRenderTarget*, const SkIRect& rect, bool insideClip) override;
 
     void onDraw(const GrPipeline&,
                 const GrPrimitiveProcessor&,
                 const GrMesh*,
                 int meshCount) override;
 
     bool onReadPixels(GrSurface* surface,
                       int left, int top, int width, int height,
                       GrPixelConfig,
                       void* buffer,
                       size_t rowBytes) override;
 
     bool onWritePixels(GrSurface* surface,
                        int left, int top, int width, int height,
                        GrPixelConfig config, const SkTArray<GrMipLevel>&) override;
 
     bool onTransferPixels(GrSurface*,
                           int left, int top, int width, int height,
-                          GrPixelConfig config, GrTransferBuffer* buffer,
+                          GrPixelConfig config, GrBuffer* transferBuffer,
                           size_t offset, size_t rowBytes) override {
         SkDebugf("onTransferPixels not yet implemented for Vulkan\n");
         return false;
     }
 
     void onResolveRenderTarget(GrRenderTarget* target) override {
         SkDebugf("onResolveRenderTarget not yet implemented for Vulkan\n");
     }
 
     bool prepareDrawState(const GrPipeline&,
@@ skipping 46 matching lines @@
     shaderc_compiler_t fCompiler;
 
     // This is only for our current testing and building. The client should be holding on to the
     // VkInstance.
     VkInstance                        fVkInstance;
 
     typedef GrGpu INHERITED;
 };
 
 #endif