remove dead SK_SUPPORT_LEGACY_GRTYPES dead

include/gpu/GrTypes.h

 
 /*
  * Copyright 2010 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef GrTypes_DEFINED
 #define GrTypes_DEFINED
 
 #include "SkTypes.h"
 #include "GrConfig.h"
 #include "SkMath.h"
 
-//#define SK_SUPPORT_LEGACY_GRTYPES
-
 ////////////////////////////////////////////////////////////////////////////////
 
 /**
  * Defines overloaded bitwise operators to make it easier to use an enum as a
  * bitfield.
  */
 #define GR_MAKE_BITFIELD_OPS(X) \
     inline X operator | (X a, X b) { \
         return (X) (+a | +b); \
     } \
@@ skipping 15 matching lines @@
     \
     friend X operator & (X a, X b); \
     \
     template <typename T> \
     friend X operator & (T a, X b); \
     \
     template <typename T> \
     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))
 
 /**
  *  divide, rounding up
  */
 static inline int32_t GrIDivRoundUp(int x, int y) {
     SkASSERT(y > 0);
     return (x + (y-1)) / y;
@@ skipping 623 matching lines @@
 public:
     GrAutoMalloc() : INHERITED() {}
     explicit GrAutoMalloc(size_t size) : INHERITED(size) {}
     virtual ~GrAutoMalloc() {}
 private:
     typedef GrAutoMallocBaseType INHERITED;
 };
 
 #undef GrAutoMallocBaseType
 #endif