From cf942c4ef750712b624867cbb2217c14857db3c6 Mon Sep 17 00:00:00 2001 From: bsalomon Date: Fri, 29 Apr 2016 18:30:06 -0700 Subject: 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 | 4 ++-- src/gpu/vk/GrVkImage.h | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src/gpu') diff --git a/src/gpu/vk/GrVkGpu.cpp b/src/gpu/vk/GrVkGpu.cpp index 93eb4a8e0c..33b53b1bcd 100644 --- a/src/gpu/vk/GrVkGpu.cpp +++ b/src/gpu/vk/GrVkGpu.cpp @@ -283,7 +283,7 @@ bool GrVkGpu::onWritePixels(GrSurface* surface, 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 @@ bool GrVkGpu::uploadTexDataOptimal(GrVkTexture* tex, 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 }; } diff --git a/src/gpu/vk/GrVkImage.h b/src/gpu/vk/GrVkImage.h index d54f393641..f040c1057f 100644 --- a/src/gpu/vk/GrVkImage.h +++ b/src/gpu/vk/GrVkImage.h @@ -37,11 +37,11 @@ public: : INHERITED() , fImage(VK_NULL_HANDLE) , fAlloc(VK_NULL_HANDLE) - , fFlags(kNo_Flags) - , fFormat(VK_FORMAT_UNDEFINED) {} + , fFormat(VK_FORMAT_UNDEFINED) + , fFlags(kNo_Flags) {} Resource(VkImage image, VkDeviceMemory alloc, uint32_t flags, VkFormat format) - : fImage(image), fAlloc(alloc), fFlags(flags), fFormat(format) {} + : fImage(image), fAlloc(alloc), fFormat(format), fFlags(flags) {} ~Resource() override {} -- cgit v1.2.3