Vulkan: FramebufferVk::clearImpl() break-RP fix

FramebufferVk::clearImpl() needs to potentially rotate the results of getCompleteRenderArea(), so that it can be compared with the results of getScissoredRenderArea(). Bug: b/151111296 Change-Id: Iad1fbdcb1943bae00835d31863d32ee85dbc7c2d Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2303606Reviewed-by: Courtney Goeltzenleuchter <courtneygo@google.com> Reviewed-by: Tim Van Patten <timvp@google.com> Commit-Queue: Ian Elliott <ianelliott@google.com>

Vulkan: FramebufferVk::clearImpl() break-RP fix
bcec11c2 · Ian Elliott · Commit Bot · 5f531342 · bcec11c2
Commit bcec11c2 authored Jul 16, 2020 by Ian Elliott Committed by Commit Bot Jul 17, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 1 deletion

FramebufferVk.cpp src/libANGLE/renderer/vulkan/FramebufferVk.cpp +8 -1

No files found.
--- a/src/libANGLE/renderer/vulkan/FramebufferVk.cpp
+++ b/src/libANGLE/renderer/vulkan/FramebufferVk.cpp
@@ -318,7 +318,14 @@ angle::Result FramebufferVk::clearImpl(const gl::Context *context,
    // The front-end should ensure we don't attempt to clear stencil if all bits are masked.
    ASSERT(!clearStencil || stencilMask != 0);

-    bool scissoredClear = scissoredRenderArea != getCompleteRenderArea();
+    gl::Rectangle completeRenderArea = getCompleteRenderArea();
+    if (contextVk->isRotatedAspectRatioForDrawFBO())
+    {
+        // The surface is rotated 90/270 degrees.  This changes the aspect ratio of the surface.
+        std::swap(completeRenderArea.x, completeRenderArea.y);
+        std::swap(completeRenderArea.width, completeRenderArea.height);
+    }
+    bool scissoredClear = scissoredRenderArea != completeRenderArea;

    // Special case for rendering feedback loops: clears are always valid in GL since they don't
    // sample from any textures.