Vulkan: Fix redefining TexStorage after TexImage.

src/libANGLE/renderer/vulkan/TextureVk.cpp

@@ -699,6 +699,12 @@ gl::Error TextureVk::setStorage(const gl::Context *context,
     const vk::Format &format         = renderer->getFormat(internalFormat);
     vk::CommandBuffer *commandBuffer = nullptr;
     ANGLE_TRY(getCommandBufferForWrite(contextVk, &commandBuffer));
+
+    if (mImage.valid())
+    {
+        releaseImage(context, renderer);
+    }
+
     ANGLE_TRY(initImage(contextVk, format, size, static_cast<uint32_t>(levels), commandBuffer));
     return gl::NoError();
 }

src/tests/gl_tests/StateChangeTest.cpp

@@ -160,10 +160,6 @@ TEST_P(StateChangeTest, FramebufferIncompleteWithTexStorage)
 {
     ANGLE_SKIP_TEST_IF(!extensionEnabled("GL_EXT_texture_storage"));
 
-    // TODO(lucferron): Diagnose and fix
-    // http://anglebug.com/2651
-    ANGLE_SKIP_TEST_IF(IsVulkan());
-
     glBindFramebuffer(GL_FRAMEBUFFER, mFramebuffer);
     glBindTexture(GL_TEXTURE_2D, mTextures[0]);
     glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, 16, 16, 0, GL_RGBA, GL_UNSIGNED_BYTE, nullptr);