Revert of Track GL buffer state based on unique resource ID

include/gpu/GrTypesPriv.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 GrTypesPriv_DEFINED
 #define GrTypesPriv_DEFINED
 
@@ skipping 388 matching lines @@
     bool    fEnabled;
     SkIRect fRect;
 };
 
 /**
 * Indicates the type of data that a GPU buffer will be used for.
 */
 enum GrBufferType {
     kVertex_GrBufferType,
     kIndex_GrBufferType,
-    kTexel_GrBufferType,
-    kDrawIndirect_GrBufferType,
     kXferCpuToGpu_GrBufferType,
     kXferGpuToCpu_GrBufferType,
 
     kLast_GrBufferType = kXferGpuToCpu_GrBufferType
 };
-static const int kGrBufferTypeCount = kLast_GrBufferType + 1;
-
-static inline bool GrBufferTypeIsVertexOrIndex(GrBufferType type) {
-    SkASSERT(type >= 0 && type < kGrBufferTypeCount);
-    return type <= kIndex_GrBufferType;
-
-    GR_STATIC_ASSERT(0 == kVertex_GrBufferType);
-    GR_STATIC_ASSERT(1 == kIndex_GrBufferType);
-}
 
 /**
 * Provides a performance hint regarding the frequency at which a data store will be accessed.
 */
 enum GrAccessPattern {
     /** Data store will be respecified repeatedly and used many times. */
     kDynamic_GrAccessPattern,
     /** Data store will be specified once and used many times. (Thus disqualified from caching.) */
     kStatic_GrAccessPattern,
     /** Data store will be specified once and used at most a few times. (Also can't be cached.) */
     kStream_GrAccessPattern,
 
     kLast_GrAccessPattern = kStream_GrAccessPattern
 };
 
 
 #ifdef SK_DEBUG
 // Takes a pointer to a GrCaps, and will suppress prints if required
 #define GrCapsDebugf(caps, ...)         \
     if (!caps->suppressPrints()) {      \
         SkDebugf(__VA_ARGS__);          \
     }
 #else
 #define GrCapsDebugf(caps, ...)
 #endif
 
 #endif