diff options
| author |  bsalomon <bsalomon@google.com> | 2016-03-09 06:25:15 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-03-09 06:25:16 -0800 |
| commit | e699d0cd25fd059e3f0c4949e613e50c83a52179 (patch) | |
| tree | ca881e973092698a1a8d1ad13a8dd912479a596e /src/gpu/vk | |
| parent | 790f99ae729803ddf827251bbbb9bb21fc165e35 (diff) | |
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
Review URL: https://codereview.chromium.org/1765633002
Diffstat (limited to 'src/gpu/vk')
| -rw-r--r-- | src/gpu/vk/GrVkGpu.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gpu/vk/GrVkGpu.cpp b/src/gpu/vk/GrVkGpu.cpp index 1ce78fd192..d357f32e1f 100644 --- a/src/gpu/vk/GrVkGpu.cpp +++ b/src/gpu/vk/GrVkGpu.cpp @@ -542,7 +542,8 @@ GrTexture* GrVkGpu::onCreateTexture(const GrSurfaceDesc& desc, GrGpuResource::Li } // TODO: We're ignoring MIP levels here. - if (!texels.empty() && texels.begin()->fPixels) { + if (!texels.empty()) { + SkASSERT(texels.begin()->fPixels); if (!this->uploadTexData(tex, 0, 0, desc.fWidth, desc.fHeight, desc.fConfig, texels.begin()->fPixels, texels.begin()->fRowBytes)) { tex->unref(); |