aboutsummaryrefslogtreecommitdiffhomepage
path: root/include/gpu/GrTextureProvider.h
diff options
context:
space:
mode:
authorGravatar bsalomon <bsalomon@google.com>2016-03-04 07:06:43 -0800
committerGravatar Commit bot <commit-bot@chromium.org>2016-03-04 07:06:43 -0800
commitd3312595c86289113ea5994234844388523499e8 (patch)
tree73f596e64d80fa963952d0367de1bf5c2edd2da4 /include/gpu/GrTextureProvider.h
parent0032a302ca8cddc7f6ca500b8096afa4888fc614 (diff)
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
Diffstat (limited to 'include/gpu/GrTextureProvider.h')
-rw-r--r--include/gpu/GrTextureProvider.h2
1 files changed, 1 insertions, 1 deletions
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