commit cf942c4ef750712b624867cbb2217c14857db3c6
author bsalomon <bsalomon@google.com> Fri Apr 29 18:30:06 2016 -0700
committer Commit bot <commit-bot@chromium.org> Fri Apr 29 18:30:06 2016 -0700
tree bcf1d0c3b7c3d60cf0af1cc9f839460e2c54f5a7
parent 572f879b6163e1a4fb790a7f63401a6cf0ade1d2

Fix gcc warnings in Vulkan backend

BUG=skia:
TBR=jvanverth@google.com
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1935903002

Review-Url: https://codereview.chromium.org/1935903002

src/gpu/vk/GrVkGpu.cpp

diff --git a/src/gpu/vk/GrVkGpu.cpp b/src/gpu/vk/GrVkGpu.cpp
index 93eb4a8..33b53b1 100644
--- a/src/gpu/vk/GrVkGpu.cpp
+++ b/src/gpu/vk/GrVkGpu.cpp
@@ -283,7 +283,7 @@
             success = this->uploadTexDataLinear(vkTex, left, top, width, height, config,
                                                 texels.begin()->fPixels, texels.begin()->fRowBytes);
         } else {
-            uint32_t mipLevels = texels.count();
+            int mipLevels = texels.count();
             if (vkTex->texturePriv().maxMipMapLevel() != mipLevels) {
                 if (!vkTex->reallocForMipmap(this, mipLevels)) {
                     return false;
@@ -459,7 +459,7 @@
         region.bufferOffset = individualMipOffsets[currentMipLevel];
         region.bufferRowLength = currentWidth;
         region.bufferImageHeight = currentHeight;
-        region.imageSubresource = { VK_IMAGE_ASPECT_COLOR_BIT, currentMipLevel, 0, 1 };
+        region.imageSubresource = { VK_IMAGE_ASPECT_COLOR_BIT, SkToU32(currentMipLevel), 0, 1 };
         region.imageOffset = { left, top, 0 };
         region.imageExtent = { (uint32_t)currentWidth, (uint32_t)currentHeight, 1 };
     }