Revert of Consolidate GPU buffer implementations

include/gpu/GrCaps.h

Index: include/gpu/GrCaps.h
diff --git a/include/gpu/GrCaps.h b/include/gpu/GrCaps.h
index 3ef8295e2b1f93576635a577b8b701b84b8b6b2c..1f5b11955bd65c82634742747f10e8e1af25235a 100644
--- a/include/gpu/GrCaps.h
+++ b/include/gpu/GrCaps.h
@@ -247,9 +247,9 @@
         return fDrawPathMasksToCompressedTextureSupport;
     }
 
-    size_t bufferMapThreshold() const {
-        SkASSERT(fBufferMapThreshold >= 0);
-        return fBufferMapThreshold;
+    size_t geometryBufferMapThreshold() const {
+        SkASSERT(fGeometryBufferMapThreshold >= 0);
+        return fGeometryBufferMapThreshold;
     }
 
     bool supportsInstancedDraws() const {
@@ -301,7 +301,7 @@
     GR_STATIC_ASSERT(kLast_GrBlendEquation < 32);
 
     uint32_t fMapBufferFlags;
-    int fBufferMapThreshold;
+    int fGeometryBufferMapThreshold;
 
     int fMaxRenderTargetSize;
     int fMaxVertexAttributes;