diff options
Diffstat (limited to 'src/gpu/gl/angle')
| -rw-r--r-- | src/gpu/gl/angle/GrGLCreateANGLEInterface.cpp | 8 | ||||
| -rw-r--r-- | src/gpu/gl/angle/SkANGLEGLContext.cpp | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/gpu/gl/angle/GrGLCreateANGLEInterface.cpp b/src/gpu/gl/angle/GrGLCreateANGLEInterface.cpp index e4f5467842..4f26c06afe 100644 --- a/src/gpu/gl/angle/GrGLCreateANGLEInterface.cpp +++ b/src/gpu/gl/angle/GrGLCreateANGLEInterface.cpp @@ -24,15 +24,15 @@ static GrGLFuncPtr angle_get_gl_proc(void* ctx, const char name[]) { const GrGLInterface* GrGLCreateANGLEInterface() { - static HMODULE ghANGLELib = NULL; + static HMODULE ghANGLELib = nullptr; - if (NULL == ghANGLELib) { + if (nullptr == ghANGLELib) { // We load the ANGLE library and never let it go ghANGLELib = LoadLibrary("libGLESv2.dll"); } - if (NULL == ghANGLELib) { + if (nullptr == ghANGLELib) { // We can't setup the interface correctly w/o the DLL - return NULL; + return nullptr; } return GrGLAssembleGLESInterface(ghANGLELib, angle_get_gl_proc); diff --git a/src/gpu/gl/angle/SkANGLEGLContext.cpp b/src/gpu/gl/angle/SkANGLEGLContext.cpp index db34c563ea..8ebdcb661e 100644 --- a/src/gpu/gl/angle/SkANGLEGLContext.cpp +++ b/src/gpu/gl/angle/SkANGLEGLContext.cpp @@ -80,7 +80,7 @@ SkANGLEGLContext::SkANGLEGLContext() EGL_CONTEXT_CLIENT_VERSION, 2, EGL_NONE }; - fContext = eglCreateContext(fDisplay, surfaceConfig, NULL, contextAttribs); + fContext = eglCreateContext(fDisplay, surfaceConfig, nullptr, contextAttribs); static const EGLint surfaceAttribs[] = { @@ -94,7 +94,7 @@ SkANGLEGLContext::SkANGLEGLContext() eglMakeCurrent(fDisplay, fSurface, fSurface, fContext); SkAutoTUnref<const GrGLInterface> gl(GrGLCreateANGLEInterface()); - if (NULL == gl.get()) { + if (nullptr == gl.get()) { SkDebugf("Could not create ANGLE GL interface!\n"); this->destroyGLContext(); return; |