commit 40a1e11ebebe81586f3fec96408fdfd4b51123d2
author krajcevski <krajcevski@google.com> Tue Aug 05 14:13:36 2014 -0700
committer Commit bot <commit-bot@chromium.org> Tue Aug 05 14:13:36 2014 -0700
tree c2174293e43c71dd1d7de3d3568a4dc965f9e462
parent 07544757c9fcf0f359f1686a3779eb2e75dd5b36

Add support for all compressed formats in KTX file format

R=robertphillips@google.com

Author: krajcevski@google.com

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

src/gpu/SkGr.cpp

diff --git a/src/gpu/SkGr.cpp b/src/gpu/SkGr.cpp
index 5c0464d..0a45100 100644
--- a/src/gpu/SkGr.cpp
+++ b/src/gpu/SkGr.cpp
@@ -11,6 +11,7 @@
 #include "SkData.h"
 #include "SkMessageBus.h"
 #include "SkPixelRef.h"
+#include "SkTextureCompressor.h"
 #include "GrResourceCache.h"
 #include "GrGpu.h"
 #include "effects/GrDitherEffect.h"
@@ -165,7 +166,7 @@
         SkKTXFile ktx(data);
 
         // Is it actually an ETC1 texture?
-        if (!ktx.isETC1()) {
+        if (!ktx.isCompressedFormat(SkTextureCompressor::kETC1_Format)) {
             return NULL;
         }