diff options
| author |  reed@android.com <reed@android.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2009-07-22 17:11:41 +0000 |
|---|---|---|
| committer | reed@android.com <reed@android.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2009-07-22 17:11:41 +0000 |
| commit | 01f82da73b38cdaaebf8862b4cb0bc636a52f78a (patch) | |
| tree | edcae0f5816172d9c4581036c4b2eda449359b96 /src/core/SkBitmapProcState_shaderproc.h | |
| parent | 9da1ae3f35a6f25adf4f58ae2589129ceec6d11b (diff) | |
remove crufty #undefs
git-svn-id: http://skia.googlecode.com/svn/trunk@281 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/core/SkBitmapProcState_shaderproc.h')
| -rw-r--r-- | src/core/SkBitmapProcState_shaderproc.h | 26 |
1 files changed, 5 insertions, 21 deletions
diff --git a/src/core/SkBitmapProcState_shaderproc.h b/src/core/SkBitmapProcState_shaderproc.h index ded06c60c1..070a62bf90 100644 --- a/src/core/SkBitmapProcState_shaderproc.h +++ b/src/core/SkBitmapProcState_shaderproc.h @@ -1,14 +1,5 @@ #define SCALE_FILTER_NAME MAKENAME(_filter_DX_shaderproc) -#ifndef PREAMBLE - #define PREAMBLE(state) - #define PREAMBLE_PARAM_X - #define PREAMBLE_PARAM_Y - #define PREAMBLE_ARG_X - #define PREAMBLE_ARG_Y -#endif - - static void SCALE_FILTER_NAME(const SkBitmapProcState& s, int x, int y, DSTTYPE* SK_RESTRICT colors, int count) { SkASSERT((s.fInvType & ~(SkMatrix::kTranslate_Mask | @@ -18,8 +9,6 @@ static void SCALE_FILTER_NAME(const SkBitmapProcState& s, int x, int y, SkASSERT(s.fDoFilter); SkDEBUGCODE(CHECKSTATE(s);) - PREAMBLE(s); - const unsigned maxX = s.fBitmap->width() - 1; const SkFixed oneX = s.fFilterOneX; const SkFixed dx = s.fInvSx; @@ -65,20 +54,15 @@ static void SCALE_FILTER_NAME(const SkBitmapProcState& s, int x, int y, /////////////////////////////////////////////////////////////////////////////// -#undef MAKENAME #undef TILEX_PROCF #undef TILEY_PROCF #undef TILEX_LOW_BITS #undef TILEY_LOW_BITS +#undef MAKENAME +#undef SRCTYPE #undef DSTTYPE -#ifdef CHECK_FOR_DECAL - #undef CHECK_FOR_DECAL -#endif +#undef CHECKSTATE +#undef SRC_TO_FILTER +#undef FILTER_TO_DST #undef SCALE_FILTER_NAME - -#undef PREAMBLE -#undef PREAMBLE_PARAM_X -#undef PREAMBLE_PARAM_Y -#undef PREAMBLE_ARG_X -#undef PREAMBLE_ARG_Y |