Refactor redefineImage and track dirty images properly.

src/libANGLE/renderer/d3d/TextureD3D.h

@@ -121,6 +121,8 @@ class TextureD3D : public TextureImpl
 
     GLint getBaseLevelDepth() const;
 
+    bool shouldForceReleaseImagesOnSetImage(const uint8_t *pixels) const;
+
     RendererD3D *mRenderer;
 
     bool mDirtyImages;
@@ -394,7 +396,11 @@ class TextureD3D_Cube : public TextureD3D
     virtual bool isImageComplete(const gl::ImageIndex &index) const;
     gl::Error updateStorageFaceLevel(int faceIndex, int level);
 
-    void redefineImage(int faceIndex, GLint level, GLenum internalformat, const gl::Extents &size);
+    void redefineImage(int faceIndex,
+                       GLint level,
+                       GLenum internalformat,
+                       const gl::Extents &size,
+                       bool forceRelease);
 
     ImageD3D *mImageArray[6][gl::IMPLEMENTATION_MAX_TEXTURE_LEVELS];
 };
@@ -497,7 +503,10 @@ class TextureD3D_3D : public TextureD3D
     virtual bool isImageComplete(const gl::ImageIndex &index) const;
     gl::Error updateStorageLevel(int level);
 
-    void redefineImage(GLint level, GLenum internalformat, const gl::Extents &size);
+    void redefineImage(GLint level,
+                       GLenum internalformat,
+                       const gl::Extents &size,
+                       bool forceRelease);
 
     ImageD3D *mImageArray[gl::IMPLEMENTATION_MAX_TEXTURE_LEVELS];
 };
@@ -599,7 +608,10 @@ class TextureD3D_2DArray : public TextureD3D
     gl::Error updateStorageLevel(int level);
 
     void deleteImages();
-    void redefineImage(GLint level, GLenum internalformat, const gl::Extents &size);
+    void redefineImage(GLint level,
+                       GLenum internalformat,
+                       const gl::Extents &size,
+                       bool forceRelease);
 
     // Storing images as an array of single depth textures since D3D11 treats each array level of a
     // Texture2D object as a separate subresource.  Each layer would have to be looped over

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

@@ -216,8 +216,10 @@ bool Image11::isDirty() const
 {
     // If mDirty is true AND mStagingTexture doesn't exist AND mStagingTexture doesn't need to be
     // recovered from TextureStorage AND the texture doesn't require init data (i.e. a blank new
-    // texture will suffice) then isDirty should still return false.
-    if (mDirty && !mStagingTexture.valid() && !mRecoverFromStorage)
+    // texture will suffice) AND robust resource initialization is not enabled then isDirty should
+    // still return false.
+    if (mDirty && !mStagingTexture.valid() && !mRecoverFromStorage &&
+        !mRenderer->isRobustResourceInitEnabled())
     {
         const Renderer11DeviceCaps &deviceCaps = mRenderer->getRenderer11DeviceCaps();
         const auto &formatInfo                 = d3d11::Format::Get(mInternalFormat, deviceCaps);

src/tests/gl_tests/RobustResourceInitTest.cpp

@@ -364,6 +364,43 @@ TEST_P(RobustResourceInitTest, ReuploadingClearsTexture)
     EXPECT_GL_NO_ERROR();
 }
 
+// Cover the case where null pixel data is uploaded to a texture and then sub image is used to
+// upload partial data
+TEST_P(RobustResourceInitTest, TexImageThenSubImage)
+{
+    if (!setup())
+    {
+        return;
+    }
+
+    if (IsOpenGL() || IsD3D9())
+    {
+        std::cout << "Robust resource init is not yet fully implemented. (" << GetParam() << ")"
+                  << std::endl;
+        return;
+    }
+
+    // Put some data into the texture
+
+    GLTexture tex;
+    glBindTexture(GL_TEXTURE_2D, tex);
+    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, kWidth, kHeight, 0, GL_RGBA, GL_UNSIGNED_BYTE, nullptr);
+
+    // Force the D3D texture to create a storage
+    checkNonZeroPixels(&tex, 0, 0, 0, 0, GLColor::transparentBlack);
+
+    glBindTexture(GL_TEXTURE_2D, tex);
+    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, kWidth, kHeight, 0, GL_RGBA, GL_UNSIGNED_BYTE, nullptr);
+
+    std::array<GLColor, kWidth * kHeight> data;
+    data.fill(GLColor::white);
+
+    glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, kWidth / 2, kHeight / 2, GL_RGBA, GL_UNSIGNED_BYTE,
+                    data.data());
+    checkNonZeroPixels(&tex, 0, 0, kWidth / 2, kHeight / 2, GLColor::white);
+    EXPECT_GL_NO_ERROR();
+}
+
 // Reading an uninitialized texture (texImage2D) should succeed with all bytes set to 0.
 TEST_P(RobustResourceInitTest, ReadingUninitialized3DTexture)
 {