Fix vulkan resolve

src/gpu/vk/GrVkGpu.cpp

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "GrVkGpu.h"
 
 #include "GrContextOptions.h"
@@ skipping 348 matching lines @@
                 }
             }
             success = this->uploadTexDataOptimal(vkTex, left, top, width, height, config, texels);
         }
     }
 
     return success;
 }
 
 void GrVkGpu::onResolveRenderTarget(GrRenderTarget* target) {
-    if (target->needsResolve()) {
-        SkASSERT(target->numColorSamples() > 1);
-
+    if (target->needsResolve() && target->numColorSamples() > 1) {
         GrVkRenderTarget* rt = static_cast<GrVkRenderTarget*>(target);
         SkASSERT(rt->msaaImage());
 
         // Flip rect if necessary
         SkIRect srcVkRect = rt->getResolveRect();
 
         if (kBottomLeft_GrSurfaceOrigin == rt->origin()) {
             srcVkRect.fTop = rt->height() - rt->getResolveRect().fBottom;
             srcVkRect.fBottom =  rt->height() - rt->getResolveRect().fTop;
         }
@@ skipping 1222 matching lines @@
     }
 
     // Currently it is fine for us to always pass in 1 for the clear count even if no attachment
     // uses it. In the current state, we also only use the LOAD_OP_CLEAR for the color attachment
     // which is always at the first attachment.
     fCurrentCmdBuffer->beginRenderPass(this, renderPass, 1, colorClear, *target, *pBounds, true);
     fCurrentCmdBuffer->executeCommands(this, buffer);
     fCurrentCmdBuffer->endRenderPass(this);
 }