diff --git a/.pick_status.json b/.pick_status.json index 9b1f852abe9..a06246a7db6 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -54,7 +54,7 @@ "description": "nvk: Fix uninitialized var warnings in host_copy", "nominated": true, "nomination_type": 2, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "6c5420cd30a97096ecb6854c70b923bf990915c6", "notes": null diff --git a/src/nouveau/vulkan/nvk_host_copy.c b/src/nouveau/vulkan/nvk_host_copy.c index 2ef551dd2e5..f522333bed9 100644 --- a/src/nouveau/vulkan/nvk_host_copy.c +++ b/src/nouveau/vulkan/nvk_host_copy.c @@ -180,7 +180,7 @@ nvk_CopyMemoryToImageEXT(VkDevice _device, { VK_FROM_HANDLE(nvk_image, dst_image, info->dstImage); - VkResult result; + VkResult result = VK_SUCCESS; /* From the EXT spec: * VK_HOST_IMAGE_COPY_MEMCPY_EXT specifies that no memory layout swizzling is @@ -306,7 +306,7 @@ nvk_CopyImageToMemoryEXT(VkDevice _device, { VK_FROM_HANDLE(nvk_image, image, info->srcImage); - VkResult result; + VkResult result = VK_SUCCESS; const bool use_memcpy = info->flags & VK_HOST_IMAGE_COPY_MEMCPY_EXT; @@ -544,7 +544,7 @@ nvk_CopyImageToImageEXT(VkDevice _device, VK_FROM_HANDLE(nvk_image, src, pCopyImageToImageInfo->srcImage); VK_FROM_HANDLE(nvk_image, dst, pCopyImageToImageInfo->dstImage); - VkResult result; + VkResult result = VK_SUCCESS; for (unsigned r = 0; r < pCopyImageToImageInfo->regionCount; r++) { result = nvk_copy_image_to_image(device, src, dst,