diff options
| author |  reed <reed@chromium.org> | 2014-12-21 11:52:15 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-12-21 11:52:15 -0800 |
| commit | f65f0b92f53c34096a4824a87877d2427a8c6e7d (patch) | |
| tree | 10c44fdab2d6ea32e121f8054c9f3724c72601c1 | |
| parent | f7430ccfc0e7b445a44b840c1453c9ef5988a656 (diff) | |
remove dead SK_SUPPORT_LEGACY_GRTYPES dead
BUG=skia:
TBR=bsalomon@google.com
Review URL: https://codereview.chromium.org/823503002
| -rw-r--r-- | include/gpu/GrTypes.h | 39 |
1 files changed, 0 insertions, 39 deletions
diff --git a/include/gpu/GrTypes.h b/include/gpu/GrTypes.h index 4e225f0cb9..434d929f1f 100644 --- a/include/gpu/GrTypes.h +++ b/include/gpu/GrTypes.h @@ -13,8 +13,6 @@ #include "GrConfig.h" #include "SkMath.h" -//#define SK_SUPPORT_LEGACY_GRTYPES - //////////////////////////////////////////////////////////////////////////////// /** @@ -50,43 +48,6 @@ friend X operator & (X a, T b); \ //////////////////////////////////////////////////////////////////////////////// -#ifdef SK_SUPPORT_LEGACY_GRTYPES - -/** - * Macro to round n up to the next multiple of 4, or return it unchanged if - * n is already a multiple of 4 - */ -#define GrALIGN4(n) SkAlign4(n) -#define GrIsALIGN4(n) SkIsAlign4(n) - -template <typename T> const T& GrMin(const T& a, const T& b) { - return (a < b) ? a : b; -} - -template <typename T> const T& GrMax(const T& a, const T& b) { - return (b < a) ? a : b; -} - -/** - * 16.16 fixed point type - */ -typedef int32_t GrFixed; - -#ifdef SK_DEBUG - -static inline int16_t GrToS16(intptr_t x) { - SkASSERT((int16_t)x == x); - return (int16_t)x; -} - -#else - -#define GrToS16(x) x - -#endif - -#endif - // compile time versions of min/max #define GR_CT_MAX(a, b) (((b) < (a)) ? (a) : (b)) #define GR_CT_MIN(a, b) (((b) < (a)) ? (b) : (a)) |