diff options
| author |  bsalomon <bsalomon@google.com> | 2014-09-05 13:34:00 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-09-05 13:34:00 -0700 |
| commit | 49f085dddff10473b6ebf832a974288300224e60 (patch) | |
| tree | 308a3cac5e1fb053c9e27e7d07213d72eaa05409 /src/gpu/gl/GrGLPathRendering.cpp | |
| parent | 7260d7292bde966f038b8e166f3fe41ddd8f2099 (diff) | |
"NULL !=" = NULL
R=reed@google.com
Author: bsalomon@google.com
Review URL: https://codereview.chromium.org/544233002
Diffstat (limited to 'src/gpu/gl/GrGLPathRendering.cpp')
| -rw-r--r-- | src/gpu/gl/GrGLPathRendering.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/gpu/gl/GrGLPathRendering.cpp b/src/gpu/gl/GrGLPathRendering.cpp index 337e83e811..f524ff2aca 100644 --- a/src/gpu/gl/GrGLPathRendering.cpp +++ b/src/gpu/gl/GrGLPathRendering.cpp @@ -49,13 +49,13 @@ GrGLPathRendering::GrGLPathRendering(GrGpuGL* gpu) : fGpu(gpu) { const GrGLInterface* glInterface = gpu->glInterface(); fCaps.stencilThenCoverSupport = - NULL != glInterface->fFunctions.fStencilThenCoverFillPath && - NULL != glInterface->fFunctions.fStencilThenCoverStrokePath && - NULL != glInterface->fFunctions.fStencilThenCoverFillPathInstanced && - NULL != glInterface->fFunctions.fStencilThenCoverStrokePathInstanced; + glInterface->fFunctions.fStencilThenCoverFillPath && + glInterface->fFunctions.fStencilThenCoverStrokePath && + glInterface->fFunctions.fStencilThenCoverFillPathInstanced && + glInterface->fFunctions.fStencilThenCoverStrokePathInstanced; fCaps.fragmentInputGenSupport = kGLES_GrGLStandard == glInterface->fStandard && - NULL != glInterface->fFunctions.fProgramPathFragmentInputGen; + glInterface->fFunctions.fProgramPathFragmentInputGen; if (!fCaps.fragmentInputGenSupport) { fHWPathTexGenSettings.reset(fGpu->glCaps().maxFixedFunctionTextureCoords()); @@ -97,8 +97,8 @@ GrPathRange* GrGLPathRendering::createPathRange(size_t size, const SkStrokeRec& void GrGLPathRendering::stencilPath(const GrPath* path, SkPath::FillType fill) { GrGLuint id = static_cast<const GrGLPath*>(path)->pathID(); - SkASSERT(NULL != fGpu->drawState()->getRenderTarget()); - SkASSERT(NULL != fGpu->drawState()->getRenderTarget()->getStencilBuffer()); + SkASSERT(fGpu->drawState()->getRenderTarget()); + SkASSERT(fGpu->drawState()->getRenderTarget()->getStencilBuffer()); this->flushPathStencilSettings(fill); SkASSERT(!fHWPathStencilSettings.isTwoSided()); @@ -111,8 +111,8 @@ void GrGLPathRendering::stencilPath(const GrPath* path, SkPath::FillType fill) { void GrGLPathRendering::drawPath(const GrPath* path, SkPath::FillType fill) { GrGLuint id = static_cast<const GrGLPath*>(path)->pathID(); - SkASSERT(NULL != fGpu->drawState()->getRenderTarget()); - SkASSERT(NULL != fGpu->drawState()->getRenderTarget()->getStencilBuffer()); + SkASSERT(fGpu->drawState()->getRenderTarget()); + SkASSERT(fGpu->drawState()->getRenderTarget()->getStencilBuffer()); this->flushPathStencilSettings(fill); SkASSERT(!fHWPathStencilSettings.isTwoSided()); @@ -167,8 +167,8 @@ void GrGLPathRendering::drawPaths(const GrPathRange* pathRange, const uint32_t i const float transforms[], PathTransformType transformsType, SkPath::FillType fill) { SkASSERT(fGpu->caps()->pathRenderingSupport()); - SkASSERT(NULL != fGpu->drawState()->getRenderTarget()); - SkASSERT(NULL != fGpu->drawState()->getRenderTarget()->getStencilBuffer()); + SkASSERT(fGpu->drawState()->getRenderTarget()); + SkASSERT(fGpu->drawState()->getRenderTarget()->getStencilBuffer()); GrGLuint baseID = static_cast<const GrGLPathRange*>(pathRange)->basePathID(); |