Chromium Code Reviews| Index: include/gpu/GrConfig.h |
| diff --git a/include/gpu/GrConfig.h b/include/gpu/GrConfig.h |
| index df53fa2cebbfe1995986b8f367ecf2e7849fc87d..a6828a75b2ca13697251f56ae3c4e73d59b07dd7 100644 |
| --- a/include/gpu/GrConfig.h |
| +++ b/include/gpu/GrConfig.h |
| @@ -85,26 +85,12 @@ |
| #endif |
| #endif |
| -// we need both GR_DEBUG and GR_RELEASE to be defined as 0 or 1 |
| -// |
| -#ifndef GR_DEBUG |
| - #ifdef GR_RELEASE |
| - #define GR_DEBUG !GR_RELEASE |
| - #else |
| - #ifdef NDEBUG |
| - #define GR_DEBUG 0 |
| - #else |
| - #define GR_DEBUG 1 |
| - #endif |
| - #endif |
| -#endif |
| - |
| #ifndef GR_RELEASE |
| - #define GR_RELEASE !GR_DEBUG |
| + #define GR_RELEASE !SK_DEBUG |
| #endif |
| -#if GR_DEBUG == GR_RELEASE |
| - #error "GR_DEBUG and GR_RELEASE must not be the same" |
| +#if SK_DEBUG == GR_RELEASE |
| + #error "SK_DEBUG and GR_RELEASE must not be the same" |
| #endif |
| /////////////////////////////////////////////////////////////////////////////// |
| @@ -142,7 +128,7 @@ typedef unsigned __int64 uint64_t; |
| * A alternate user config file can be specified by defining |
| * GR_USER_CONFIG_FILE. It should be defined relative to GrConfig.h |
| * |
| - * e.g. it can specify GR_DEBUG/GR_RELEASE as it please, change the BUILD |
| + * e.g. it can specify SK_DEBUG/GR_RELEASE as it please, change the BUILD |
|
bsalomon
2013/08/23 12:54:23
We should remove this first example since GR_USER_
|
| * target, or supply its own defines for anything else (e.g. GR_DEFAULT_TEXTURE_CACHE_MB_LIMIT) |
| */ |
| #if !defined(GR_USER_CONFIG_FILE) |
| @@ -242,7 +228,7 @@ typedef unsigned __int64 uint64_t; |
| * GR_DEBUGBREAK is an unconditional break in debug builds. |
| */ |
| #if !defined(GR_DEBUGBREAK) |
| - #if GR_DEBUG |
| + #if SK_DEBUG |
| #define GR_DEBUGBREAK GR_ALWAYSBREAK |
| #else |
| #define GR_DEBUGBREAK |
| @@ -266,7 +252,7 @@ typedef unsigned __int64 uint64_t; |
| * GR_DEBUGASSERT is an assertion in debug builds only. |
| */ |
| #if !defined(GR_DEBUGASSERT) |
| - #if GR_DEBUG |
| + #if SK_DEBUG |
| #define GR_DEBUGASSERT(COND) GR_ALWAYSASSERT(COND) |
| #else |
| #define GR_DEBUGASSERT(COND) |
| @@ -291,7 +277,7 @@ inline void GrDebugCrash(const char* msg) { GrPrintf(msg); SkASSERT(false); } |
| * GR_DEBUGCODE compiles the code X in debug builds only |
| */ |
| #if !defined(GR_DEBUGCODE) |
| - #if GR_DEBUG |
| + #if SK_DEBUG |
| #define GR_DEBUGCODE(X) X |
| #else |
| #define GR_DEBUGCODE(X) |