Android: Give raster windows their own surface, and flush via RHI

Refactored platform windows on Android so that all window
types, including raster windows, have their own surface to
draw on.

Raster windows now flush the backing-store via RHI/OpenGL.

As a drive by, update to newer JNI syntax where appropriate.

Task-number: QTBUG-116187
Change-Id: I3b764b7126abf53556750b0ccbb7d27efe007bc1
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>

1 files changed, 2 insertions, 9 deletions

diff --git a/src/plugins/platforms/android/qandroidplatformvulkanwindow.h b/src/plugins/platforms/android/qandroidplatformvulkanwindow.h
index 14d5b7fc0e..fa959239d1 100644
--- a/src/plugins/platforms/android/qandroidplatformvulkanwindow.h
+++ b/src/plugins/platforms/android/qandroidplatformvulkanwindow.h
@@ -10,7 +10,6 @@
 
 #define VK_USE_PLATFORM_ANDROID_KHR
 
-#include "androidsurfaceclient.h"
 #include "qandroidplatformvulkaninstance.h"
 #include "qandroidplatformwindow.h"
 
@@ -20,7 +19,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class QAndroidPlatformVulkanWindow : public QAndroidPlatformWindow, public AndroidSurfaceClient
+class QAndroidPlatformVulkanWindow : public QAndroidPlatformWindow
 {
 public:
     explicit QAndroidPlatformVulkanWindow(QWindow *window);
@@ -32,17 +31,11 @@ public:
 
     VkSurfaceKHR *vkSurface();
 
-protected:
-    void surfaceChanged(JNIEnv *jniEnv, jobject surface, int w, int h) override;
-
 private:
-    void sendExpose();
     void clearSurface();
+    void destroyAndClearSurface();
 
-    int m_nativeSurfaceId;
     ANativeWindow *m_nativeWindow;
-    QJniObject m_androidSurfaceObject;
-    QWaitCondition m_surfaceWaitCondition;
     QSurfaceFormat m_format;
     QRect m_oldGeometry;
     VkSurfaceKHR m_vkSurface;