From 8540e001eafa9bdb211001301f01adfcd1d72789 Mon Sep 17 00:00:00 2001 From: egdaniel Date: Wed, 19 Aug 2020 13:18:25 -0400 Subject: [PATCH] Remove use of ctors on Skia Vulkan struct (#20630) Skia is removing the ctors on these structs so removing them. --- .../fuchsia/flutter/vulkan_surface.cc | 21 ++++++++++++------- vulkan/vulkan_swapchain.cc | 14 ++++++------- 2 files changed, 19 insertions(+), 16 deletions(-) diff --git a/shell/platform/fuchsia/flutter/vulkan_surface.cc b/shell/platform/fuchsia/flutter/vulkan_surface.cc index 0d117047e7e..1b9961ceca0 100644 --- a/shell/platform/fuchsia/flutter/vulkan_surface.cc +++ b/shell/platform/fuchsia/flutter/vulkan_surface.cc @@ -332,14 +332,19 @@ bool VulkanSurface::SetupSkiaSurface(sk_sp context, return false; } - const GrVkImageInfo image_info = { - vulkan_image_.vk_image, // image - {vk_memory_, 0, memory_reqs.size, 0}, // alloc - image_create_info.tiling, // tiling - image_create_info.initialLayout, // layout - image_create_info.format, // format - image_create_info.mipLevels, // level count - }; + GrVkAlloc alloc; + alloc.fMemory = vk_memory_; + alloc.fOffset = 0; + alloc.fSize = memory_reqs.size; + alloc.fFlags = 0; + + GrVkImageInfo image_info; + image_info.fImage = vulkan_image_.vk_image; + image_info.fAlloc = alloc; + image_info.fImageTiling = image_create_info.tiling; + image_info.fImageLayout = image_create_info.initialLayout; + image_info.fFormat = image_create_info.format; + image_info.fLevelCount = image_create_info.mipLevels; GrBackendRenderTarget sk_render_target(size.width(), size.height(), 0, image_info); diff --git a/vulkan/vulkan_swapchain.cc b/vulkan/vulkan_swapchain.cc index 1ef045e64df..f5a85c25df0 100644 --- a/vulkan/vulkan_swapchain.cc +++ b/vulkan/vulkan_swapchain.cc @@ -222,14 +222,12 @@ sk_sp VulkanSwapchain::CreateSkiaSurface( return nullptr; } - const GrVkImageInfo image_info = { - image, // image - GrVkAlloc(), // alloc - VK_IMAGE_TILING_OPTIMAL, // tiling - VK_IMAGE_LAYOUT_UNDEFINED, // layout - surface_format_.format, // format - 1, // level count - }; + GrVkImageInfo image_info; + image_info.fImage = image; + image_info.fImageTiling = VK_IMAGE_TILING_OPTIMAL; + image_info.fImageLayout = VK_IMAGE_LAYOUT_UNDEFINED; + image_info.fFormat = surface_format_.format; + image_info.fLevelCount = 1; // TODO(chinmaygarde): Setup the stencil buffer and the sampleCnt. GrBackendRenderTarget backend_render_target(size.fWidth, size.fHeight, 0,