Remove compressed (ETC1) texture support from Ganesh (take 2)

Reland of https://skia-review.googlesource.com/c/17456/ (Remove compressed (ETC1) texture support from Ganesh) but w/o removing third_part\etc1 files

TBR=bsalomon@google.com
Change-Id: I8ec4b7e3ddf47d213cb24c382731c050ffb8847f
Reviewed-on: https://skia-review.googlesource.com/17700
Reviewed-by: Robert Phillips <robertphillips@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>

1 files changed, 7 insertions, 9 deletions

diff --git a/src/gpu/GrTexture.cpp b/src/gpu/GrTexture.cpp
index cbab5f0f60..064cc0a22b 100644
--- a/src/gpu/GrTexture.cpp
+++ b/src/gpu/GrTexture.cpp
@@ -76,16 +76,14 @@ GrTexture::GrTexture(GrGpu* gpu, const GrSurfaceDesc& desc, GrSLType samplerType
 }
 
 void GrTexture::computeScratchKey(GrScratchKey* key) const {
-    if (!GrPixelConfigIsCompressed(this->config())) {
-        const GrRenderTarget* rt = this->asRenderTarget();
-        int sampleCount = 0;
-        if (rt) {
-            sampleCount = rt->numStencilSamples();
-        }
-        GrTexturePriv::ComputeScratchKey(this->config(), this->width(), this->height(),
-                                         this->origin(), SkToBool(rt), sampleCount,
-                                         this->texturePriv().hasMipMaps(), key);
+    const GrRenderTarget* rt = this->asRenderTarget();
+    int sampleCount = 0;
+    if (rt) {
+        sampleCount = rt->numStencilSamples();
     }
+    GrTexturePriv::ComputeScratchKey(this->config(), this->width(), this->height(),
+                                     this->origin(), SkToBool(rt), sampleCount,
+                                     this->texturePriv().hasMipMaps(), key);
 }
 
 void GrTexturePriv::ComputeScratchKey(GrPixelConfig config, int width, int height,