TexutreD3D: Only update storage level if it exists.

This was causing an assertion failure in updateStorageLevel when the storage didn't contain the requested level. Gate the call behind an isValidLevel check. TEST=conformance/misc/type-conversion-test.html BUG=angleproject:1815 Change-Id: Iadf46d232d5a117ae1ae74c6e71677b1e06a5321 Reviewed-on: https://chromium-review.googlesource.com/572705Reviewed-by: Geoff Lang <geofflang@chromium.org> Commit-Queue: Geoff Lang <geofflang@chromium.org>

TexutreD3D: Only update storage level if it exists.
c7ba85c9 · Geoff Lang · Commit Bot · a0016b7f · c7ba85c9
Commit c7ba85c9 authored Jul 14, 2017 by Geoff Lang Committed by Commit Bot Jul 15, 2017
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 3 deletions

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

No files found.
--- a/src/libANGLE/renderer/d3d/TextureD3D.cpp
+++ b/src/libANGLE/renderer/d3d/TextureD3D.cpp
@@ -917,10 +917,10 @@ gl::Error TextureD3D_2D::copyImage(const gl::Context *context,
    else
    {
        ANGLE_TRY(ensureRenderTarget(context));
-        ANGLE_TRY(updateStorageLevel(context, level));
        if (sourceArea.width != 0 && sourceArea.height != 0 && isValidLevel(level))
        {
+            ANGLE_TRY(updateStorageLevel(context, level));
            ANGLE_TRY(mRenderer->copyImage2D(context, source, sourceArea, internalFormat,
                                             destOffset, mTexStorage, level));
        }
@@ -1647,12 +1647,12 @@ gl::Error TextureD3D_Cube::copyImage(const gl::Context *context,
    else
    {
        ANGLE_TRY(ensureRenderTarget(context));
-        ANGLE_TRY(updateStorageFaceLevel(context, faceIndex, level));
        ASSERT(size.width == size.height);
        if (size.width > 0 && isValidFaceLevel(faceIndex, level))
        {
+            ANGLE_TRY(updateStorageFaceLevel(context, faceIndex, level));
            ANGLE_TRY(mRenderer->copyImageCube(context, source, sourceArea, internalFormat,
                                               destOffset, mTexStorage, target, level));
        }
@@ -2970,7 +2970,6 @@ gl::Error TextureD3D_2DArray::copySubImage(const gl::Context *context,
    else
    {
        ANGLE_TRY(ensureRenderTarget(context));
-        ANGLE_TRY(updateStorageLevel(context, level));
        if (isValidLevel(level))
        {