commit | 92098e691f10a010e7421125ba4d44c02506bb55 | [log] [tgz] |
---|---|---|
author | erikchen <erikchen@chromium.org> | Thu Feb 04 12:03:07 2016 -0800 |
committer | Commit bot <commit-bot@chromium.org> | Thu Feb 04 12:03:08 2016 -0800 |
tree | d21c2a5640f1b88dfa0094e57bcd0d9da2f3e2f9 | |
parent | f7cdb06d62bd732599c7ee407dfd76d32d671755 [diff] [blame] |
skia: Add support for CHROMIUM_image backed textures. I created a new abstract base class TextureStorageAllocator that consumers of Skia can subclass and pass back to Skia. When a surface is created with a pointer to a TextureStorageAllocator, any textures it creates, or that are derived from the original surface, will allocate and deallocate storage using the methods on TextureStorageAllocator. BUG=https://code.google.com/p/chromium/issues/detail?id=579664 GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1623653002 Review URL: https://codereview.chromium.org/1623653002
diff --git a/src/gpu/GrTexture.cpp b/src/gpu/GrTexture.cpp index 249fe98..fe5b2c3 100644 --- a/src/gpu/GrTexture.cpp +++ b/src/gpu/GrTexture.cpp
@@ -85,7 +85,8 @@ : INHERITED(gpu, lifeCycle, desc) , fMipMapsStatus(kNotAllocated_MipMapsStatus) { - if (!this->isExternal() && !GrPixelConfigIsCompressed(desc.fConfig)) { + if (!this->isExternal() && !GrPixelConfigIsCompressed(desc.fConfig) && + !desc.fTextureStorageAllocator.fAllocateTextureStorage) { GrScratchKey key; GrTexturePriv::ComputeScratchKey(desc, &key); this->setScratchKey(key);