From f6de475e5cbd143f348ff7738919e397b7fe7f57 Mon Sep 17 00:00:00 2001 From: "tfarina@chromium.org" Date: Sat, 17 Aug 2013 00:02:59 +0000 Subject: Replace uses of GrAssert by SkASSERT. R=bsalomon@google.com Review URL: https://codereview.chromium.org/22850006 git-svn-id: http://skia.googlecode.com/svn/trunk@10789 2bbb7eff-a529-9590-31e7-b0007b416f81 --- src/gpu/gl/GrGLProgramDesc.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/gpu/gl/GrGLProgramDesc.cpp') diff --git a/src/gpu/gl/GrGLProgramDesc.cpp b/src/gpu/gl/GrGLProgramDesc.cpp index ee9775f47f..91ac266093 100644 --- a/src/gpu/gl/GrGLProgramDesc.cpp +++ b/src/gpu/gl/GrGLProgramDesc.cpp @@ -46,7 +46,7 @@ void GrGLProgramDesc::Build(const GrDrawState& drawState, coverageStages->reset(); // This should already have been caught - GrAssert(!(GrDrawState::kSkipDraw_BlendOptFlag & blendOpts)); + SkASSERT(!(GrDrawState::kSkipDraw_BlendOptFlag & blendOpts)); bool skipCoverage = SkToBool(blendOpts & GrDrawState::kEmitTransBlack_BlendOptFlag); @@ -137,13 +137,13 @@ void GrGLProgramDesc::Build(const GrDrawState& drawState, } if (readsDst) { - GrAssert(NULL != dstCopy || gpu->caps()->dstReadInShaderSupport()); + SkASSERT(NULL != dstCopy || gpu->caps()->dstReadInShaderSupport()); const GrTexture* dstCopyTexture = NULL; if (NULL != dstCopy) { dstCopyTexture = dstCopy->texture(); } header->fDstReadKey = GrGLShaderBuilder::KeyForDstRead(dstCopyTexture, gpu->glCaps()); - GrAssert(0 != header->fDstReadKey); + SkASSERT(0 != header->fDstReadKey); } else { header->fDstReadKey = 0; } @@ -164,7 +164,7 @@ void GrGLProgramDesc::Build(const GrDrawState& drawState, if (requiresColorAttrib) { header->fColorAttributeIndex = drawState.colorVertexAttributeIndex(); } else if (GrGLProgramDesc::kAttribute_ColorInput == header->fColorInput) { - GrAssert(availableAttributeIndex < GrDrawState::kMaxVertexAttribCnt); + SkASSERT(availableAttributeIndex < GrDrawState::kMaxVertexAttribCnt); header->fColorAttributeIndex = availableAttributeIndex; availableAttributeIndex++; } else { @@ -174,7 +174,7 @@ void GrGLProgramDesc::Build(const GrDrawState& drawState, if (requiresCoverageAttrib) { header->fCoverageAttributeIndex = drawState.coverageVertexAttributeIndex(); } else if (GrGLProgramDesc::kAttribute_ColorInput == header->fCoverageInput) { - GrAssert(availableAttributeIndex < GrDrawState::kMaxVertexAttribCnt); + SkASSERT(availableAttributeIndex < GrDrawState::kMaxVertexAttribCnt); header->fCoverageAttributeIndex = availableAttributeIndex; } else { header->fCoverageAttributeIndex = -1; -- cgit v1.2.3