Fix single-plane views of YCbCr formats
Image views can select a single plane from a multi-planar format, so
make sure we use the original plane aspect instead of assuming the
color aspect.
Bug: b/132437008
Tests: dEQP-VK.*ycbcr*
Change-Id: I81c4c8b05e894c5f48d5718e912d5f6ee747a7e5
Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/31617
Presubmit-Ready: Nicolas Capens <nicolascapens@google.com>
Tested-by: Nicolas Capens <nicolascapens@google.com>
Kokoro-Presubmit: kokoro <noreply+kokoro@google.com>
Reviewed-by: Ben Clayton <bclayton@google.com>
diff --git a/src/Vulkan/VkDescriptorSetLayout.cpp b/src/Vulkan/VkDescriptorSetLayout.cpp
index afd621c..917e4df 100644
--- a/src/Vulkan/VkDescriptorSetLayout.cpp
+++ b/src/Vulkan/VkDescriptorSetLayout.cpp
@@ -368,7 +368,7 @@
{
int level = sw::clamp(mipmapLevel, 0, (int)subresourceRange.levelCount - 1); // Level within the image view
- VkImageAspectFlagBits aspect = VK_IMAGE_ASPECT_COLOR_BIT;
+ VkImageAspectFlagBits aspect = static_cast<VkImageAspectFlagBits>(imageView->getSubresourceRange().aspectMask);
sw::Mipmap &mipmap = texture->mipmap[mipmapLevel];
if(imageView->getType() == VK_IMAGE_VIEW_TYPE_CUBE)
