AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add temporary constructor to GrVkImageInfo to allow Chrome to compile.

Browse Source 
TBR: egdaniel@google.com


Change-Id: Iae8e41ac1f6ba1c77846284f5649592250c206ae
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/228559
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>
This commit is contained in:
Brian Salomon 2019-07-19 09:42:06 -04:00 committed by Skia Commit-Bot
parent 0c8582e48a
commit e78454e802
1 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
include/gpu/vk/GrVkTypes.h
View File

@ -149,9 +149,14 @@ struct GrVkImageInfo {
, fProtected(GrProtected::kNo)
, fYcbcrConversionInfo() {}
GrVkImageInfo(VkImage image, GrVkAlloc alloc, VkImageTiling imageTiling, VkImageLayout layout,
VkFormat format, uint32_t levelCount, GrProtected isProtected = GrProtected::kNo,
uint32_t currentQueueFamily = VK_QUEUE_FAMILY_IGNORED,
GrVkImageInfo(VkImage image,
GrVkAlloc alloc,
VkImageTiling imageTiling,
VkImageLayout layout,
VkFormat format,
uint32_t levelCount,
uint32_t currentQueueFamily,
GrProtected isProtected,
GrVkYcbcrConversionInfo ycbcrConversionInfo = GrVkYcbcrConversionInfo())
: fImage(image)
, fAlloc(alloc)
@ -163,6 +168,18 @@ struct GrVkImageInfo {
, fProtected(isProtected)
, fYcbcrConversionInfo(ycbcrConversionInfo) {}
// Temporary until Chrome is updated to use above constructor
GrVkImageInfo(VkImage image, GrVkAlloc alloc,
VkImageTiling imageTiling,
VkImageLayout layout,
VkFormat format,
uint32_t levelCount,
uint32_t currentQueueFamily = VK_QUEUE_FAMILY_IGNORED,
GrVkYcbcrConversionInfo ycbcrConversionInfo = GrVkYcbcrConversionInfo(),
GrProtected isProtected = GrProtected::kNo)
: GrVkImageInfo(image, alloc, imageTiling, layout, format, levelCount,
currentQueueFamily, isProtected, ycbcrConversionInfo) {}
GrVkImageInfo(const GrVkImageInfo& info, VkImageLayout layout)
: fImage(info.fImage)
, fAlloc(info.fAlloc)