Remove use of ctors on Skia Vulkan struct (#20630)

Skia is removing the ctors on these structs so removing them.
This commit is contained in:
egdaniel 2020-08-19 13:18:25 -04:00 committed by GitHub
parent 8177937133
commit 8540e001ea
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 16 deletions

View File

@ -332,14 +332,19 @@ bool VulkanSurface::SetupSkiaSurface(sk_sp<GrDirectContext> 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);

View File

@ -222,14 +222,12 @@ sk_sp<SkSurface> 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,