Vulkan: Set external image's tiling mode based on AHB usage flags

src/libANGLE/renderer/vulkan/android/HardwareBufferImageSiblingVkAndroid.cpp

@@ -14,9 +14,25 @@
 #include "libANGLE/renderer/vulkan/DisplayVk.h"
 #include "libANGLE/renderer/vulkan/RendererVk.h"
 
+#include <android/hardware_buffer.h>
+
 namespace rx
 {
 
+namespace
+{
+VkImageTiling AhbDescUsageToVkImageTiling(AHardwareBuffer_Desc *ahbDescription)
+{
+    if ((ahbDescription->usage & AHARDWAREBUFFER_USAGE_CPU_READ_MASK) != 0 ||
+        (ahbDescription->usage & AHARDWAREBUFFER_USAGE_CPU_WRITE_MASK) != 0)
+    {
+        return VK_IMAGE_TILING_LINEAR;
+    }
+
+    return VK_IMAGE_TILING_OPTIMAL;
+}
+}  // namespace
+
 HardwareBufferImageSiblingVkAndroid::HardwareBufferImageSiblingVkAndroid(EGLClientBuffer buffer)
     : mBuffer(buffer),
       mFormat(GL_NONE),
@@ -98,6 +114,10 @@ angle::Result HardwareBufferImageSiblingVkAndroid::initImpl(DisplayVk *displayVk
     ANGLE_VK_TRY(displayVk, vkGetAndroidHardwareBufferPropertiesANDROID(device, hardwareBuffer,
                                                                         &bufferProperties));
 
+    AHardwareBuffer_Desc ahbDescription;
+    AHardwareBuffer_describe(hardwareBuffer, &ahbDescription);
+    VkImageTiling imageTilingMode = AhbDescUsageToVkImageTiling(&ahbDescription);
+
     const vk::Format &vkFormat       = renderer->getFormat(internalFormat);
     const angle::Format &imageFormat = vkFormat.actualImageFormat();
     bool isDepthOrStencilFormat      = imageFormat.depthBits > 0 || imageFormat.stencilBits > 0;
@@ -126,6 +146,7 @@ angle::Result HardwareBufferImageSiblingVkAndroid::initImpl(DisplayVk *displayVk
     gl_vk::GetExtent(mSize, &vkExtents);
 
     mImage = new vk::ImageHelper();
+    mImage->setTilingMode(imageTilingMode);
     ANGLE_TRY(mImage->initExternal(
         displayVk, gl::TextureType::_2D, vkExtents, vkFormat, 1, usage, vk::kVkImageCreateFlagsNone,
         vk::ImageLayout::ExternalPreInitialized, &externalMemoryImageCreateInfo, 0, 0, 1, 1));

src/libANGLE/renderer/vulkan/vk_helpers.cpp

@@ -2451,6 +2451,7 @@ ImageHelper::ImageHelper(ImageHelper &&other)
     : mImage(std::move(other.mImage)),
       mDeviceMemory(std::move(other.mDeviceMemory)),
       mImageType(other.mImageType),
+      mTilingMode(other.mTilingMode),
       mExtents(other.mExtents),
       mFormat(other.mFormat),
       mSamples(other.mSamples),
@@ -2482,6 +2483,7 @@ void ImageHelper::resetCachedProperties()
     mFormat                      = nullptr;
     mSamples                     = 1;
     mSerial                      = rx::kZeroSerial;
+    mTilingMode                  = VK_IMAGE_TILING_OPTIMAL;
     mCurrentLayout               = ImageLayout::Undefined;
     mCurrentQueueFamilyIndex     = std::numeric_limits<uint32_t>::max();
     mLastNonShaderReadOnlyLayout = ImageLayout::Undefined;
@@ -2559,7 +2561,7 @@ angle::Result ImageHelper::initExternal(Context *context,
     imageInfo.mipLevels             = mipLevels;
     imageInfo.arrayLayers           = mLayerCount;
     imageInfo.samples               = gl_vk::GetSamples(samples);
-    imageInfo.tiling                = VK_IMAGE_TILING_OPTIMAL;
+    imageInfo.tiling                = mTilingMode;
     imageInfo.usage                 = usage;
     imageInfo.sharingMode           = VK_SHARING_MODE_EXCLUSIVE;
     imageInfo.queueFamilyIndexCount = 0;

src/libANGLE/renderer/vulkan/vk_helpers.h

@@ -1123,6 +1123,7 @@ class ImageHelper final : public Resource, public angle::Subject
     const Image &getImage() const { return mImage; }
     const DeviceMemory &getDeviceMemory() const { return mDeviceMemory; }
 
+    void setTilingMode(VkImageTiling tilingMode) { mTilingMode = tilingMode; }
     VkImageType getType() const { return mImageType; }
     const VkExtent3D &getExtents() const { return mExtents; }
     uint32_t getLayerCount() const { return mLayerCount; }
@@ -1474,6 +1475,7 @@ class ImageHelper final : public Resource, public angle::Subject
 
     // Image properties.
     VkImageType mImageType;
+    VkImageTiling mTilingMode;
     VkExtent3D mExtents;
     const Format *mFormat;
     GLint mSamples;