commit 6bbcedacf50e95ce987eb35441a3f82d7e394167
author Yiwei Zhang <zzyiwei@google.com> Wed Jun 26 13:20:59 2019 -0700
committer Yiwei Zhang <zzyiwei@google.com> Wed Jun 26 17:09:27 2019 -0700
tree 6c7bacd77df55d4065fa371cb7fab87d59788cd7
parent 353402fc4acc2a64194d5bdfc6ce7e55fc3a60f0

HWUI-VK: Fix initial window transform

Test: CtsUiRenderingTestCases and CtsGraphicsTestCases
Change-Id: I5783be3cfe47597b7931b5605579edb6e189a87e

libs/hwui/renderthread/VulkanSurface.cpp

diff --git a/libs/hwui/renderthread/VulkanSurface.cpp b/libs/hwui/renderthread/VulkanSurface.cpp
index b2cc23e..1d75e55 100644
--- a/libs/hwui/renderthread/VulkanSurface.cpp
+++ b/libs/hwui/renderthread/VulkanSurface.cpp
@@ -52,11 +52,11 @@
 static int ConvertVkTransformToNative(VkSurfaceTransformFlagsKHR transform) {
     switch (transform) {
         case VK_SURFACE_TRANSFORM_ROTATE_90_BIT_KHR:
-            return NATIVE_WINDOW_TRANSFORM_ROT_270;
+            return NATIVE_WINDOW_TRANSFORM_ROT_90;
         case VK_SURFACE_TRANSFORM_ROTATE_180_BIT_KHR:
             return NATIVE_WINDOW_TRANSFORM_ROT_180;
         case VK_SURFACE_TRANSFORM_ROTATE_270_BIT_KHR:
-            return NATIVE_WINDOW_TRANSFORM_ROT_90;
+            return NATIVE_WINDOW_TRANSFORM_ROT_270;
         case VK_SURFACE_TRANSFORM_IDENTITY_BIT_KHR:
         case VK_SURFACE_TRANSFORM_INHERIT_BIT_KHR:
         default:
@@ -211,7 +211,7 @@
      */
     WindowInfo windowInfo;
 
-    windowInfo.transform = ConvertVkTransformToNative(caps.supportedTransforms);
+    windowInfo.transform = ConvertVkTransformToNative(caps.currentTransform);
     windowInfo.size = SkISize::Make(caps.currentExtent.width, caps.currentExtent.height);
 
     const SkISize minSize = SkISize::Make(caps.minImageExtent.width, caps.minImageExtent.height);