Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(323)

Unified Diff: src/gpu/gl/GrGLPathRendering.cpp

Issue 544233002: "NULL !=" = NULL (Closed) Base URL: https://skia.googlesource.com/skia.git@are
Patch Set: rebase Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/gpu/gl/GrGLPathRange.cpp ('k') | src/gpu/gl/GrGLProgram.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/gpu/gl/GrGLPathRendering.cpp
diff --git a/src/gpu/gl/GrGLPathRendering.cpp b/src/gpu/gl/GrGLPathRendering.cpp
index 337e83e81172b3cc5b04a2aabb790741a95abd03..f524ff2aca5fdbde49d1acd784c66004cffa5da4 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();
« no previous file with comments | « src/gpu/gl/GrGLPathRange.cpp ('k') | src/gpu/gl/GrGLProgram.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698