commit db558dde227ee3c45fd654af6cd3071c1fa6aeb6
author bsalomon <bsalomon@google.com> Fri Jan 23 13:19:00 2015 -0800
committer Commit bot <commit-bot@chromium.org> Fri Jan 23 13:19:00 2015 -0800
tree f177eb76bbe1131a522cbd744493bc5d0458e815
parent 63c992f6c05ea728b5386de61d279f10eb7e08d9

Zap the scratch key on non-RT textures when scratch textures are disabled.

Review URL: https://codereview.chromium.org/870103002

src/gpu/GrGpu.cpp

diff --git a/src/gpu/GrGpu.cpp b/src/gpu/GrGpu.cpp
index f523632..b7a064c 100644
--- a/src/gpu/GrGpu.cpp
+++ b/src/gpu/GrGpu.cpp
@@ -40,8 +40,8 @@
         return NULL;
     }
 
-    if ((desc.fFlags & kRenderTarget_GrSurfaceFlag) &&
-        !this->caps()->isConfigRenderable(desc.fConfig, desc.fSampleCnt > 0)) {
+    bool isRT = SkToBool(desc.fFlags & kRenderTarget_GrSurfaceFlag);
+    if (isRT && !this->caps()->isConfigRenderable(desc.fConfig, desc.fSampleCnt > 0)) {
         return NULL;
     }
 
@@ -71,6 +71,9 @@
             }
         }
     }
+    if (!this->caps()->reuseScratchTextures() && !isRT) {
+        tex->cacheAccess().removeScratchKey();
+    }
     return tex;
 }