D3D11: If an image is dirty, copy it to the storage before copying from a FB.

If a storage already existed, it may have old data in it. Check if the image is dirty and copy the initialized memory into the storage before copying data from the framebuffer. TEST=conformance/textures/misc/copy-tex-image-and-sub-image-2d BUG=angleproject:1815 Change-Id: Ic69c5519b2e09e4b62025b1bf413d2a71a4a2afb Reviewed-on: https://chromium-review.googlesource.com/568410Reviewed-by: Jamie Madill <jmadill@chromium.org> Commit-Queue: Geoff Lang <geofflang@chromium.org>

D3D11: If an image is dirty, copy it to the storage before copying from a FB.
d90b214f · Geoff Lang · Commit Bot · d7ceaa16 · d90b214f
Commit d90b214f authored Jul 12, 2017 by Geoff Lang Committed by Commit Bot Jul 13, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

TextureD3D.cpp src/libANGLE/renderer/d3d/TextureD3D.cpp +3 -2

No files found.
--- a/src/libANGLE/renderer/d3d/TextureD3D.cpp
+++ b/src/libANGLE/renderer/d3d/TextureD3D.cpp
@@ -917,7 +917,7 @@ gl::Error TextureD3D_2D::copyImage(const gl::Context *context,
    else
    {
        ANGLE_TRY(ensureRenderTarget(context));
-        mImageArray[level]->markClean();
+        ANGLE_TRY(updateStorageLevel(context, level));
        if (sourceArea.width != 0 && sourceArea.height != 0 && isValidLevel(level))
        {
@@ -1647,7 +1647,7 @@ gl::Error TextureD3D_Cube::copyImage(const gl::Context *context,
    else
    {
        ANGLE_TRY(ensureRenderTarget(context));
-        mImageArray[faceIndex][level]->markClean();
+        ANGLE_TRY(updateStorageFaceLevel(context, faceIndex, level));
        ASSERT(size.width == size.height);
@@ -2976,6 +2976,7 @@ gl::Error TextureD3D_2DArray::copySubImage(const gl::Context *context,
    else
    {
        ANGLE_TRY(ensureRenderTarget(context));
+        ANGLE_TRY(updateStorageLevel(context, level));
        if (isValidLevel(level))
        {