| Index: src/gpu/GrTextureProvider.cpp
|
| diff --git a/src/gpu/GrTextureProvider.cpp b/src/gpu/GrTextureProvider.cpp
|
| index 253fe032ed90e9b8cab86824560f0289a5150d7a..26384abbd2ad5bcd93ca65203631035a16d18334 100644
|
| --- a/src/gpu/GrTextureProvider.cpp
|
| +++ b/src/gpu/GrTextureProvider.cpp
|
| @@ -20,11 +20,11 @@ enum ScratchTextureFlags {
|
| GrTexture* GrTextureProvider::createTexture(const GrSurfaceDesc& desc, bool budgeted,
|
| const void* srcData, size_t rowBytes) {
|
| if (this->isAbandoned()) {
|
| - return NULL;
|
| + return nullptr;
|
| }
|
| if ((desc.fFlags & kRenderTarget_GrSurfaceFlag) &&
|
| !fGpu->caps()->isConfigRenderable(desc.fConfig, desc.fSampleCnt > 0)) {
|
| - return NULL;
|
| + return nullptr;
|
| }
|
| if (!GrPixelConfigIsCompressed(desc.fConfig)) {
|
| static const uint32_t kFlags = kExact_ScratchTextureFlag |
|
| @@ -50,11 +50,11 @@ GrTexture* GrTextureProvider::createApproxTexture(const GrSurfaceDesc& desc) {
|
| GrTexture* GrTextureProvider::internalCreateApproxTexture(const GrSurfaceDesc& desc,
|
| uint32_t scratchFlags) {
|
| if (this->isAbandoned()) {
|
| - return NULL;
|
| + return nullptr;
|
| }
|
| // Currently we don't recycle compressed textures as scratch.
|
| if (GrPixelConfigIsCompressed(desc.fConfig)) {
|
| - return NULL;
|
| + return nullptr;
|
| } else {
|
| return this->refScratchTexture(desc, scratchFlags);
|
| }
|
| @@ -100,22 +100,22 @@ GrTexture* GrTextureProvider::refScratchTexture(const GrSurfaceDesc& inDesc,
|
| }
|
|
|
| if (!(kNoCreate_ScratchTextureFlag & flags)) {
|
| - return fGpu->createTexture(*desc, true, NULL, 0);
|
| + return fGpu->createTexture(*desc, true, nullptr, 0);
|
| }
|
|
|
| - return NULL;
|
| + return nullptr;
|
| }
|
|
|
| GrTexture* GrTextureProvider::wrapBackendTexture(const GrBackendTextureDesc& desc,
|
| GrWrapOwnership ownership) {
|
| if (this->isAbandoned()) {
|
| - return NULL;
|
| + return nullptr;
|
| }
|
| return fGpu->wrapBackendTexture(desc, ownership);
|
| }
|
|
|
| GrRenderTarget* GrTextureProvider::wrapBackendRenderTarget(const GrBackendRenderTargetDesc& desc) {
|
| - return this->isAbandoned() ? NULL : fGpu->wrapBackendRenderTarget(desc,
|
| + return this->isAbandoned() ? nullptr : fGpu->wrapBackendRenderTarget(desc,
|
| kBorrow_GrWrapOwnership);
|
| }
|
|
|
| @@ -131,5 +131,5 @@ bool GrTextureProvider::existsResourceWithUniqueKey(const GrUniqueKey& key) cons
|
| }
|
|
|
| GrGpuResource* GrTextureProvider::findAndRefResourceByUniqueKey(const GrUniqueKey& key) {
|
| - return this->isAbandoned() ? NULL : fCache->findAndRefUniqueResource(key);
|
| + return this->isAbandoned() ? nullptr : fCache->findAndRefUniqueResource(key);
|
| }
|
|
|