commit 8837f2e7f4f03e648834f158da717829a8af27bb
author Jason Macnak <natsu@google.com> Tue Dec 08 18:54:49 2020 -0800
committer swiftshader-scoped@luci-project-accounts.iam.gserviceaccount.com <swiftshader-scoped@luci-project-accounts.iam.gserviceaccount.com> Wed Dec 09 17:13:05 2020 +0000
tree 475a444cf59f1ba6c257fe2907c1c31465a47c21
parent eb597ff5b7f6a78eb7601b4c32e8d43b119ef3e8

Update AHB default YUV dataspace to YCBCR_709

Eventually, this should probably be fetched from the
gralloc buffer metadata using
Gralloc4::Get(android::gralloc4::MetadataType_Dataspace)

Bug: b/175132241
Test: launch Cuttlefish w/ SwANGLE and open Camera
Change-Id: I83cde939e04f9752f71df5c65fe62a0e2782ecc2
Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/51050
Presubmit-Ready: Jason Macnak <natsu@google.com>
Reviewed-by: Nicolas Capens <nicolascapens@google.com>
Tested-by: Jason Macnak <natsu@google.com>
Commit-Queue: Jason Macnak <natsu@google.com>

src/Vulkan/VkDeviceMemoryExternalAndroid.cpp

diff --git a/src/Vulkan/VkDeviceMemoryExternalAndroid.cpp b/src/Vulkan/VkDeviceMemoryExternalAndroid.cpp
index 8030544..7463478 100644
--- a/src/Vulkan/VkDeviceMemoryExternalAndroid.cpp
+++ b/src/Vulkan/VkDeviceMemoryExternalAndroid.cpp
@@ -423,7 +423,7 @@
 	pFormat->externalFormat = ahbDesc.format;
 	pFormat->formatFeatures = GetVkFormatFeaturesFromAHBFormat(ahbDesc.format);
 	pFormat->samplerYcbcrConversionComponents = { VK_COMPONENT_SWIZZLE_IDENTITY, VK_COMPONENT_SWIZZLE_IDENTITY, VK_COMPONENT_SWIZZLE_IDENTITY, VK_COMPONENT_SWIZZLE_IDENTITY };
-	pFormat->suggestedYcbcrModel = VK_SAMPLER_YCBCR_MODEL_CONVERSION_RGB_IDENTITY;
+	pFormat->suggestedYcbcrModel = VK_SAMPLER_YCBCR_MODEL_CONVERSION_YCBCR_709;
 	pFormat->suggestedYcbcrRange = VK_SAMPLER_YCBCR_RANGE_ITU_FULL;
 	pFormat->suggestedXChromaOffset = VK_CHROMA_LOCATION_COSITED_EVEN;
 	pFormat->suggestedYChromaOffset = VK_CHROMA_LOCATION_COSITED_EVEN;