aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorGravatar Herb Derby <herb@google.com>2017-02-09 12:24:55 -0500
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2017-02-09 18:19:25 +0000
commitcf1bff945b70bdcbe9243c22760d4e1fee4523cb (patch)
treea94635b5c3cfb2214f8d88871a99faa064a26965 /src
parent92d20a090a0631c02fcbe1debdd7e1cf7b64e600 (diff)
Remove last use of ktx.h
If this breaks something in Google3, revert it. Change-Id: Id719a87b6ca95c41d06f44f05ee1fdd430d4e0a2 Reviewed-on: https://skia-review.googlesource.com/8262 Commit-Queue: Herb Derby <herb@google.com> Reviewed-by: Robert Phillips <robertphillips@google.com> Reviewed-by: Leon Scroggins <scroggo@google.com> Reviewed-by: Matt Sarett <msarett@google.com>
Diffstat (limited to 'src')
-rw-r--r--src/gpu/SkGr.cpp17
1 files changed, 0 insertions, 17 deletions
diff --git a/src/gpu/SkGr.cpp b/src/gpu/SkGr.cpp
index 0dbe57758b..14379d5f8f 100644
--- a/src/gpu/SkGr.cpp
+++ b/src/gpu/SkGr.cpp
@@ -39,7 +39,6 @@
#include "effects/GrXfermodeFragmentProcessor.h"
#ifndef SK_IGNORE_ETC1_SUPPORT
-# include "ktx.h"
# include "etc1.h"
#endif
@@ -87,22 +86,6 @@ GrPixelConfig GrIsCompressedTextureDataSupported(GrContext* ctx, SkData* data,
*outStartOfDataToUpload = bytes + ETC_PKM_HEADER_SIZE;
return kETC1_GrPixelConfig;
- } else if (SkKTXFile::is_ktx(bytes, data->size())) {
- SkKTXFile ktx(data);
-
- // Is it actually an ETC1 texture?
- if (!ktx.isCompressedFormat(SkTextureCompressor::kETC1_Format)) {
- return kUnknown_GrPixelConfig;
- }
-
- // Does the data match the dimensions of the bitmap? If not,
- // then we don't know how to scale the image to match it...
- if (ktx.width() != expectedW || ktx.height() != expectedH) {
- return kUnknown_GrPixelConfig;
- }
-
- *outStartOfDataToUpload = ktx.pixelData();
- return kETC1_GrPixelConfig;
}
#endif
return kUnknown_GrPixelConfig;