Index: src/gpu/gl/GrGLEffect.cpp |
diff --git a/src/gpu/gl/GrGLEffect.cpp b/src/gpu/gl/GrGLEffect.cpp |
index e21ab1dab9471f7f1ddd11d9d1194b143554dfc2..28be7afb345396188de0569646161590ee36b417 100644 |
--- a/src/gpu/gl/GrGLEffect.cpp |
+++ b/src/gpu/gl/GrGLEffect.cpp |
@@ -28,7 +28,7 @@ GrGLEffect::EffectKey GrGLEffect::GenTextureKey(const GrDrawEffect& drawEffect, |
for (int index = 0; index < numTextures; ++index) { |
const GrTextureAccess& access = (*drawEffect.effect())->textureAccess(index); |
EffectKey value = GrGLShaderBuilder::KeyForTextureAccess(access, caps) << index; |
- GrAssert(0 == (value & key)); // keys for each access ought not to overlap |
+ SkASSERT(0 == (value & key)); // keys for each access ought not to overlap |
key |= value; |
} |
return key; |
@@ -38,11 +38,11 @@ GrGLEffect::EffectKey GrGLEffect::GenAttribKey(const GrDrawEffect& drawEffect) { |
EffectKey key = 0; |
int numAttributes = drawEffect.getVertexAttribIndexCount(); |
- GrAssert(numAttributes <= 2); |
+ SkASSERT(numAttributes <= 2); |
const int* attributeIndices = drawEffect.getVertexAttribIndices(); |
for (int index = 0; index < numAttributes; ++index) { |
EffectKey value = attributeIndices[index] << 3*index; |
- GrAssert(0 == (value & key)); // keys for each attribute ought not to overlap |
+ SkASSERT(0 == (value & key)); // keys for each attribute ought not to overlap |
key |= value; |
} |