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/ContextVk.cpp

diff --git a/src/libANGLE/renderer/vulkan/ContextVk.cpp b/src/libANGLE/renderer/vulkan/ContextVk.cpp
index f8fecf4..7f6fe31 100644
--- a/src/libANGLE/renderer/vulkan/ContextVk.cpp
+++ b/src/libANGLE/renderer/vulkan/ContextVk.cpp
@@ -435,9 +435,13 @@
                 updateScissor(glState);
                 break;
             case gl::State::DIRTY_BIT_VIEWPORT:
-                mPipelineDesc->updateViewport(glState.getViewport(), glState.getNearPlane(),
-                                              glState.getFarPlane(), isViewportFlipEnabled());
+            {
+                FramebufferVk *framebufferVk = vk::GetImpl(glState.getDrawFramebuffer());
+                mPipelineDesc->updateViewport(framebufferVk, glState.getViewport(),
+                                              glState.getNearPlane(), glState.getFarPlane(),
+                                              isViewportFlipEnabled());
                 break;
+            }
             case gl::State::DIRTY_BIT_DEPTH_RANGE:
                 mPipelineDesc->updateDepthRange(glState.getNearPlane(), glState.getFarPlane());
                 break;
@@ -566,13 +570,17 @@
                 WARN() << "DIRTY_BIT_READ_FRAMEBUFFER_BINDING unimplemented";
                 break;
             case gl::State::DIRTY_BIT_DRAW_FRAMEBUFFER_BINDING:
-                mPipelineDesc->updateViewport(glState.getViewport(), glState.getNearPlane(),
-                                              glState.getFarPlane(), isViewportFlipEnabled());
+            {
+                FramebufferVk *framebufferVk = vk::GetImpl(glState.getDrawFramebuffer());
+                mPipelineDesc->updateViewport(framebufferVk, glState.getViewport(),
+                                              glState.getNearPlane(), glState.getFarPlane(),
+                                              isViewportFlipEnabled());
                 updateColorMask(glState.getBlendState());
                 mPipelineDesc->updateCullMode(glState.getRasterizerState(),
                                               isViewportFlipEnabled());
                 updateScissor(glState);
                 break;
+            }
             case gl::State::DIRTY_BIT_RENDERBUFFER_BINDING:
                 WARN() << "DIRTY_BIT_RENDERBUFFER_BINDING unimplemented";
                 break;