Vulkan: Fix off-by-1 180/270-rotated CopyTexImage

The rotation calculations are a little different for this code (that uses a special shader) than for other pre-rotation cases. I also modified the CopyTexImageTestES3.2DArraySubImage test to make future bugs a little easier to diagnose. Test: Test: angle_end2end_tests --gtest_filter=*CopyTexImageTestES3.2DArraySubImage*Vulkan* Test: Test: angle_end2end_tests --gtest_filter=*WebGLReadOutsideFramebufferTest.CopyTexSubImage2D*Vulkan* Bug: b/158245571 Change-Id: I497ec541cae5cd4085c3e9d596ee20943f5510f9 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2275733Reviewed-by: Shahbaz Youssefi <syoussefi@chromium.org> Reviewed-by: Geoff Lang <geofflang@chromium.org> Commit-Queue: Ian Elliott <ianelliott@google.com>

Vulkan: Fix off-by-1 180/270-rotated CopyTexImage
28300e6f · Ian Elliott · Commit Bot · 68e60a92 · 28300e6f · 28300e6f
Commit 28300e6f authored Jun 30, 2020 by Ian Elliott Committed by Commit Bot Jun 30, 2020
Show whitespace changes
Inline Side-by-side

Showing with 11 additions and 5 deletions

TextureVk.cpp src/libANGLE/renderer/vulkan/TextureVk.cpp +4 -4

CopyTexImageTest.cpp src/tests/gl_tests/CopyTexImageTest.cpp +7 -1

No files found.
--- a/src/libANGLE/renderer/vulkan/TextureVk.cpp
+++ b/src/libANGLE/renderer/vulkan/TextureVk.cpp
@@ -856,8 +856,8 @@ angle::Result TextureVk::copySubImageImplWithDraw(ContextVk *contextVk,
            break;
        case SurfaceRotation::Rotated180Degrees:
            ASSERT(isSrcFlipY);
-            rotatedSourceBox.x = srcExtents.width - sourceBox.x - sourceBox.width;
+            rotatedSourceBox.x = srcExtents.width - sourceBox.x - sourceBox.width - 1;
-            rotatedSourceBox.y = srcExtents.height - sourceBox.y - sourceBox.height;
+            rotatedSourceBox.y = srcExtents.height - sourceBox.y - sourceBox.height - 1;
            break;
        case SurfaceRotation::Rotated270Degrees:
            // Turn off y-flip for 270 degrees, as we don't want it affecting the
@@ -867,8 +867,8 @@ angle::Result TextureVk::copySubImageImplWithDraw(ContextVk *contextVk,
            // UtilsVk::copyImage().
            ASSERT(isSrcFlipY);
            isSrcFlipY         = false;
-            rotatedSourceBox.x = srcExtents.height - sourceBox.y - sourceBox.height;
+            rotatedSourceBox.x = srcExtents.height - sourceBox.y - sourceBox.height - 1;
-            rotatedSourceBox.y = srcExtents.width - sourceBox.x - sourceBox.width;
+            rotatedSourceBox.y = srcExtents.width - sourceBox.x - sourceBox.width - 1;
            std::swap(rotatedSourceBox.width, rotatedSourceBox.height);
            std::swap(srcExtents.width, srcExtents.height);
            break;

--- a/src/tests/gl_tests/CopyTexImageTest.cpp
+++ b/src/tests/gl_tests/CopyTexImageTest.cpp
@@ -623,7 +623,13 @@ TEST_P(CopyTexImageTestES3, 2DArraySubImage)
    glFramebufferTextureLayer(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, tex, 0, 0);
    EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::red);
    glFramebufferTextureLayer(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, tex, 0, 1);
-    EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
+    for (int x = 0; x < kTexSize; x++)
+    {
+        for (int y = 0; y < kTexSize; y++)
+        {
+            EXPECT_PIXEL_COLOR_EQ(x, y, GLColor::green);
+        }
+    }
    ASSERT_GL_NO_ERROR();
 }