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/GrGLProgram.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/GrGLProgram.cpp')
| -rw-r--r-- | src/gpu/gl/GrGLProgram.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/gpu/gl/GrGLProgram.cpp b/src/gpu/gl/GrGLProgram.cpp index 7b5dbb4c94..916c31ccbe 100644 --- a/src/gpu/gl/GrGLProgram.cpp +++ b/src/gpu/gl/GrGLProgram.cpp @@ -100,7 +100,7 @@ void GrGLProgram::initSamplerUniforms() { fProgramDataManager.setSampler(fBuiltinUniformHandles.fDstCopySamplerUni, texUnitIdx); fDstCopyTexUnit = texUnitIdx++; } - if (NULL != fGeometryProcessor.get()) { + if (fGeometryProcessor.get()) { fGeometryProcessor->initSamplers(fProgramDataManager, &texUnitIdx); } fColorEffects->initSamplers(fProgramDataManager, &texUnitIdx); @@ -135,7 +135,7 @@ void GrGLProgram::setData(GrGpu::DrawType drawType, this->setCoverage(drawState, coverage, sharedState); this->setMatrixAndRenderTargetHeight(drawType, drawState); - if (NULL != dstCopy) { + if (dstCopy) { if (fBuiltinUniformHandles.fDstCopyTopLeftUni.isValid()) { fProgramDataManager.set2f(fBuiltinUniformHandles.fDstCopyTopLeftUni, static_cast<GrGLfloat>(dstCopy->offset().fX), @@ -156,8 +156,8 @@ void GrGLProgram::setData(GrGpu::DrawType drawType, SkASSERT(!fBuiltinUniformHandles.fDstCopySamplerUni.isValid()); } - if (NULL != fGeometryProcessor.get()) { - SkASSERT(NULL != geometryProcessor); + if (fGeometryProcessor.get()) { + SkASSERT(geometryProcessor); fGeometryProcessor->setData(fGpu, drawType,fProgramDataManager, geometryProcessor); } fColorEffects->setData(fGpu, drawType,fProgramDataManager, colorStages); |