| Index: src/gpu/GrTexture.cpp
|
| diff --git a/src/gpu/GrTexture.cpp b/src/gpu/GrTexture.cpp
|
| index c05f35d9e39d88f6e0fa300a73f31504461fa719..5a3e6aa22f41052b1807797c632652f6052df936 100644
|
| --- a/src/gpu/GrTexture.cpp
|
| +++ b/src/gpu/GrTexture.cpp
|
| @@ -74,7 +74,7 @@ void GrTexture::writePixels(int left, int top, int width, int height,
|
| }
|
|
|
| void GrTexture::onRelease() {
|
| - GrAssert(!this->isSetFlag((GrTextureFlags) kReturnToCache_FlagBit));
|
| + SkASSERT(!this->isSetFlag((GrTextureFlags) kReturnToCache_FlagBit));
|
| INHERITED::onRelease();
|
| }
|
|
|
| @@ -88,19 +88,19 @@ void GrTexture::onAbandon() {
|
| void GrTexture::validateDesc() const {
|
| if (NULL != this->asRenderTarget()) {
|
| // This texture has a render target
|
| - GrAssert(0 != (fDesc.fFlags & kRenderTarget_GrTextureFlagBit));
|
| + SkASSERT(0 != (fDesc.fFlags & kRenderTarget_GrTextureFlagBit));
|
|
|
| if (NULL != this->asRenderTarget()->getStencilBuffer()) {
|
| - GrAssert(0 != (fDesc.fFlags & kNoStencil_GrTextureFlagBit));
|
| + SkASSERT(0 != (fDesc.fFlags & kNoStencil_GrTextureFlagBit));
|
| } else {
|
| - GrAssert(0 == (fDesc.fFlags & kNoStencil_GrTextureFlagBit));
|
| + SkASSERT(0 == (fDesc.fFlags & kNoStencil_GrTextureFlagBit));
|
| }
|
|
|
| - GrAssert(fDesc.fSampleCnt == this->asRenderTarget()->numSamples());
|
| + SkASSERT(fDesc.fSampleCnt == this->asRenderTarget()->numSamples());
|
| } else {
|
| - GrAssert(0 == (fDesc.fFlags & kRenderTarget_GrTextureFlagBit));
|
| - GrAssert(0 == (fDesc.fFlags & kNoStencil_GrTextureFlagBit));
|
| - GrAssert(0 == fDesc.fSampleCnt);
|
| + SkASSERT(0 == (fDesc.fFlags & kRenderTarget_GrTextureFlagBit));
|
| + SkASSERT(0 == (fDesc.fFlags & kNoStencil_GrTextureFlagBit));
|
| + SkASSERT(0 == fDesc.fSampleCnt);
|
| }
|
| }
|
|
|
| @@ -173,8 +173,8 @@ GrResourceKey GrTexture::ComputeScratchKey(const GrTextureDesc& desc) {
|
| // Instead of a client-provided key of the texture contents we create a key from the
|
| // descriptor.
|
| GR_STATIC_ASSERT(sizeof(idKey) >= 16);
|
| - GrAssert(desc.fHeight < (1 << 16));
|
| - GrAssert(desc.fWidth < (1 << 16));
|
| + SkASSERT(desc.fHeight < (1 << 16));
|
| + SkASSERT(desc.fWidth < (1 << 16));
|
| idKey.fData32[0] = (desc.fWidth) | (desc.fHeight << 16);
|
| idKey.fData32[1] = desc.fConfig | desc.fSampleCnt << 16;
|
| idKey.fData32[2] = desc.fFlags;
|
|
|