Revert of Consolidate GPU buffer implementations

include/gpu/GrCaps.h

 
 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 #ifndef GrCaps_DEFINED
 #define GrCaps_DEFINED
 
@@ skipping 229 matching lines @@
     virtual bool isConfigRenderable(GrPixelConfig config, bool withMSAA) const = 0;
 
     bool suppressPrints() const { return fSuppressPrints; }
 
     bool immediateFlush() const { return fImmediateFlush; }
 
     bool drawPathMasksToCompressedTexturesSupport() const {
         return fDrawPathMasksToCompressedTextureSupport;
     }
 
-    size_t bufferMapThreshold() const {
-        SkASSERT(fBufferMapThreshold >= 0);
-        return fBufferMapThreshold;
+    size_t geometryBufferMapThreshold() const {
+        SkASSERT(fGeometryBufferMapThreshold >= 0);
+        return fGeometryBufferMapThreshold;
     }
 
     bool supportsInstancedDraws() const {
         return fSupportsInstancedDraws;
     }
 
     bool fullClearIsFree() const { return fFullClearIsFree; }
 
     /** True in environments that will issue errors if memory uploaded to buffers 
         is not initialized (even if not read by draw calls). */
@@ skipping 31 matching lines @@
     bool fUseDrawInsteadOfAllRenderTargetWrites      : 1;
 
     // ANGLE workaround
     bool fPreferVRAMUseOverFlushes                   : 1;
 
     BlendEquationSupport fBlendEquationSupport;
     uint32_t fAdvBlendEqBlacklist;
     GR_STATIC_ASSERT(kLast_GrBlendEquation < 32);
 
     uint32_t fMapBufferFlags;
-    int fBufferMapThreshold;
+    int fGeometryBufferMapThreshold;
 
     int fMaxRenderTargetSize;
     int fMaxVertexAttributes;
     int fMaxTextureSize;
     int fMaxTileSize;
     int fMaxColorSampleCount;
     int fMaxStencilSampleCount;
     int fMaxRasterSamples;
 
 private:
     virtual void onApplyOptionsOverrides(const GrContextOptions&) {};
 
     bool fSuppressPrints : 1;
     bool fImmediateFlush: 1;
     bool fDrawPathMasksToCompressedTextureSupport : 1;
 
     typedef SkRefCnt INHERITED;
 };
 
 #endif