5 files changed, 0 insertions, 77 deletions

diff --git a/include/gpu/GrTypes.h b/include/gpu/GrTypes.h
index 5868a39e7d..c1b3554c6e 100644
--- a/include/gpu/GrTypes.h
+++ b/include/gpu/GrTypes.h
@@ -620,20 +620,6 @@ enum GrGLBackendState {
 };
 
 /**
- * The compressed texture formats that may be supported by the renderer.
- * Make sure to check for the required capabilities using
- * GrDrawTargetCaps::compressedTextureSupport
- */
-enum GrCompressedFormat {
-    kETC1_GrCompressedFormat,
-    kETC2_GrCompressedFormat,
-    kDXT1_GrCompressedFormat,
-
-    kLast_GrCompressedFormat = kDXT1_GrCompressedFormat
-};
-static const int kGrCompressedFormatCount = kLast_GrCompressedFormat + 1;
-
-/**
  * This value translates to reseting all the context state for any backend.
  */
 static const uint32_t kAll_GrBackendState = 0xffffffff;
diff --git a/src/gpu/GrDrawTarget.cpp b/src/gpu/GrDrawTarget.cpp
index a5b6ac6f03..6d8d18463a 100644
--- a/src/gpu/GrDrawTarget.cpp
+++ b/src/gpu/GrDrawTarget.cpp
@@ -1029,7 +1029,6 @@ void GrDrawTargetCaps::reset() {
     fMaxSampleCount = 0;
 
     memset(fConfigRenderSupport, 0, sizeof(fConfigRenderSupport));
-    memset(fCompressedFormatSupport, 0, sizeof(fCompressedFormatSupport));
 }
 
 GrDrawTargetCaps& GrDrawTargetCaps::operator=(const GrDrawTargetCaps& other) {
@@ -1055,8 +1054,6 @@ GrDrawTargetCaps& GrDrawTargetCaps::operator=(const GrDrawTargetCaps& other) {
     fMaxSampleCount = other.fMaxSampleCount;
 
     memcpy(fConfigRenderSupport, other.fConfigRenderSupport, sizeof(fConfigRenderSupport));
-    memcpy(fCompressedFormatSupport, other.fCompressedFormatSupport,
-	   sizeof(fCompressedFormatSupport));
 
     return *this;
 }
@@ -1132,22 +1129,5 @@ SkString GrDrawTargetCaps::dump() const {
                      gNY[fConfigRenderSupport[i][1]]);
         }
     }
-
-    static const char* kCompressedFormatNames[] = {
-        "ETC1",  // kETC1_GrCompressedFormat
-        "ETC2",  // kETC2_GrCompressedFormat,
-        "DXT1",  // kDXT1_GrCompressedFormat,
-    };
-    GR_STATIC_ASSERT(0 == kETC1_GrCompressedFormat);
-    GR_STATIC_ASSERT(1 == kETC2_GrCompressedFormat);
-    GR_STATIC_ASSERT(2 == kDXT1_GrCompressedFormat);
-    GR_STATIC_ASSERT(SK_ARRAY_COUNT(kCompressedFormatNames) == kGrCompressedFormatCount);
-
-    for (size_t i = 0; i < SK_ARRAY_COUNT(kCompressedFormatNames); ++i) {
-        r.appendf("%s Compressed Texture Support: %s\n",
-		  kCompressedFormatNames[i],
-		  gNY[fCompressedFormatSupport[i]]);
-    }
-
     return r;
 }
diff --git a/src/gpu/GrDrawTargetCaps.h b/src/gpu/GrDrawTargetCaps.h
index db2b090512..648b5c36be 100644
--- a/src/gpu/GrDrawTargetCaps.h
+++ b/src/gpu/GrDrawTargetCaps.h
@@ -72,11 +72,6 @@ public:
         return fConfigRenderSupport[config][withMSAA];
     }
 
-    bool compressedTextureSupport(GrCompressedFormat format) const {
-        SkASSERT(kGrCompressedFormatCount > format);
-        return fCompressedFormatSupport[format];
-    }
-
 protected:
     bool f8BitPaletteSupport        : 1;
     bool fNPOTTextureTileSupport    : 1;
@@ -102,8 +97,6 @@ protected:
     // The first entry for each config is without msaa and the second is with.
     bool fConfigRenderSupport[kGrPixelConfigCnt][2];
 
-    bool fCompressedFormatSupport[kGrCompressedFormatCount];
-
     typedef SkRefCnt INHERITED;
 };
 
diff --git a/src/gpu/gl/GrGLCaps.cpp b/src/gpu/gl/GrGLCaps.cpp
index 6523e03233..f577e9d740 100644
--- a/src/gpu/gl/GrGLCaps.cpp
+++ b/src/gpu/gl/GrGLCaps.cpp
@@ -369,8 +369,6 @@ bool GrGLCaps::init(const GrGLContextInfo& ctxInfo, const GrGLInterface* gli) {
 
     this->initConfigRenderableTable(ctxInfo);
 
-    this->initCompressedTextureSupport(ctxInfo);
-
     return true;
 }
 
@@ -460,38 +458,6 @@ void GrGLCaps::initConfigRenderableTable(const GrGLContextInfo& ctxInfo) {
     }
 }
 
-void GrGLCaps::initCompressedTextureSupport(const GrGLContextInfo &ctxInfo) {
-    GrGLStandard standard = ctxInfo.standard();
-    GrGLVersion version = ctxInfo.version();
-
-    // glCompressedTexImage2D is available on all OpenGL ES devices...
-    // however, it is only available on standard OpenGL after version 1.3
-    if (kGL_GrGLStandard == standard && version < GR_GL_VER(1, 3)) {
-        return;
-    }
-
-    // Check for ETC1
-    bool hasETC1 = false;
-
-    // First check version for support
-    if (kGL_GrGLStandard == standard) {
-        hasETC1 =
-            version >= GR_GL_VER(4, 3) ||
-            ctxInfo.hasExtension("GL_ARB_ES3_compatibility");
-    } else {
-        hasETC1 =
-            version >= GR_GL_VER(3, 0) ||
-            ctxInfo.hasExtension("GL_OES_compressed_ETC1_RGB8_texture") ||
-            // ETC2 is a superset of ETC1, so we can just check for that, too.
-            (ctxInfo.hasExtension("GL_OES_compressed_ETC2_RGB8_texture") &&
-             ctxInfo.hasExtension("GL_OES_compressed_ETC2_RGBA8_texture"));
-    }
-    fCompressedFormatSupport[kETC1_GrCompressedFormat] = hasETC1;
-
-    fCompressedFormatSupport[kETC2_GrCompressedFormat] = false;
-    fCompressedFormatSupport[kDXT1_GrCompressedFormat] = false;
-}
-
 bool GrGLCaps::readPixelsSupported(const GrGLInterface* intf,
                                    GrGLenum format,
                                    GrGLenum type) const {
diff --git a/src/gpu/gl/GrGLCaps.h b/src/gpu/gl/GrGLCaps.h
index c2d808e4a5..ea0f41245d 100644
--- a/src/gpu/gl/GrGLCaps.h
+++ b/src/gpu/gl/GrGLCaps.h
@@ -313,8 +313,6 @@ private:
     // This must be called after initFSAASupport().
     void initConfigRenderableTable(const GrGLContextInfo&);
 
-    void initCompressedTextureSupport(const GrGLContextInfo &);
-
     // tracks configs that have been verified to pass the FBO completeness when
     // used as a color attachment
     VerifiedColorConfigs fVerifiedColorConfigs;