Consolidate GPU buffer implementations

src/gpu/vk/GrVkVertexBuffer.cpp

Index: src/gpu/vk/GrVkVertexBuffer.cpp
diff --git a/src/gpu/vk/GrVkVertexBuffer.cpp b/src/gpu/vk/GrVkVertexBuffer.cpp
index 46c6d28f23d2bd7ec8b704635b7f814e58a98732..1d3eadb42c87c5ff7e1fe4e37f3fb0341e2160cf 100644
--- a/src/gpu/vk/GrVkVertexBuffer.cpp
+++ b/src/gpu/vk/GrVkVertexBuffer.cpp
@@ -10,7 +10,8 @@
 
 GrVkVertexBuffer::GrVkVertexBuffer(GrVkGpu* gpu, const GrVkBuffer::Desc& desc,
                                    const GrVkBuffer::Resource* bufferResource)
-    : INHERITED(gpu, desc.fSizeInBytes, desc.fDynamic, false)
+    : INHERITED(gpu, kVertex_GrBufferType, desc.fSizeInBytes,
+                desc.fDynamic ? kDynamic_GrAccessPattern : kStatic_GrAccessPattern, false)
     , GrVkBuffer(desc, bufferResource) {
     this->registerWithCache();
 }
@@ -46,11 +47,9 @@ void GrVkVertexBuffer::onAbandon() {
     INHERITED::onAbandon();
 }
 
-void* GrVkVertexBuffer::onMap() {
+void GrVkVertexBuffer::onMap() {
     if (!this->wasDestroyed()) {
-        return this->vkMap(this->getVkGpu());
-    } else {
-        return NULL;
+        this->GrBuffer::fMapPtr = this->vkMap(this->getVkGpu());
     }
 }