diff --git a/include/gpu/GrContext.h b/include/gpu/GrContext.h index ca5f62af72..4a82537c80 100644 --- a/include/gpu/GrContext.h +++ b/include/gpu/GrContext.h @@ -122,10 +122,6 @@ public: * video memory that can be held in the cache. */ void getResourceCacheLimits(int* maxResources, size_t* maxResourceBytes) const; - SK_ATTR_DEPRECATED("This function has been renamed to getResourceCacheLimits().") - void getTextureCacheLimits(int* maxTextures, size_t* maxTextureBytes) const { - this->getResourceCacheLimits(maxTextures, maxTextureBytes); - } /** * Gets the current GPU resource cache usage. @@ -137,20 +133,6 @@ public: */ void getResourceCacheUsage(int* resourceCount, size_t* resourceBytes) const; - SK_ATTR_DEPRECATED("Use getResourceCacheUsage().") - size_t getGpuTextureCacheBytes() const { - size_t bytes; - this->getResourceCacheUsage(NULL, &bytes); - return bytes; - } - - SK_ATTR_DEPRECATED("Use getResourceCacheUsage().") - int getGpuTextureCacheResourceCount() const { - int count; - this->getResourceCacheUsage(&count, NULL); - return count; - } - /** * Specify the GPU resource cache limits. If the current cache exceeds either * of these, it will be purged (LRU) to keep the cache within these limits. @@ -161,10 +143,6 @@ public: * that can be held in the cache. */ void setResourceCacheLimits(int maxResources, size_t maxResourceBytes); - SK_ATTR_DEPRECATED("This function has been renamed to setResourceCacheLimits().") - void setTextureCacheLimits(int maxTextures, size_t maxTextureBytes) { - this->setResourceCacheLimits(maxTextures, maxTextureBytes); - } /** * Frees GPU created by the context. Can be called to reduce GPU memory diff --git a/include/gpu/GrTexture.h b/include/gpu/GrTexture.h index 28c3fd5cde..d02382981d 100644 --- a/include/gpu/GrTexture.h +++ b/include/gpu/GrTexture.h @@ -42,23 +42,6 @@ public: */ virtual void textureParamsModified() = 0; - /** - * Informational texture flags. This will be removed soon. - */ - enum FlagBits { - kFirstBit = (kLastPublic_GrTextureFlagBit << 1), - - /** - * This texture should be returned to the texture cache when - * it is no longer reffed - */ - kReturnToCache_FlagBit = kFirstBit, - }; - - void resetFlag(GrTextureFlags flags) { - fDesc.fFlags = fDesc.fFlags & ~flags; - } - #ifdef SK_DEBUG void validate() const { this->INHERITED::validate(); diff --git a/include/gpu/GrTypes.h b/include/gpu/GrTypes.h index 1f5f9179b9..e9c5db00ea 100644 --- a/include/gpu/GrTypes.h +++ b/include/gpu/GrTypes.h @@ -444,9 +444,6 @@ enum GrTextureFlags { * should be verified. */ kCheckAllocation_GrTextureFlagBit = 0x8, - - kDummy_GrTextureFlagBit, - kLastPublic_GrTextureFlagBit = kDummy_GrTextureFlagBit-1, }; GR_MAKE_BITFIELD_OPS(GrTextureFlags) diff --git a/src/gpu/GrTexture.cpp b/src/gpu/GrTexture.cpp index 9c73394e95..8af5b8f128 100644 --- a/src/gpu/GrTexture.cpp +++ b/src/gpu/GrTexture.cpp @@ -54,7 +54,7 @@ size_t GrTexture::gpuMemorySize() const { } void GrTexture::onRelease() { - SkASSERT(!this->texturePriv().isSetFlag((GrTextureFlags) kReturnToCache_FlagBit)); + INHERITED::onRelease(); }