Fix the failure in UpdateImageTextureInUse

src/libANGLE/renderer/d3d/TextureD3D.cpp

@@ -569,6 +569,9 @@ angle::Result TextureD3D::ensureRenderTarget(const gl::Context *context)
             ANGLE_TRY(mTexStorage->copyToStorage(context, newRenderTargetStorage.get()));
             ANGLE_TRY(setCompleteTexStorage(context, newRenderTargetStorage.get()));
             newRenderTargetStorage.release();
+            // If this texture is used in compute shader, we should invalidate this texture so that
+            // the UAV/SRV is rebound again with this new texture storage in next dispatch call.
+            mTexStorage->invalidateTextures();
         }
     }
 

src/libANGLE/renderer/d3d/TextureStorage.h

@@ -70,6 +70,8 @@ class TextureStorage : angle::NonCopyable
     virtual angle::Result useLevelZeroWorkaroundTexture(const gl::Context *context,
                                                         bool useLevelZeroTexture);
 
+    virtual void invalidateTextures() {}
+
   protected:
     const angle::Subject *mSubject;
 };

src/libANGLE/renderer/d3d/d3d11/StateManager11.h

@@ -217,6 +217,9 @@ class StateManager11 final : angle::NonCopyable
     // Called by VertexArray11 element array buffer sync.
     void invalidateIndexBuffer();
 
+    // Called by TextureStorage11. Also called internally.
+    void invalidateTexturesAndSamplers();
+
     void setRenderTarget(ID3D11RenderTargetView *rtv, ID3D11DepthStencilView *dsv);
     void setRenderTargets(ID3D11RenderTargetView **rtvs, UINT numRtvs, ID3D11DepthStencilView *dsv);
 
@@ -376,7 +379,6 @@ class StateManager11 final : angle::NonCopyable
     angle::Result syncTransformFeedbackBuffers(const gl::Context *context);
 
     // These are currently only called internally.
-    void invalidateTexturesAndSamplers();
     void invalidateDriverUniforms();
     void invalidateProgramUniforms();
     void invalidateConstantBuffer(unsigned int slot);

src/libANGLE/renderer/d3d/d3d11/TextureStorage11.cpp

@@ -702,6 +702,11 @@ angle::Result TextureStorage11::copyToStorage(const gl::Context *context,
     return angle::Result::Continue;
 }
 
+void TextureStorage11::invalidateTextures()
+{
+    mRenderer->getStateManager()->invalidateTexturesAndSamplers();
+}
+
 angle::Result TextureStorage11::setData(const gl::Context *context,
                                         const gl::ImageIndex &index,
                                         ImageD3D *image,

src/libANGLE/renderer/d3d/d3d11/TextureStorage11.h

@@ -92,6 +92,7 @@ class TextureStorage11 : public TextureStorage
                           GLenum type,
                           const gl::PixelUnpackState &unpack,
                           const uint8_t *pixelData) override;
+    void invalidateTextures() override;
 
     virtual angle::Result getSRVForSampler(const gl::Context *context,
                                            const gl::TextureState &textureState,

src/tests/gl_tests/StateChangeTest.cpp

@@ -2465,7 +2465,6 @@ TEST_P(SimpleStateChangeTestES31, UpdateImageTextureInUse)
     glDispatchCompute(1, 1, 1);
 
     // Update the texture to be YBGR, while the Texture is in-use. Should not affect the dispatch.
-    glBindTexture(GL_TEXTURE_2D, texRead);
     std::array<GLColor, 4> ybgr = {{GLColor::yellow, GLColor::blue, GLColor::green, GLColor::red}};
     glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, 2, 2, GL_RGBA, GL_UNSIGNED_BYTE, ybgr.data());
     ASSERT_GL_NO_ERROR();