From 6bbcedacf50e95ce987eb35441a3f82d7e394167 Mon Sep 17 00:00:00 2001 From: Yiwei Zhang Date: Wed, 26 Jun 2019 13:20:59 -0700 Subject: [PATCH] HWUI-VK: Fix initial window transform Test: CtsUiRenderingTestCases and CtsGraphicsTestCases Change-Id: I5783be3cfe47597b7931b5605579edb6e189a87e --- libs/hwui/renderthread/VulkanSurface.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libs/hwui/renderthread/VulkanSurface.cpp b/libs/hwui/renderthread/VulkanSurface.cpp index b2cc23e76b8af..1d75e55ae87a2 100644 --- a/libs/hwui/renderthread/VulkanSurface.cpp +++ b/libs/hwui/renderthread/VulkanSurface.cpp @@ -52,11 +52,11 @@ static int InvertTransform(int transform) { 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 @@ VulkanSurface* VulkanSurface::Create(ANativeWindow* window, ColorMode colorMode, */ 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);