commit d3312595c86289113ea5994234844388523499e8
author bsalomon <bsalomon@google.com> Fri Mar 04 07:06:43 2016 -0800
committer Commit bot <commit-bot@chromium.org> Fri Mar 04 07:06:43 2016 -0800
tree 73f596e64d80fa963952d0367de1bf5c2edd2da4
parent 0032a302ca8cddc7f6ca500b8096afa4888fc614

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

src/gpu/vk/GrVkGpu.cpp

diff --git a/src/gpu/vk/GrVkGpu.cpp b/src/gpu/vk/GrVkGpu.cpp
index 4f4d7c9..a208aed 100644
--- a/src/gpu/vk/GrVkGpu.cpp
+++ b/src/gpu/vk/GrVkGpu.cpp
@@ -542,8 +542,7 @@
     }
 
     // TODO: We're ignoring MIP levels here.
-    if (!texels.empty()) {
-        SkASSERT(texels.begin()->fPixels);
+    if (!texels.empty() && texels.begin()->fPixels) {
         if (!this->uploadTexData(tex, 0, 0, desc.fWidth, desc.fHeight, desc.fConfig,
                                  texels.begin()->fPixels, texels.begin()->fRowBytes)) {
             tex->unref();