diff options
author | 2017-02-10 11:47:58 -0500 | |
---|---|---|
committer | 2017-02-10 17:36:43 +0000 | |
commit | 2e83b13122f93a4f88d1c5471e4b4d71b446e223 (patch) | |
tree | ee53a0640f28bf23c804a0a731f2d671fb51c511 /src/core | |
parent | 6aa0e1150ecf7eb5462744a32c356a0006d63c9e (diff) |
Remove SkTextureCompressor.
This is the ultimate state of what it looks like to remove
SkTextureCompressor.
This end result will result from the following steps.
1) Remove Skia dep on ktx (done)
2) Move format over to ktx (done)
3) Remove all SkTexture compressor code
CQ_INCLUDE_TRYBOTS=skia.primary:Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-SKNX_NO_SIMD
Change-Id: I3ad7a6abbea006a3034d95662c652d6db90b86ef
Reviewed-on: https://skia-review.googlesource.com/8272
Commit-Queue: Herb Derby <herb@google.com>
Reviewed-by: Robert Phillips <robertphillips@google.com>
Reviewed-by: Leon Scroggins <scroggo@google.com>
Diffstat (limited to 'src/core')
-rw-r--r-- | src/core/SkOpts.cpp | 4 | ||||
-rw-r--r-- | src/core/SkOpts.h | 6 | ||||
-rw-r--r-- | src/core/SkOverdrawCanvas.cpp | 1 |
3 files changed, 1 insertions, 10 deletions
diff --git a/src/core/SkOpts.cpp b/src/core/SkOpts.cpp index aa8aa9772f..67bc976f26 100644 --- a/src/core/SkOpts.cpp +++ b/src/core/SkOpts.cpp @@ -45,7 +45,6 @@ #include "SkMorphologyImageFilter_opts.h" #include "SkRasterPipeline_opts.h" #include "SkSwizzler_opts.h" -#include "SkTextureCompressor_opts.h" #include "SkXfermode_opts.h" namespace SkOpts { @@ -65,9 +64,6 @@ namespace SkOpts { DEFINE_DEFAULT( erode_x); DEFINE_DEFAULT( erode_y); - DEFINE_DEFAULT(texture_compressor); - DEFINE_DEFAULT(fill_block_dimensions); - DEFINE_DEFAULT(blit_mask_d32_a8); DEFINE_DEFAULT(blit_row_color32); diff --git a/src/core/SkOpts.h b/src/core/SkOpts.h index 6f8279286a..7dd3a6331c 100644 --- a/src/core/SkOpts.h +++ b/src/core/SkOpts.h @@ -10,7 +10,6 @@ #include "SkConvolver.h" #include "SkRasterPipeline.h" -#include "SkTextureCompressor.h" #include "SkTypes.h" #include "SkXfermodePriv.h" #include <functional> @@ -34,11 +33,6 @@ namespace SkOpts { typedef void (*Morph)(const SkPMColor*, SkPMColor*, int, int, int, int, int); extern Morph dilate_x, dilate_y, erode_x, erode_y; - typedef bool (*TextureCompressor)(uint8_t* dst, const uint8_t* src, - int width, int height, size_t rowBytes); - extern TextureCompressor (*texture_compressor)(SkColorType, SkTextureCompressor::Format); - extern bool (*fill_block_dimensions)(SkTextureCompressor::Format, int* x, int* y); - extern void (*blit_mask_d32_a8)(SkPMColor*, size_t, const SkAlpha*, size_t, SkColor, int, int); extern void (*blit_row_color32)(SkPMColor*, const SkPMColor*, int, SkPMColor); extern void (*blit_row_s32a_opaque)(SkPMColor*, const SkPMColor*, int, U8CPU); diff --git a/src/core/SkOverdrawCanvas.cpp b/src/core/SkOverdrawCanvas.cpp index b51479600a..c6b7b9c9cf 100644 --- a/src/core/SkOverdrawCanvas.cpp +++ b/src/core/SkOverdrawCanvas.cpp @@ -8,6 +8,7 @@ #include "SkColorFilter.h" #include "SkDrawable.h" #include "SkFindAndPlaceGlyph.h" +#include "SkImagePriv.h" #include "SkLatticeIter.h" #include "SkOverdrawCanvas.h" #include "SkPatchUtils.h" |