Vulkan: Clean up ImageLayout enum.

src/libANGLE/renderer/vulkan/ContextVk.cpp

@@ -1365,7 +1365,7 @@ ANGLE_INLINE angle::Result ContextVk::handleDirtyTexturesImpl(
         if (textureVk->isBoundAsImageTexture(mState.getContextID()))
         {
             textureLayout = executable->isCompute() ? vk::ImageLayout::ComputeShaderWrite
-                                                    : vk::ImageLayout::AllGraphicsShadersReadWrite;
+                                                    : vk::ImageLayout::AllGraphicsShadersWrite;
         }
         else
         {
@@ -3924,7 +3924,7 @@ angle::Result ContextVk::updateActiveImages(const gl::Context *context,
             // This is accessed by multiple shaders
             if (shaderBits.any())
             {
-                imageLayout = vk::ImageLayout::AllGraphicsShadersReadWrite;
+                imageLayout = vk::ImageLayout::AllGraphicsShadersWrite;
             }
             else
             {
@@ -3933,7 +3933,7 @@ angle::Result ContextVk::updateActiveImages(const gl::Context *context,
         }
         else
         {
-            imageLayout = vk::ImageLayout::AllGraphicsShadersReadWrite;
+            imageLayout = vk::ImageLayout::AllGraphicsShadersWrite;
         }
         VkImageAspectFlags aspectFlags = image->getAspectFlags();
 

src/libANGLE/renderer/vulkan/TextureVk.cpp

@@ -1108,7 +1108,7 @@ angle::Result TextureVk::setEGLImageTarget(const gl::Context *context,
     uint32_t rendererQueueFamilyIndex = renderer->getQueueFamilyIndex();
     if (mImage->isQueueChangeNeccesary(rendererQueueFamilyIndex))
     {
-        vk::ImageLayout newLayout = vk::ImageLayout::AllGraphicsShadersReadWrite;
+        vk::ImageLayout newLayout = vk::ImageLayout::AllGraphicsShadersWrite;
         if (mImage->getUsage() & VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT)
         {
             newLayout = vk::ImageLayout::ColorAttachment;

src/libANGLE/renderer/vulkan/vk_helpers.cpp

@@ -315,7 +315,7 @@ constexpr angle::PackedEnumMap<ImageLayout, ImageMemoryBarrierData> kImageMemory
         },
     },
     {
-        ImageLayout::AllGraphicsShadersReadWrite,
+        ImageLayout::AllGraphicsShadersWrite,
         {
             VK_IMAGE_LAYOUT_GENERAL,
             kAllShadersPipelineStageFlags,

src/libANGLE/renderer/vulkan/vk_helpers.h

@@ -1057,28 +1057,28 @@ static constexpr uint32_t kInvalidAttachmentIndex = -1;
 // are the same, they may occasionally be BOTTOM_OF_PIPE and TOP_OF_PIPE respectively.
 enum class ImageLayout
 {
-    Undefined                   = 0,
-    ExternalPreInitialized      = 1,
-    ExternalShadersReadOnly     = 2,
-    ExternalShadersWrite        = 3,
-    TransferSrc                 = 4,
-    TransferDst                 = 5,
-    VertexShaderReadOnly        = 6,
-    VertexShaderWrite           = 7,
-    GeometryShaderReadOnly      = 8,
-    GeometryShaderWrite         = 9,
-    FragmentShaderReadOnly      = 10,
-    FragmentShaderWrite         = 11,
-    ComputeShaderReadOnly       = 12,
-    ComputeShaderWrite          = 13,
-    AllGraphicsShadersReadOnly  = 14,
-    AllGraphicsShadersReadWrite = 15,
-    ColorAttachment             = 16,
-    DepthStencilAttachment      = 17,
-    Present                     = 18,
-
-    InvalidEnum = 19,
-    EnumCount   = 19,
+    Undefined = 0,
+    ExternalPreInitialized,
+    ExternalShadersReadOnly,
+    ExternalShadersWrite,
+    TransferSrc,
+    TransferDst,
+    VertexShaderReadOnly,
+    VertexShaderWrite,
+    GeometryShaderReadOnly,
+    GeometryShaderWrite,
+    FragmentShaderReadOnly,
+    FragmentShaderWrite,
+    ComputeShaderReadOnly,
+    ComputeShaderWrite,
+    AllGraphicsShadersReadOnly,
+    AllGraphicsShadersWrite,
+    ColorAttachment,
+    DepthStencilAttachment,
+    Present,
+
+    InvalidEnum,
+    EnumCount = InvalidEnum,
 };
 
 VkImageLayout ConvertImageLayoutToVkImageLayout(ImageLayout imageLayout);