Fix UtilsVk::clearFramebuffer() for pre-rotation

This fixes cases where pre-rotation wasn't occuring when glClear() was implemented by a small shader. A specialized viewport was generated (thus, not with ContextVk::updateViewport()) for the entire framebuffer. However, the framebuffer width and height were not swapped for 90/270-degree rotation cases, and so the wrong viewport.y value was calculated. Test: angle_deqp_gles2_tests --gtest_filter=dEQP.GLES2/functional_color_clear* Bug: b/157933235 Bug: b/157933198 Change-Id: I1ac158c84ef812c8863dee01c6c8bfe9295b900e Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2231597Reviewed-by: Shahbaz Youssefi <syoussefi@chromium.org> Reviewed-by: Courtney Goeltzenleuchter <courtneygo@google.com> Commit-Queue: Courtney Goeltzenleuchter <courtneygo@google.com>

Fix UtilsVk::clearFramebuffer() for pre-rotation
ae9d1227 · Ian Elliott · Commit Bot · eef10995 · ae9d1227
Commit ae9d1227 authored Jun 04, 2020 by Ian Elliott Committed by Commit Bot Jun 05, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 0 deletions

UtilsVk.cpp src/libANGLE/renderer/vulkan/UtilsVk.cpp +5 -0

No files found.
--- a/src/libANGLE/renderer/vulkan/UtilsVk.cpp
+++ b/src/libANGLE/renderer/vulkan/UtilsVk.cpp
@@ -1246,6 +1246,11 @@ angle::Result UtilsVk::clearFramebuffer(ContextVk *contextVk,
    VkViewport viewport;
    gl::Rectangle completeRenderArea = framebuffer->getCompleteRenderArea();
    bool invertViewport              = contextVk->isViewportFlipEnabledForDrawFBO();
+    if (contextVk->isRotatedAspectRatioForDrawFBO())
+    {
+        // The surface is rotated 90/270 degrees.  This changes the aspect ratio of the surface.
+        std::swap(completeRenderArea.width, completeRenderArea.height);
+    }
    gl_vk::GetViewport(completeRenderArea, 0.0f, 1.0f, invertViewport, completeRenderArea.height,
                       &viewport);
    pipelineDesc.setViewport(viewport);