Remove uses of GR_RELEASE.

Instead of using GR_RELEASE new code should just use SK_RELEASE, like its
counterpart SK_DEBUG instead of GR_DEBUG.

R=bsalomon@google.com, robertphillips@google.com

Author: tfarina@chromium.org

Review URL: https://chromiumcodereview.appspot.com/23479017

git-svn-id: http://skia.googlecode.com/svn/trunk@11070 2bbb7eff-a529-9590-31e7-b0007b416f81

diff --git a/gyp/common.gypi b/gyp/common.gypi
index 4ab00f14fb52343b2bf0eb04a2640cbdbce72c39..aaf741d1aa9a2e73845841247c2e50f8417cbef1 100644 (file)
--- a/gyp/common.gypi
+++ b/gyp/common.gypi
@@ -98,7 +98,6 @@
       'Release': {
         'defines': [
           'SK_RELEASE',
-          'GR_RELEASE=1',
         ],
       },
       'Release_Developer': {

diff --git a/include/gpu/GrConfig.h b/include/gpu/GrConfig.h
index ad8c1d21af481b5fecba62e87f1ed25eddd63592..060682e17b1dd5c2999fa5516d0fbc967ae85c1a 100644 (file)
--- a/include/gpu/GrConfig.h
+++ b/include/gpu/GrConfig.h
@@ -85,16 +85,6 @@
     #endif
 #endif
 
-#if !defined(SK_DEBUG) && !GR_RELEASE
-    #ifdef NDEBUG
-        #define GR_RELEASE 1
-    #endif
-#endif
-
-#if defined(SK_DEBUG) && GR_RELEASE
-    #error "cannot define both SK_DEBUG and GR_RELEASE"
-#endif
-
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////
 

diff --git a/include/gpu/SkGr.h b/include/gpu/SkGr.h
index 15e54a3871a728c5dcaf0213a1937b7afd59e386..5e5ca4b72c30f898bb9c07d829f3824f8ef652be 100644 (file)
--- a/include/gpu/SkGr.h
+++ b/include/gpu/SkGr.h
@@ -25,10 +25,6 @@
 #include "SkRegion.h"
 #include "SkClipStack.h"
 
-#if (GR_RELEASE && defined(SK_DEBUG))
-//    #error "inconsistent GR_RELEASE and SK_DEBUG"
-#endif
-
 ////////////////////////////////////////////////////////////////////////////////
 // Sk to Gr Type conversions