diff options
author | bsalomon <bsalomon@google.com> | 2014-10-23 07:41:29 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2014-10-23 07:41:29 -0700 |
commit | 26979c826048a5d62c64c9c907dbb579f28f7709 (patch) | |
tree | 106330d3897a81c1ca4891c36186c7e0480c68f0 /include/gpu | |
parent | c20386e3937d3d398ac9b35f9c7d997e972ade98 (diff) |
Revert of Delete unused method aliases and texture flag. (patchset #1 id:1 of https://codereview.chromium.org/672753002/)
Reason for revert:
Need to remove one more reference to this in blink before relanding.
Original issue's description:
> Delete unused method aliases and texture flag.
>
> Committed: https://skia.googlesource.com/skia/+/7fdffe41494cbd78a8ee2a6ef0509e46ec77039f
TBR=robertphillips@google.com
NOTREECHECKS=true
NOTRY=true
Review URL: https://codereview.chromium.org/671203002
Diffstat (limited to 'include/gpu')
-rw-r--r-- | include/gpu/GrContext.h | 22 | ||||
-rw-r--r-- | include/gpu/GrTexture.h | 17 | ||||
-rw-r--r-- | include/gpu/GrTypes.h | 3 |
3 files changed, 42 insertions, 0 deletions
diff --git a/include/gpu/GrContext.h b/include/gpu/GrContext.h index 4a82537c80..ca5f62af72 100644 --- a/include/gpu/GrContext.h +++ b/include/gpu/GrContext.h @@ -122,6 +122,10 @@ 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. @@ -133,6 +137,20 @@ 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. @@ -143,6 +161,10 @@ 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 d02382981d..28c3fd5cde 100644 --- a/include/gpu/GrTexture.h +++ b/include/gpu/GrTexture.h @@ -42,6 +42,23 @@ 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 e9c5db00ea..1f5f9179b9 100644 --- a/include/gpu/GrTypes.h +++ b/include/gpu/GrTypes.h @@ -444,6 +444,9 @@ enum GrTextureFlags { * should be verified. */ kCheckAllocation_GrTextureFlagBit = 0x8, + + kDummy_GrTextureFlagBit, + kLastPublic_GrTextureFlagBit = kDummy_GrTextureFlagBit-1, }; GR_MAKE_BITFIELD_OPS(GrTextureFlags) |