Index: src/opts/SkBitmapProcState_opts_arm.cpp |
diff --git a/src/opts/SkBitmapProcState_opts_arm.cpp b/src/opts/SkBitmapProcState_opts_arm.cpp |
index e044ad812947dec52a67e7950a011fcc9bde753d..99da0da24ab165843778513be203d641fd7bb0f7 100644 |
--- a/src/opts/SkBitmapProcState_opts_arm.cpp |
+++ b/src/opts/SkBitmapProcState_opts_arm.cpp |
@@ -23,7 +23,7 @@ void SI8_D16_nofilter_DX_arm(const SkBitmapProcState& s, |
int count, uint16_t* SK_RESTRICT colors) { |
SkASSERT(count > 0 && colors != NULL); |
SkASSERT(s.fInvType <= (SkMatrix::kTranslate_Mask | SkMatrix::kScale_Mask)); |
- SkASSERT(s.fDoFilter == false); |
+ SkASSERT(SkBitmapProcState::kNone_BitmapFilter == s.fFilterQuality); |
const uint16_t* SK_RESTRICT table = s.fBitmap->getColorTable()->lock16BitCache(); |
const uint8_t* SK_RESTRICT srcAddr = (const uint8_t*)s.fBitmap->getPixels(); |
@@ -114,7 +114,7 @@ void SI8_opaque_D32_nofilter_DX_arm(const SkBitmapProcState& s, |
int count, SkPMColor* SK_RESTRICT colors) { |
SkASSERT(count > 0 && colors != NULL); |
SkASSERT(s.fInvType <= (SkMatrix::kTranslate_Mask | SkMatrix::kScale_Mask)); |
- SkASSERT(s.fDoFilter == false); |
+ SkASSERT(SkBitmapProcState::kNone_BitmapFilter == s.fFilterQuality); |
const SkPMColor* SK_RESTRICT table = s.fBitmap->getColorTable()->lockColors(); |
const uint8_t* SK_RESTRICT srcAddr = (const uint8_t*)s.fBitmap->getPixels(); |
@@ -190,7 +190,6 @@ void SI8_opaque_D32_nofilter_DX_arm(const SkBitmapProcState& s, |
otherwise the shader won't even look at the matrix/sampler |
*/ |
void SkBitmapProcState::platformProcs() { |
- bool doFilter = fDoFilter; |
bool isOpaque = 256 == fAlphaScale; |
bool justDx = false; |
@@ -201,7 +200,7 @@ void SkBitmapProcState::platformProcs() { |
switch (fBitmap->config()) { |
case SkBitmap::kIndex8_Config: |
#if SK_ARM_ARCH >= 6 && !defined(SK_CPU_BENDIAN) |
- if (justDx && !doFilter) { |
+ if (justDx && kNone_BitmapFilter == fFilterQuality) { |
#if 0 /* crashing on android device */ |
fSampleProc16 = SI8_D16_nofilter_DX_arm; |
fShaderProc16 = NULL; |