Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(334)

Unified Diff: include/gpu/GrTypes.h

Issue 823503002: remove dead SK_SUPPORT_LEGACY_GRTYPES dead (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 6 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: include/gpu/GrTypes.h
diff --git a/include/gpu/GrTypes.h b/include/gpu/GrTypes.h
index 4e225f0cb997f43738aa5a38e6100f6201ce75d5..434d929f1f56552ccf9b4cece032d3732fc8b245 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))
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698