aboutsummaryrefslogtreecommitdiffhomepage
path: root/include
diff options
context:
space:
mode:
authorGravatar bsalomon <bsalomon@google.com>2016-03-04 06:23:36 -0800
committerGravatar Commit bot <commit-bot@chromium.org>2016-03-04 06:23:36 -0800
commit8ee78f31b2a29a5f76403755ea17bad9be74a3ec (patch)
tree6957678c4ca178a9e64ad681e6bd61a043c6a1c3 /include
parent7c87cf44cfc83d87be87d9a89ddb55394691149a (diff)
Don't allow nullptr in texels array params (unless using a transfer buffer).
Diffstat (limited to 'include')
-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 83efb5bf7b..7c12ebd6db 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, NULL, 0);
+ return this->createTexture(desc, budgeted, nullptr, 0);
}
/** Assigns a unique key to the texture. The texture will be findable via this key using