Index: src/gpu/effects/GrConvolutionEffect.cpp |
diff --git a/src/gpu/effects/GrConvolutionEffect.cpp b/src/gpu/effects/GrConvolutionEffect.cpp |
index 65da81111b98ef3ddf2f5367058ac52597750e0a..aad7d4938d2353d9c61a31a707304d59aebea2a8 100644 |
--- a/src/gpu/effects/GrConvolutionEffect.cpp |
+++ b/src/gpu/effects/GrConvolutionEffect.cpp |
@@ -109,7 +109,7 @@ void GrGLConvolutionEffect::setData(const GrGLUniformManager& uman, |
const GrConvolutionEffect& conv = drawEffect.castEffect<GrConvolutionEffect>(); |
GrTexture& texture = *conv.texture(0); |
// the code we generated was for a specific kernel radius |
- GrAssert(conv.radius() == fRadius); |
+ SkASSERT(conv.radius() == fRadius); |
float imageIncrement[2] = { 0 }; |
float ySign = texture.origin() != kTopLeft_GrSurfaceOrigin ? 1.0f : -1.0f; |
switch (conv.direction()) { |
@@ -162,8 +162,8 @@ GrConvolutionEffect::GrConvolutionEffect(GrTexture* texture, |
bool useBounds, |
float bounds[2]) |
: Gr1DKernelEffect(texture, direction, radius), fUseBounds(useBounds) { |
- GrAssert(radius <= kMaxKernelRadius); |
- GrAssert(NULL != kernel); |
+ SkASSERT(radius <= kMaxKernelRadius); |
+ SkASSERT(NULL != kernel); |
int width = this->width(); |
for (int i = 0; i < width; i++) { |
fKernel[i] = kernel[i]; |
@@ -178,7 +178,7 @@ GrConvolutionEffect::GrConvolutionEffect(GrTexture* texture, |
bool useBounds, |
float bounds[2]) |
: Gr1DKernelEffect(texture, direction, radius), fUseBounds(useBounds) { |
- GrAssert(radius <= kMaxKernelRadius); |
+ SkASSERT(radius <= kMaxKernelRadius); |
int width = this->width(); |
float sum = 0.0f; |