| Index: src/gpu/gl/GrGLCaps.cpp
|
| diff --git a/src/gpu/gl/GrGLCaps.cpp b/src/gpu/gl/GrGLCaps.cpp
|
| index 19d6a8092d00e3bbd0c2bb35c8196711deb48e75..ea2daeed1ee13cde96af36c4f8b2bc69f34cac7a 100644
|
| --- a/src/gpu/gl/GrGLCaps.cpp
|
| +++ b/src/gpu/gl/GrGLCaps.cpp
|
| @@ -538,11 +538,11 @@ bool GrGLCaps::hasPathRenderingSupport(const GrGLContextInfo& ctxInfo, const GrG
|
| // additions are detected by checking the existence of the function.
|
| // We also use *Then* functions that not all drivers might have. Check
|
| // them for consistency.
|
| - if (NULL == gli->fFunctions.fStencilThenCoverFillPath ||
|
| - NULL == gli->fFunctions.fStencilThenCoverStrokePath ||
|
| - NULL == gli->fFunctions.fStencilThenCoverFillPathInstanced ||
|
| - NULL == gli->fFunctions.fStencilThenCoverStrokePathInstanced ||
|
| - NULL == gli->fFunctions.fProgramPathFragmentInputGen) {
|
| + if (nullptr == gli->fFunctions.fStencilThenCoverFillPath ||
|
| + nullptr == gli->fFunctions.fStencilThenCoverStrokePath ||
|
| + nullptr == gli->fFunctions.fStencilThenCoverFillPathInstanced ||
|
| + nullptr == gli->fFunctions.fStencilThenCoverStrokePathInstanced ||
|
| + nullptr == gli->fFunctions.fProgramPathFragmentInputGen) {
|
| return false;
|
| }
|
| return true;
|
| @@ -1192,7 +1192,7 @@ void GrGLCaps::initShaderPrecisionTable(const GrGLContextInfo& ctxInfo,
|
| if (kGeometry_GrShaderType != s) {
|
| GrShaderType shaderType = static_cast<GrShaderType>(s);
|
| GrGLenum glShader = shader_type_to_gl_shader(shaderType);
|
| - GrShaderCaps::PrecisionInfo* first = NULL;
|
| + GrShaderCaps::PrecisionInfo* first = nullptr;
|
| glslCaps->fShaderPrecisionVaries = false;
|
| for (int p = 0; p < kGrSLPrecisionCount; ++p) {
|
| GrSLPrecision precision = static_cast<GrSLPrecision>(p);
|
|
|