diff options
| author |  commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-09-06 23:13:05 +0000 |
|---|---|---|
| committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-09-06 23:13:05 +0000 |
| commit | 1acc3d7cc28c5631b5300578ab13439bdefd4e33 (patch) | |
| tree | e9809f7e8b889b84c6e0e2e221fccaf7436b65cb /include/gpu | |
| parent | b57a30d8f5459b30d8d671c62fb8022050d862e1 (diff) | |
Replace uses of GR_DEBUGCODE by SkDEBUGCODE.
BUG=None
TEST=none, no functional changes.
R=bsalomon@google.com, robertphillips@google.com
Author: tfarina@chromium.org
Review URL: https://chromiumcodereview.appspot.com/23703010
git-svn-id: http://skia.googlecode.com/svn/trunk@11142 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'include/gpu')
| -rw-r--r-- | include/gpu/GrBackendEffectFactory.h | 2 | ||||
| -rw-r--r-- | include/gpu/GrConfig.h | 11 | ||||
| -rw-r--r-- | include/gpu/GrEffectStage.h | 8 |
3 files changed, 5 insertions, 16 deletions
diff --git a/include/gpu/GrBackendEffectFactory.h b/include/gpu/GrBackendEffectFactory.h index 6a18169de0..3a39dc0df6 100644 --- a/include/gpu/GrBackendEffectFactory.h +++ b/include/gpu/GrBackendEffectFactory.h @@ -67,7 +67,7 @@ protected: virtual ~GrBackendEffectFactory() {} static EffectKey GenID() { - GR_DEBUGCODE(static const int32_t kClassIDBits = 8 * sizeof(EffectKey) - + SkDEBUGCODE(static const int32_t kClassIDBits = 8 * sizeof(EffectKey) - kTextureKeyBits - kEffectKeyBits - kAttribKeyBits); // fCurrEffectClassID has been initialized to kIllegalEffectClassID. The // atomic inc returns the old value not the incremented value. So we add diff --git a/include/gpu/GrConfig.h b/include/gpu/GrConfig.h index 060682e17b..e3fa1a44e9 100644 --- a/include/gpu/GrConfig.h +++ b/include/gpu/GrConfig.h @@ -236,17 +236,6 @@ 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) - #ifdef 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. diff --git a/include/gpu/GrEffectStage.h b/include/gpu/GrEffectStage.h index 561a7890f5..8b6cb11dfc 100644 --- a/include/gpu/GrEffectStage.h +++ b/include/gpu/GrEffectStage.h @@ -87,7 +87,7 @@ public: private: bool fCoordChangeMatrixSet; SkMatrix fCoordChangeMatrix; - GR_DEBUGCODE(mutable SkAutoTUnref<const GrEffectRef> fEffectRef;) + SkDEBUGCODE(mutable SkAutoTUnref<const GrEffectRef> fEffectRef;) friend class GrEffectStage; }; @@ -104,8 +104,8 @@ public: savedCoordChange->fCoordChangeMatrix = fCoordChangeMatrix; } SkASSERT(NULL == savedCoordChange->fEffectRef.get()); - GR_DEBUGCODE(SkRef(fEffectRef.get());) - GR_DEBUGCODE(savedCoordChange->fEffectRef.reset(fEffectRef.get());) + SkDEBUGCODE(SkRef(fEffectRef.get());) + SkDEBUGCODE(savedCoordChange->fEffectRef.reset(fEffectRef.get());) } /** @@ -117,7 +117,7 @@ public: fCoordChangeMatrix = savedCoordChange.fCoordChangeMatrix; } SkASSERT(savedCoordChange.fEffectRef.get() == fEffectRef); - GR_DEBUGCODE(savedCoordChange.fEffectRef.reset(NULL);) + SkDEBUGCODE(savedCoordChange.fEffectRef.reset(NULL);) } /** |