From fb16d6bb8b2dc8bc4efb883da3f54653889eb695 Mon Sep 17 00:00:00 2001 From: Brian Osman Date: Fri, 2 Mar 2018 09:31:37 -0500 Subject: [PATCH] Revert "Update initialization for GrVkAlloc for Skia change (#4738)" (#4740) This reverts commit e48e3e101920357dc3f12af1e9ef8c323102ed03. --- content_handler/vulkan_surface.cc | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/content_handler/vulkan_surface.cc b/content_handler/vulkan_surface.cc index 84d0dfbd56c..1983a910dab 100644 --- a/content_handler/vulkan_surface.cc +++ b/content_handler/vulkan_surface.cc @@ -264,17 +264,9 @@ bool VulkanSurface::SetupSkiaSurface(sk_sp context, return false; } - // TODO: Once flutter rolls Skia, just use the GrVkAlloc ctor directly in the - // GrVkImageInfo struct. - GrVkAlloc gr_vk_alloc; - gr_vk_alloc.fMemory = vk_memory_; - gr_vk_alloc.fOffset = 0; - gr_vk_alloc.fSize = memory_reqs.size; - gr_vk_alloc.fFlags = 0; - const GrVkImageInfo image_info = { .fImage = vk_image_, - .fAlloc = gr_vk_alloc, + .fAlloc = {vk_memory_, 0, memory_reqs.size, 0}, .fImageTiling = image_create_info.tiling, .fImageLayout = image_create_info.initialLayout, .fFormat = image_create_info.format,