1 files changed, 13 insertions, 79 deletions

diff --git a/src/plugins/platforms/android/qandroidplatformvulkanwindow.cpp b/src/plugins/platforms/android/qandroidplatformvulkanwindow.cpp
index 8f2a37626a..4bf4f44fa1 100644
--- a/src/plugins/platforms/android/qandroidplatformvulkanwindow.cpp
+++ b/src/plugins/platforms/android/qandroidplatformvulkanwindow.cpp
@@ -1,41 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2017 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of plugins of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2017 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
 #include "androiddeadlockprotector.h"
 #include "androidjnimain.h"
@@ -54,7 +18,6 @@ QT_BEGIN_NAMESPACE
 
 QAndroidPlatformVulkanWindow::QAndroidPlatformVulkanWindow(QWindow *window)
     : QAndroidPlatformWindow(window),
-      m_nativeSurfaceId(-1),
       m_nativeWindow(nullptr),
       m_vkSurface(0),
       m_createVkSurface(nullptr),
@@ -65,11 +28,7 @@ QAndroidPlatformVulkanWindow::QAndroidPlatformVulkanWindow(QWindow *window)
 QAndroidPlatformVulkanWindow::~QAndroidPlatformVulkanWindow()
 {
     m_surfaceWaitCondition.wakeOne();
-    lockSurface();
-    if (m_nativeSurfaceId != -1)
-        QtAndroid::destroySurface(m_nativeSurfaceId);
-    clearSurface();
-    unlockSurface();
+    destroyAndClearSurface();
 }
 
 void QAndroidPlatformVulkanWindow::setGeometry(const QRect &rect)
@@ -80,8 +39,8 @@ void QAndroidPlatformVulkanWindow::setGeometry(const QRect &rect)
     m_oldGeometry = geometry();
 
     QAndroidPlatformWindow::setGeometry(rect);
-    if (m_nativeSurfaceId != -1)
-        QtAndroid::setSurfaceGeometry(m_nativeSurfaceId, rect);
+    if (m_surfaceCreated)
+        setNativeGeometry(rect);
 
     QRect availableGeometry = screen()->availableGeometry();
     if (rect.width() > 0
@@ -90,22 +49,13 @@ void QAndroidPlatformVulkanWindow::setGeometry(const QRect &rect)
             && availableGeometry.height() > 0) {
         QWindowSystemInterface::handleExposeEvent(window(), QRect(QPoint(0, 0), rect.size()));
     }
-
-    if (rect.topLeft() != m_oldGeometry.topLeft())
-        repaint(QRegion(rect));
 }
 
 void QAndroidPlatformVulkanWindow::applicationStateChanged(Qt::ApplicationState state)
 {
     QAndroidPlatformWindow::applicationStateChanged(state);
     if (state <= Qt::ApplicationHidden) {
-        lockSurface();
-        if (m_nativeSurfaceId != -1) {
-            QtAndroid::destroySurface(m_nativeSurfaceId);
-            m_nativeSurfaceId = -1;
-        }
-        clearSurface();
-        unlockSurface();
+        destroyAndClearSurface();
     }
 }
 
@@ -127,27 +77,12 @@ void QAndroidPlatformVulkanWindow::clearSurface()
     }
 }
 
-void QAndroidPlatformVulkanWindow::sendExpose()
-{
-    QRect availableGeometry = screen()->availableGeometry();
-    if (geometry().width() > 0 && geometry().height() > 0 && availableGeometry.width() > 0 && availableGeometry.height() > 0)
-        QWindowSystemInterface::handleExposeEvent(window(), QRegion(QRect(QPoint(), geometry().size())));
-}
-
-void QAndroidPlatformVulkanWindow::surfaceChanged(JNIEnv *jniEnv, jobject surface, int w, int h)
+void QAndroidPlatformVulkanWindow::destroyAndClearSurface()
 {
-    Q_UNUSED(jniEnv);
-    Q_UNUSED(w);
-    Q_UNUSED(h);
-
     lockSurface();
-    m_androidSurfaceObject = surface;
-    if (surface)
-        m_surfaceWaitCondition.wakeOne();
+    destroySurface();
+    clearSurface();
     unlockSurface();
-
-    if (surface)
-        sendExpose();
 }
 
 VkSurfaceKHR *QAndroidPlatformVulkanWindow::vkSurface()
@@ -160,20 +95,19 @@ VkSurfaceKHR *QAndroidPlatformVulkanWindow::vkSurface()
         clearSurface();
 
         QMutexLocker lock(&m_surfaceMutex);
-        if (m_nativeSurfaceId == -1) {
+        if (!m_surfaceCreated) {
             AndroidDeadlockProtector protector;
             if (!protector.acquire())
                 return &m_vkSurface;
-            const bool windowStaysOnTop = bool(window()->flags() & Qt::WindowStaysOnTopHint);
-            m_nativeSurfaceId = QtAndroid::createSurface(this, geometry(), windowStaysOnTop, 32);
+            createSurface();
             m_surfaceWaitCondition.wait(&m_surfaceMutex);
         }
 
-        if (m_nativeSurfaceId == -1 || !m_androidSurfaceObject.isValid())
+        if (!m_surfaceCreated || !m_androidSurfaceObject.isValid())
             return &m_vkSurface;
 
         QJniEnvironment env;
-        m_nativeWindow = ANativeWindow_fromSurface(env, m_androidSurfaceObject.object());
+        m_nativeWindow = ANativeWindow_fromSurface(env.jniEnv(), m_androidSurfaceObject.object());
 
         VkAndroidSurfaceCreateInfoKHR surfaceInfo;
         memset(&surfaceInfo, 0, sizeof(surfaceInfo));