diff options
author | 2013-08-14 12:09:00 +0000 | |
---|---|---|
committer | 2013-08-14 12:09:00 +0000 | |
commit | 96ae688f03f05a53c2ae6e66a431e180b90be9cd (patch) | |
tree | e6f7cbbda68668fd0baee6609ddeecbdf6f9cc16 /src | |
parent | 73ab2965363713f9a0ccec3666724a60329e6ea3 (diff) |
effects: Replaces uses of GrAssert with SkASSERT.
This is the first step on migrating from GrAssert to SkASSERT as requested by
Brian.
R=bsalomon@google.com, robertphillips@google.com, scroggo@google.com
Author: tfarina@chromium.org
Review URL: https://chromiumcodereview.appspot.com/22418006
git-svn-id: http://skia.googlecode.com/svn/trunk@10706 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src')
-rw-r--r-- | src/effects/SkArithmeticMode.cpp | 2 | ||||
-rw-r--r-- | src/effects/SkGpuBlurUtils.cpp | 6 | ||||
-rw-r--r-- | src/effects/SkMagnifierImageFilter.cpp | 2 | ||||
-rw-r--r-- | src/effects/SkMatrixConvolutionImageFilter.cpp | 4 | ||||
-rw-r--r-- | src/effects/SkMorphologyImageFilter.cpp | 2 | ||||
-rw-r--r-- | src/effects/gradients/SkGradientShader.cpp | 2 | ||||
-rw-r--r-- | src/effects/gradients/SkTwoPointConicalGradient.cpp | 2 | ||||
-rw-r--r-- | src/effects/gradients/SkTwoPointRadialGradient.cpp | 2 |
8 files changed, 11 insertions, 11 deletions
diff --git a/src/effects/SkArithmeticMode.cpp b/src/effects/SkArithmeticMode.cpp index 43c62ecdfb..ed29130369 100644 --- a/src/effects/SkArithmeticMode.cpp +++ b/src/effects/SkArithmeticMode.cpp @@ -364,7 +364,7 @@ void GrGLArithmeticEffect::emitCode(GrGLShaderBuilder* builder, dstColor = builder->dstColor(); } - GrAssert(NULL != dstColor); + SkASSERT(NULL != dstColor); fKUni = builder->addUniform(GrGLShaderBuilder::kFragment_ShaderType, kVec4f_GrSLType, "k"); const char* kUni = builder->getUniformCStr(fKUni); diff --git a/src/effects/SkGpuBlurUtils.cpp b/src/effects/SkGpuBlurUtils.cpp index 5fc51811aa..fce5b6bc30 100644 --- a/src/effects/SkGpuBlurUtils.cpp +++ b/src/effects/SkGpuBlurUtils.cpp @@ -35,7 +35,7 @@ static float adjust_sigma(float sigma, int *scaleFactor, int *radius) { sigma *= 0.5f; } *radius = static_cast<int>(ceilf(sigma * 3.0f)); - GrAssert(*radius <= GrConvolutionEffect::kMaxKernelRadius); + SkASSERT(*radius <= GrConvolutionEffect::kMaxKernelRadius); return sigma; } @@ -119,7 +119,7 @@ GrTexture* GaussianBlur(GrContext* context, bool cropToRect, float sigmaX, float sigmaY) { - GrAssert(NULL != context); + SkASSERT(NULL != context); GrContext::AutoRenderTarget art(context); @@ -140,7 +140,7 @@ GrTexture* GaussianBlur(GrContext* context, GrContext::AutoClip acs(context, SkRect::MakeWH(srcRect.width(), srcRect.height())); - GrAssert(kBGRA_8888_GrPixelConfig == srcTexture->config() || + SkASSERT(kBGRA_8888_GrPixelConfig == srcTexture->config() || kRGBA_8888_GrPixelConfig == srcTexture->config() || kAlpha_8_GrPixelConfig == srcTexture->config()); diff --git a/src/effects/SkMagnifierImageFilter.cpp b/src/effects/SkMagnifierImageFilter.cpp index f4a72b8d2c..f7fbda2014 100644 --- a/src/effects/SkMagnifierImageFilter.cpp +++ b/src/effects/SkMagnifierImageFilter.cpp @@ -219,7 +219,7 @@ GrEffectRef* GrMagnifierEffect::TestCreate(SkMWCRandom* random, inset)); GrEffectRef* effect; filter->asNewEffect(&effect, textures[0], SkIPoint::Make(0, 0)); - GrAssert(NULL != effect); + SkASSERT(NULL != effect); return effect; } diff --git a/src/effects/SkMatrixConvolutionImageFilter.cpp b/src/effects/SkMatrixConvolutionImageFilter.cpp index b3ce7ecc94..bedd6f8bbc 100644 --- a/src/effects/SkMatrixConvolutionImageFilter.cpp +++ b/src/effects/SkMatrixConvolutionImageFilter.cpp @@ -470,8 +470,8 @@ void GrGLMatrixConvolutionEffect::setData(const GrGLUniformManager& uman, const GrMatrixConvolutionEffect& conv = drawEffect.castEffect<GrMatrixConvolutionEffect>(); GrTexture& texture = *conv.texture(0); // the code we generated was for a specific kernel size - GrAssert(conv.kernelSize() == fKernelSize); - GrAssert(conv.tileMode() == fTileMode); + SkASSERT(conv.kernelSize() == fKernelSize); + SkASSERT(conv.tileMode() == fTileMode); float imageIncrement[2]; float ySign = texture.origin() == kTopLeft_GrSurfaceOrigin ? 1.0f : -1.0f; imageIncrement[0] = 1.0f / texture.width(); diff --git a/src/effects/SkMorphologyImageFilter.cpp b/src/effects/SkMorphologyImageFilter.cpp index fb8fd00081..94a6327307 100644 --- a/src/effects/SkMorphologyImageFilter.cpp +++ b/src/effects/SkMorphologyImageFilter.cpp @@ -377,7 +377,7 @@ void GrGLMorphologyEffect::setData(const GrGLUniformManager& uman, const Gr1DKernelEffect& kern = drawEffect.castEffect<Gr1DKernelEffect>(); GrTexture& texture = *kern.texture(0); // the code we generated was for a specific kernel radius - GrAssert(kern.radius() == fRadius); + SkASSERT(kern.radius() == fRadius); float imageIncrement[2] = { 0 }; switch (kern.direction()) { case Gr1DKernelEffect::kX_Direction: diff --git a/src/effects/gradients/SkGradientShader.cpp b/src/effects/gradients/SkGradientShader.cpp index de43b69a2f..4e528b5ba8 100644 --- a/src/effects/gradients/SkGradientShader.cpp +++ b/src/effects/gradients/SkGradientShader.cpp @@ -910,7 +910,7 @@ GrGradientEffect::GrGradientEffect(GrContext* ctx, desc.fContext = ctx; desc.fConfig = SkBitmapConfig2GrPixelConfig(bitmap.config()); fAtlas = GrTextureStripAtlas::GetAtlas(desc); - GrAssert(NULL != fAtlas); + SkASSERT(NULL != fAtlas); // We always filter the gradient table. Each table is one row of a texture, so always y-clamp. GrTextureParams params; diff --git a/src/effects/gradients/SkTwoPointConicalGradient.cpp b/src/effects/gradients/SkTwoPointConicalGradient.cpp index 37b49f0d47..664ec914be 100644 --- a/src/effects/gradients/SkTwoPointConicalGradient.cpp +++ b/src/effects/gradients/SkTwoPointConicalGradient.cpp @@ -658,7 +658,7 @@ void GrGLConical2Gradient::setData(const GrGLUniformManager& uman, const GrDrawEffect& drawEffect) { INHERITED::setData(uman, drawEffect); const GrConical2Gradient& data = drawEffect.castEffect<GrConical2Gradient>(); - GrAssert(data.isDegenerate() == fIsDegenerate); + SkASSERT(data.isDegenerate() == fIsDegenerate); SkScalar centerX1 = data.center(); SkScalar radius0 = data.radius(); SkScalar diffRadius = data.diffRadius(); diff --git a/src/effects/gradients/SkTwoPointRadialGradient.cpp b/src/effects/gradients/SkTwoPointRadialGradient.cpp index 989c139556..3d526a6c1c 100644 --- a/src/effects/gradients/SkTwoPointRadialGradient.cpp +++ b/src/effects/gradients/SkTwoPointRadialGradient.cpp @@ -640,7 +640,7 @@ void GrGLRadial2Gradient::setData(const GrGLUniformManager& uman, const GrDrawEffect& drawEffect) { INHERITED::setData(uman, drawEffect); const GrRadial2Gradient& data = drawEffect.castEffect<GrRadial2Gradient>(); - GrAssert(data.isDegenerate() == fIsDegenerate); + SkASSERT(data.isDegenerate() == fIsDegenerate); SkScalar centerX1 = data.center(); SkScalar radius0 = data.radius(); if (fCachedCenter != centerX1 || |