diff --git a/src/core/SkBitmapProcState.cpp b/src/core/SkBitmapProcState.cpp index 6299ed2b56..8d5e1a8881 100644 --- a/src/core/SkBitmapProcState.cpp +++ b/src/core/SkBitmapProcState.cpp @@ -161,7 +161,6 @@ bool SkBitmapProcState::chooseProcs() { fAlphaScale = SkAlpha255To256(SkColorGetA(fPaintColor)); fShaderProc32 = nullptr; - fShaderProc16 = nullptr; fSampleProc32 = nullptr; const bool trivialMatrix = (fInvMatrix.getType() & ~SkMatrix::kTranslate_Mask) == 0; diff --git a/src/core/SkBitmapProcState.h b/src/core/SkBitmapProcState.h index 7d16ba6686..bcc5da3187 100644 --- a/src/core/SkBitmapProcState.h +++ b/src/core/SkBitmapProcState.h @@ -64,8 +64,6 @@ struct SkBitmapProcState : public SkBitmapProcInfo { typedef void (*ShaderProc32)(const void* ctx, int x, int y, SkPMColor[], int count); - typedef void (*ShaderProc16)(const void* ctx, int x, int y, uint16_t[], int count); - typedef void (*MatrixProc)(const SkBitmapProcState&, uint32_t bitmapXY[], int count, @@ -98,10 +96,8 @@ struct SkBitmapProcState : public SkBitmapProcInfo { following fields: fShaderProc32 - fShaderProc16 fMatrixProc fSampleProc32 - fSampleProc32 They will already have valid function pointers, so a platform that does not have an accelerated version can just leave that field as is. A valid @@ -123,7 +119,6 @@ struct SkBitmapProcState : public SkBitmapProcInfo { // If a shader proc is present, then the corresponding matrix/sample procs // are ignored ShaderProc32 getShaderProc32() const { return fShaderProc32; } - ShaderProc16 getShaderProc16() const { return fShaderProc16; } #ifdef SK_DEBUG MatrixProc getMatrixProc() const; @@ -134,7 +129,6 @@ struct SkBitmapProcState : public SkBitmapProcInfo { private: ShaderProc32 fShaderProc32; // chooseProcs - ShaderProc16 fShaderProc16; // chooseProcs // These are used if the shaderproc is nullptr MatrixProc fMatrixProc; // chooseProcs SampleProc32 fSampleProc32; // chooseProcs diff --git a/src/opts/SkBitmapProcState_opts_none.cpp b/src/opts/SkBitmapProcState_opts_none.cpp index 1d83ddfe7c..9b3c7b6f72 100644 --- a/src/opts/SkBitmapProcState_opts_none.cpp +++ b/src/opts/SkBitmapProcState_opts_none.cpp @@ -13,10 +13,8 @@ current state (e.g. fBitmap, fInvMatrix, etc.) fShaderProc32 - fShaderProc16 fMatrixProc fSampleProc32 - fSampleProc32 */ // empty implementation just uses default supplied function pointers