Vulkan: Handle VK image being both a GL texture and GL image

src/libANGLE/Texture.h

@@ -135,6 +135,7 @@ class TextureState final : private angle::NonCopyable
     GLenum getUsage() const { return mUsage; }
     GLenum getDepthStencilTextureMode() const { return mDepthStencilTextureMode; }
     bool isStencilMode() const { return mDepthStencilTextureMode == GL_STENCIL_INDEX; }
+    bool isBoundAsImageTexture() const { return mBoundAsImageTexture; }
 
     // Returns the desc of the base level. Only valid for cube-complete/mip-complete textures.
     const ImageDesc &getBaseLevelDesc() const;

src/libANGLE/renderer/vulkan/ContextVk.cpp

@@ -1219,13 +1219,21 @@ ANGLE_INLINE angle::Result ContextVk::handleDirtyTexturesImpl(
         // lingering staged updates in its staging buffer for unused texture mip levels or
         // layers. Therefore we can't verify it has no staged updates right here.
 
-        vk::ImageLayout textureLayout = vk::ImageLayout::AllGraphicsShadersReadOnly;
-        if (mProgram->getState().isCompute())
+        // Select the appropriate vk::ImageLayout depending on whether the texture is also bound as
+        // a GL image, and whether the program is a compute or graphics shader.
+        vk::ImageLayout textureLayout;
+        if (textureVk->isBoundAsImageTexture())
         {
-            textureLayout = vk::ImageLayout::ComputeShaderReadOnly;
+            textureLayout = mProgram->getState().isCompute()
+                                ? vk::ImageLayout::ComputeShaderWrite
+                                : vk::ImageLayout::AllGraphicsShadersWrite;
+        }
+        else
+        {
+            textureLayout = mProgram->getState().isCompute()
+                                ? vk::ImageLayout::ComputeShaderReadOnly
+                                : vk::ImageLayout::AllGraphicsShadersReadOnly;
         }
-
-        // Ensure the image is in read-only layout
         commandBufferHelper->imageRead(&mResourceUseList, image.getAspectFlags(), textureLayout,
                                        &image);
 

src/libANGLE/renderer/vulkan/TextureVk.h

@@ -226,6 +226,8 @@ class TextureVk : public TextureImpl
                               GLenum type,
                               void *pixels) override;
 
+    ANGLE_INLINE bool isBoundAsImageTexture() const { return mState.isBoundAsImageTexture(); }
+
   private:
     // Transform an image index from the frontend into one that can be used on the backing
     // ImageHelper, taking into account mipmap or cube face offsets

src/tests/deqp_support/deqp_khr_gles31_test_expectations.txt

@@ -61,7 +61,6 @@
 
 // Image related failures
 
-4413 VULKAN : KHR-GLES31.core.shader_image_load_store.advanced-sync-imageAccess = SKIP
 4315 VULKAN : KHR-GLES31.core.shader_image_load_store.advanced-memory-order-vsfs = FAIL
 
 // Unimplemented glValidateCreateShaderProgramv: