From d3312595c86289113ea5994234844388523499e8 Mon Sep 17 00:00:00 2001 From: bsalomon Date: Fri, 4 Mar 2016 07:06:43 -0800 Subject: Revert of Don't allow nullptr in texels array params (unless using a transfer buffer). (patchset #3 id:60001 of https://codereview.chromium.org/1765633002/ ) Reason for revert: breaks vk build Original issue's description: > Don't allow nullptr in texels array params (unless using a transfer buffer). > > Require all levels in writePixels to have a non-nullptr. > GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1765633002 > > Committed: https://skia.googlesource.com/skia/+/8ee78f31b2a29a5f76403755ea17bad9be74a3ec TBR=jvanverth@google.com,cblume@google.com,cblume@chromium.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true Review URL: https://codereview.chromium.org/1760343003 --- include/gpu/GrTextureProvider.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/gpu/GrTextureProvider.h') diff --git a/include/gpu/GrTextureProvider.h b/include/gpu/GrTextureProvider.h index 7c12ebd6db..83efb5bf7b 100644 --- a/include/gpu/GrTextureProvider.h +++ b/include/gpu/GrTextureProvider.h @@ -45,7 +45,7 @@ public: /** Shortcut for creating a texture with no initial data to upload. */ GrTexture* createTexture(const GrSurfaceDesc& desc, SkBudgeted budgeted) { - return this->createTexture(desc, budgeted, nullptr, 0); + return this->createTexture(desc, budgeted, NULL, 0); } /** Assigns a unique key to the texture. The texture will be findable via this key using -- cgit v1.2.3