Consolidate GPU buffer implementations

gyp/gpu.gypi

Index: gyp/gpu.gypi
diff --git a/gyp/gpu.gypi b/gyp/gpu.gypi
index 4e29be2f83222c6ddaa16852283c8011db6b650d..5ff3062106e421c29087ecdc1823f13e32450a6f 100644
--- a/gyp/gpu.gypi
+++ b/gyp/gpu.gypi
@@ -71,6 +71,7 @@
       '<(skia_src_path)/gpu/GrBlend.cpp',
       '<(skia_src_path)/gpu/GrBlurUtils.cpp',
       '<(skia_src_path)/gpu/GrBlurUtils.h',
+      '<(skia_src_path)/gpu/GrBuffer.h',
       '<(skia_src_path)/gpu/GrBufferAllocPool.cpp',
       '<(skia_src_path)/gpu/GrBufferAllocPool.h',
       '<(skia_src_path)/gpu/GrCaps.cpp',
@@ -90,7 +91,6 @@
       '<(skia_src_path)/gpu/GrDrawTarget.cpp',
       '<(skia_src_path)/gpu/GrDrawTarget.h',
       '<(skia_src_path)/gpu/GrFragmentProcessor.cpp',
-      '<(skia_src_path)/gpu/GrGeometryBuffer.h',
       '<(skia_src_path)/gpu/GrGeometryProcessor.h',
       '<(skia_src_path)/gpu/GrGlyph.h',
       '<(skia_src_path)/gpu/GrGpu.cpp',
@@ -102,7 +102,6 @@
       '<(skia_src_path)/gpu/GrGpuFactory.h',
       '<(skia_src_path)/gpu/GrImageIDTextureAdjuster.cpp',
       '<(skia_src_path)/gpu/GrImageIDTextureAdjuster.h',
-      '<(skia_src_path)/gpu/GrIndexBuffer.h',
       '<(skia_src_path)/gpu/GrInvariantOutput.cpp',
       '<(skia_src_path)/gpu/GrLayerAtlas.cpp',
       '<(skia_src_path)/gpu/GrLayerAtlas.h',
@@ -189,9 +188,7 @@
       '<(skia_src_path)/gpu/GrTextureToYUVPlanes.cpp',
       '<(skia_src_path)/gpu/GrTextureToYUVPlanes.h',
       '<(skia_src_path)/gpu/GrTextureAccess.cpp',
-      '<(skia_src_path)/gpu/GrTransferBuffer.h',
       '<(skia_src_path)/gpu/GrTRecorder.h',
-      '<(skia_src_path)/gpu/GrVertexBuffer.h',
       '<(skia_src_path)/gpu/GrXferProcessor.cpp',
       '<(skia_src_path)/gpu/GrYUVProvider.cpp',
       '<(skia_src_path)/gpu/GrYUVProvider.h',
@@ -314,8 +311,8 @@
 
       '<(skia_src_path)/gpu/gl/GrGLAssembleInterface.cpp',
       '<(skia_src_path)/gpu/gl/GrGLAssembleInterface.h',
-      '<(skia_src_path)/gpu/gl/GrGLBufferImpl.cpp',
-      '<(skia_src_path)/gpu/gl/GrGLBufferImpl.h',
+      '<(skia_src_path)/gpu/gl/GrGLBuffer.cpp',
+      '<(skia_src_path)/gpu/gl/GrGLBuffer.h',
       '<(skia_src_path)/gpu/gl/GrGLCaps.cpp',
       '<(skia_src_path)/gpu/gl/GrGLCaps.h',
       '<(skia_src_path)/gpu/gl/GrGLContext.cpp',
@@ -329,8 +326,6 @@
       '<(skia_src_path)/gpu/gl/GrGLGpu.h',
       '<(skia_src_path)/gpu/gl/GrGLGpuProgramCache.cpp',
       '<(skia_src_path)/gpu/gl/GrGLExtensions.cpp',
-      '<(skia_src_path)/gpu/gl/GrGLIndexBuffer.cpp',
-      '<(skia_src_path)/gpu/gl/GrGLIndexBuffer.h',
       '<(skia_src_path)/gpu/gl/GrGLInterface.cpp',
       '<(skia_src_path)/gpu/gl/GrGLIRect.h',
       '<(skia_src_path)/gpu/gl/GrGLPath.cpp',
@@ -355,8 +350,6 @@
       '<(skia_src_path)/gpu/gl/GrGLTexture.h',
       '<(skia_src_path)/gpu/gl/GrGLTextureRenderTarget.cpp',
       '<(skia_src_path)/gpu/gl/GrGLTextureRenderTarget.h',
-      '<(skia_src_path)/gpu/gl/GrGLTransferBuffer.cpp',
-      '<(skia_src_path)/gpu/gl/GrGLTransferBuffer.h',
       '<(skia_src_path)/gpu/gl/GrGLUtil.cpp',
       '<(skia_src_path)/gpu/gl/GrGLUtil.h',
       '<(skia_src_path)/gpu/gl/GrGLUniformHandler.cpp',
@@ -365,8 +358,6 @@
       '<(skia_src_path)/gpu/gl/GrGLVaryingHandler.h',
       '<(skia_src_path)/gpu/gl/GrGLVertexArray.cpp',
       '<(skia_src_path)/gpu/gl/GrGLVertexArray.h',
-      '<(skia_src_path)/gpu/gl/GrGLVertexBuffer.cpp',
-      '<(skia_src_path)/gpu/gl/GrGLVertexBuffer.h',
 
       # Files for building GLSL shaders
       '<(skia_src_path)/gpu/gl/builders/GrGLProgramBuilder.cpp',