commit 1a135adcd85b6d17e92b23f838d876ad3d8a76ea
author Luc Ferron <lucferron@chromium.org> Wed Jul 04 10:35:31 2018 -0400
committer Commit Bot <commit-bot@chromium.org> Mon Jul 09 17:26:45 2018 +0000
tree 33976c5b6392158e14dcc8fd7ea8e35215e5233a
parent c2136b67f69de838fb84d70d4a1642337406b42e

Vulkan: Fix how the viewport is calculated with Y flip

- This fixes all ViewportTest.* and MipmapTest.*
- Tests left to fix in end2end:
	- BlitFramebuffer*
	- MaxTextureSizeTest.*
	- PointSpritesTest.*

Every other test in angle_end2end_tests are working.

Bug: angleproject:2673
Change-Id: I162083bc847c15fa5490ab524ad4c22747d232ea
Reviewed-on: https://chromium-review.googlesource.com/1126333
Commit-Queue: Luc Ferron <lucferron@chromium.org>
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Geoff Lang <geofflang@chromium.org>

src/libANGLE/renderer/vulkan/FramebufferVk.cpp

diff --git a/src/libANGLE/renderer/vulkan/FramebufferVk.cpp b/src/libANGLE/renderer/vulkan/FramebufferVk.cpp
index 1bd9774..0ffe5b4 100644
--- a/src/libANGLE/renderer/vulkan/FramebufferVk.cpp
+++ b/src/libANGLE/renderer/vulkan/FramebufferVk.cpp
@@ -782,8 +782,15 @@
         // There is nothing to clear since the scissor is outside of the render area.
         return gl::NoError();
     }
+
     clearRect.rect = gl_vk::GetRect(intersection);
 
+    if (contextVk->isViewportFlipEnabled())
+    {
+        clearRect.rect.offset.y = getRenderPassRenderArea().height - clearRect.rect.offset.y -
+                                  clearRect.rect.extent.height;
+    }
+
     gl::AttachmentArray<VkClearAttachment> clearAttachments;
     int clearAttachmentIndex = 0;
 
@@ -889,7 +896,7 @@
     pipelineDesc.updateColorWriteMask(colorMaskFlags, getEmulatedAlphaAttachmentMask());
     pipelineDesc.updateRenderPassDesc(getRenderPassDesc());
     pipelineDesc.updateShaders(fullScreenQuad->queueSerial(), pushConstantColor->queueSerial());
-    pipelineDesc.updateViewport(renderArea, 0.0f, 1.0f, contextVk->isViewportFlipEnabled());
+    pipelineDesc.updateViewport(this, renderArea, 0.0f, 1.0f, contextVk->isViewportFlipEnabled());
 
     const gl::State &glState = contextVk->getGLState();
     if (glState.isScissorTestEnabled())