Vulkan: Set new layout based on VkImageUsageFlags

src/libANGLE/renderer/vulkan/TextureVk.cpp

@@ -1070,10 +1070,24 @@ angle::Result TextureVk::setEGLImageTarget(const gl::Context *context,
     if (mImage->isQueueChangeNeccesary(rendererQueueFamilyIndex))
     {
         vk::CommandBuffer *commandBuffer = nullptr;
+        vk::ImageLayout newLayout        = vk::ImageLayout::AllGraphicsShadersReadWrite;
+        if (mImage->getUsage() & VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT)
+        {
+            newLayout = vk::ImageLayout::ColorAttachment;
+        }
+        else if (mImage->getUsage() & VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT)
+        {
+            newLayout = vk::ImageLayout::DepthStencilAttachment;
+        }
+        else if (mImage->getUsage() &
+                 (VK_IMAGE_USAGE_SAMPLED_BIT | VK_IMAGE_USAGE_INPUT_ATTACHMENT_BIT))
+        {
+            newLayout = vk::ImageLayout::AllGraphicsShadersReadOnly;
+        }
+
         ANGLE_TRY(contextVk->endRenderPassAndGetCommandBuffer(&commandBuffer));
-        mImage->changeLayoutAndQueue(VK_IMAGE_ASPECT_COLOR_BIT,
-                                     vk::ImageLayout::AllGraphicsShadersReadWrite,
-                                     rendererQueueFamilyIndex, commandBuffer);
+        mImage->changeLayoutAndQueue(VK_IMAGE_ASPECT_COLOR_BIT, newLayout, rendererQueueFamilyIndex,
+                                     commandBuffer);
     }
 
     return angle::Result::Continue;

src/libANGLE/renderer/vulkan/vk_helpers.cpp

@@ -2459,6 +2459,7 @@ ImageHelper::ImageHelper(ImageHelper &&other)
       mDeviceMemory(std::move(other.mDeviceMemory)),
       mImageType(other.mImageType),
       mTilingMode(other.mTilingMode),
+      mUsage(other.mUsage),
       mExtents(other.mExtents),
       mFormat(other.mFormat),
       mSamples(other.mSamples),
@@ -2491,6 +2492,7 @@ void ImageHelper::resetCachedProperties()
     mSamples                     = 1;
     mSerial                      = rx::kZeroSerial;
     mTilingMode                  = VK_IMAGE_TILING_OPTIMAL;
+    mUsage                       = 0;
     mCurrentLayout               = ImageLayout::Undefined;
     mCurrentQueueFamilyIndex     = std::numeric_limits<uint32_t>::max();
     mLastNonShaderReadOnlyLayout = ImageLayout::Undefined;
@@ -2550,6 +2552,7 @@ angle::Result ImageHelper::initExternal(Context *context,
     mMaxLevel   = maxLevel;
     mLevelCount = mipLevels;
     mLayerCount = layerCount;
+    mUsage      = usage;
 
     // Validate that mLayerCount is compatible with the texture type
     ASSERT(textureType != gl::TextureType::_3D || mLayerCount == 1);
@@ -2569,7 +2572,7 @@ angle::Result ImageHelper::initExternal(Context *context,
     imageInfo.arrayLayers           = mLayerCount;
     imageInfo.samples               = gl_vk::GetSamples(samples);
     imageInfo.tiling                = mTilingMode;
-    imageInfo.usage                 = usage;
+    imageInfo.usage                 = mUsage;
     imageInfo.sharingMode           = VK_SHARING_MODE_EXCLUSIVE;
     imageInfo.queueFamilyIndexCount = 0;
     imageInfo.pQueueFamilyIndices   = nullptr;

src/libANGLE/renderer/vulkan/vk_helpers.h

@@ -1127,7 +1127,8 @@ class ImageHelper final : public Resource, public angle::Subject
     const DeviceMemory &getDeviceMemory() const { return mDeviceMemory; }
 
     void setTilingMode(VkImageTiling tilingMode) { mTilingMode = tilingMode; }
-    VkImageTiling getTilingMode() { return mTilingMode; }
+    VkImageTiling getTilingMode() const { return mTilingMode; }
+    VkImageUsageFlags getUsage() const { return mUsage; }
     VkImageType getType() const { return mImageType; }
     const VkExtent3D &getExtents() const { return mExtents; }
     uint32_t getLayerCount() const { return mLayerCount; }
@@ -1501,6 +1502,7 @@ class ImageHelper final : public Resource, public angle::Subject
     // Image properties.
     VkImageType mImageType;
     VkImageTiling mTilingMode;
+    VkImageUsageFlags mUsage;
     VkExtent3D mExtents;
     const Format *mFormat;
     GLint mSamples;