Replace uses of GR_DEBUG by SK_DEBUG.

include/gpu/GrConfig.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.
  */
 
 
 
@@ skipping 67 matching lines @@
         #undef GR_QNX_BUILD
         #define GR_QNX_BUILD        1
 //      #error "QNX"
     #else
         #undef GR_LINUX_BUILD
         #define GR_LINUX_BUILD      1
 //      #error "LINUX"
     #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
 
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////
 
 #if GR_WIN32_BUILD
 // VC8 doesn't support stdint.h, so we define those types here.
 typedef signed char int8_t;
 typedef unsigned char uint8_t;
 typedef short int16_t;
@@ skipping 17 matching lines @@
 #include <stdint.h>
 #endif
 
 /*
  *  The "user config" file can be empty, and everything should work. It is
  *  meant to store a given platform/client's overrides of our guess-work.
  *
  *  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_CONFIG_FILE is not the place
to set SK_ anything

e.g. it can change the BUILD target or supply its own defines for anything else
(such as GR_DEFAULT_TEXTURE_CACHE_MB_LIMIT)

  *  target, or supply its own defines for anything else (e.g. GR_DEFAULT_TEXTURE_CACHE_MB_LIMIT)
  */
 #if !defined(GR_USER_CONFIG_FILE)
     #include "GrUserConfig.h"
 #else
     #include GR_USER_CONFIG_FILE
 #endif
 
 
 ///////////////////////////////////////////////////////////////////////////////
@@ skipping 79 matching lines @@
         // sign extend for 64bit architectures to be sure this is
         // in the high address range
         #define GR_ALWAYSBREAK SkNO_RETURN_HINT(); *((int*)(int64_t)(int32_t)0xbeefcafe) = 0;
     #endif
 #endif
 
 /**
  *  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
     #endif
 #endif
 
 /**
  *  GR_ALWAYSASSERT is an assertion in all builds.
  */
 #if !defined(GR_ALWAYSASSERT)
     #define GR_ALWAYSASSERT(COND)                                        \
         do {                                                             \
             if (!(COND)) {                                               \
                 GrPrintf("%s %s failed\n", GR_FILE_AND_LINE_STR, #COND); \
                 GR_ALWAYSBREAK;                                          \
             }                                                            \
         } while (false)
 #endif
 
 /**
  *  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)
     #endif
 #endif
 
 /**
  *  Prettier forms of the above macros.
  */
 #define GrAlwaysAssert(COND) GR_ALWAYSASSERT(COND)
 
 /**
  * Crash from unrecoverable condition, optionally with a message. The debug variants only
  * crash in a debug build. The message versions print the message regardless of release vs debug.
  */
 inline void GrCrash() { GrAlwaysAssert(false); }
 inline void GrCrash(const char* msg) { GrPrintf(msg); GrAlwaysAssert(false); }
 inline void GrDebugCrash() { SkASSERT(false); }
 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)
     #endif
 #endif
 
 /**
  *  GR_STATIC_ASSERT is a compile time assertion. Depending on the platform
  *  it may print the message in the compiler log. Obviously, the condition must
  *  be evaluatable at compile time.
@@ skipping 72 matching lines @@
 #endif
 #if GR_LINUX_BUILD
 //    #pragma message GR_WARN("GR_LINUX_BUILD")
 #endif
 #if GR_QNX_BUILD
 //    #pragma message GR_WARN("GR_QNX_BUILD")
 #endif
 #endif
 
 #endif