Reimplement WindowSurfaceVkAndroid::getCurrentWindowSize()

Use vkGetPhysicalDeviceSurfaceCapabilitiesKHR() instead of ANativeWindow_getWidth() & ANativeWindow_getHeight(). The former gives the proper size of the window, where the latter gives the size of the device's display (which is the default size of a window). Bug: b/168327817 Change-Id: I524116b7b07bf2ec7637fe2874806c5eb8318171 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2464920Reviewed-by: Tim Van Patten <timvp@google.com> Reviewed-by: Courtney Goeltzenleuchter <courtneygo@google.com> Commit-Queue: Ian Elliott <ianelliott@google.com>

Reimplement WindowSurfaceVkAndroid::getCurrentWindowSize()
82817c9a · Ian Elliott · Commit Bot · 4c9f892f · 82817c9a
Commit 82817c9a authored Oct 12, 2020 by Ian Elliott Committed by Commit Bot Oct 14, 2020
Show whitespace changes
Inline Side-by-side

Showing with 6 additions and 5 deletions

WindowSurfaceVkAndroid.cpp ...bANGLE/renderer/vulkan/android/WindowSurfaceVkAndroid.cpp +6 -5

No files found.
--- a/src/libANGLE/renderer/vulkan/android/WindowSurfaceVkAndroid.cpp
+++ b/src/libANGLE/renderer/vulkan/android/WindowSurfaceVkAndroid.cpp
@@ -37,11 +37,12 @@ angle::Result WindowSurfaceVkAndroid::createSurfaceVk(vk::Context *context, gl::
 angle::Result WindowSurfaceVkAndroid::getCurrentWindowSize(vk::Context *context,
                                                           gl::Extents *extentsOut)
 {
-    int32_t width  = ANativeWindow_getWidth(mNativeWindowType);
-    int32_t height = ANativeWindow_getHeight(mNativeWindowType);
-    ANGLE_VK_CHECK(context, width > 0 && height > 0, VK_ERROR_INITIALIZATION_FAILED);
-
-    *extentsOut = gl::Extents(width, height, 1);
+    RendererVk *renderer                   = context->getRenderer();
+    const VkPhysicalDevice &physicalDevice = renderer->getPhysicalDevice();
+    VkSurfaceCapabilitiesKHR surfaceCaps;
+    ANGLE_VK_TRY(context,
+                 vkGetPhysicalDeviceSurfaceCapabilitiesKHR(physicalDevice, mSurface, &surfaceCaps));
+    *extentsOut = gl::Extents(surfaceCaps.currentExtent.width, surfaceCaps.currentExtent.height, 1);
    return angle::Result::Continue;
 }