commit e04c5b4b322d68dfbf1d5630f7f74507e642877f
author Bill Hollings <bill.hollings@brenwill.com> Thu Oct 15 08:42:16 2020 -0400
committer GitHub <noreply@github.com> Thu Oct 15 08:42:16 2020 -0400
tree 39d1f6349fed2bea6541ad90a7881d8a64e9d517
parent ddc80a2a300ce14d90d57fa91b4df5694f526ca5
parent 92de8f0137bc53efa0408ad3dfb6e7deba34212a

Merge pull request #1105 from cdavis5e/ycbcr-single-plane-formats

MVKSamplerYcbcrConversion: Always make sure there is one plane.

MoltenVK/MoltenVK/GPUObjects/MVKImage.mm

diff --git a/MoltenVK/MoltenVK/GPUObjects/MVKImage.mm b/MoltenVK/MoltenVK/GPUObjects/MVKImage.mm
index d742c73..f213f47 100644
--- a/MoltenVK/MoltenVK/GPUObjects/MVKImage.mm
+++ b/MoltenVK/MoltenVK/GPUObjects/MVKImage.mm
@@ -1823,7 +1823,7 @@
 
 MVKSamplerYcbcrConversion::MVKSamplerYcbcrConversion(MVKDevice* device, const VkSamplerYcbcrConversionCreateInfo* pCreateInfo) : MVKVulkanAPIDeviceObject(device) {
 	MVKPixelFormats* pixFmts = getPixelFormats();
-	_planes = pixFmts->getChromaSubsamplingPlaneCount(pCreateInfo->format);
+	_planes = std::max(pixFmts->getChromaSubsamplingPlaneCount(pCreateInfo->format), (uint8_t)1u);
 	_bpc = pixFmts->getChromaSubsamplingComponentBits(pCreateInfo->format);
 	_resolution = pixFmts->getChromaSubsamplingResolution(pCreateInfo->format);
 	_chroma_filter = getSpvMinMagFilterFromVkFilter(pCreateInfo->chromaFilter);