AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove last use of ktx.h

Browse Source 
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>
This commit is contained in:
Herb Derby 2017-02-09 12:24:55 -05:00 committed by Skia Commit-Bot
parent 92d20a090a
commit cf1bff945b
1 changed files with 0 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/gpu/SkGr.cpp
View File

@ -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;