diff options
| author | Yahan Zhou <yahan@google.com> | 2022-05-02 16:50:17 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-05-02 16:50:17 +0000 |
| commit | 29aa36893f625412670db4bdb121756e3f57781d (patch) | |
| tree | 027b2297febb8299d6bb2ec8cb885b8f9033f38b | |
| parent | cbd415444b238a01455b67767060d91e6bda2563 (diff) | |
| parent | ff3983584fbc88b2aca0910e1923ce10ed21138d (diff) | |
| download | goldfish-opengl-29aa36893f625412670db4bdb121756e3f57781d.tar.gz | |
Merge "Add more format features for AHB in Vulkan" into tm-dev am: ff3983584f
Original change: https://googleplex-android-review.googlesource.com/c/device/generic/goldfish-opengl/+/18010825
Change-Id: Iebdf89a58530e2e0b40f9ffe90ea7395cb4cb22f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | system/vulkan_enc/AndroidHardwareBuffer.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/system/vulkan_enc/AndroidHardwareBuffer.cpp b/system/vulkan_enc/AndroidHardwareBuffer.cpp index a40a3a73..40360a25 100644 --- a/system/vulkan_enc/AndroidHardwareBuffer.cpp +++ b/system/vulkan_enc/AndroidHardwareBuffer.cpp @@ -86,9 +86,16 @@ VkResult getAndroidHardwareBufferPropertiesANDROID( // VK_FORMAT_FEATURE_SAMPLED_IMAGE_FILTER_LINEAR_BIT and // VK_FORMAT_FEATURE_SAMPLED_IMAGE_YCBCR_CONVERSION_LINEAR_FILTER_BIT. + // org.skia.skqp.SkQPRunner#UnitTest_VulkanHardwareBuffer* requires the following: + // VK_FORMAT_FEATURE_TRANSFER_SRC_BIT + // VK_FORMAT_FEATURE_TRANSFER_DST_BIT + // VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BIT ahbFormatProps->formatFeatures = VK_FORMAT_FEATURE_SAMPLED_IMAGE_BIT | - VK_FORMAT_FEATURE_MIDPOINT_CHROMA_SAMPLES_BIT; + VK_FORMAT_FEATURE_MIDPOINT_CHROMA_SAMPLES_BIT | + VK_FORMAT_FEATURE_TRANSFER_SRC_BIT | + VK_FORMAT_FEATURE_TRANSFER_DST_BIT | + VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BIT; // "Implementations may not always be able to determine the color model, // numerical range, or chroma offsets of the image contents, so the values in |