1 files changed, 14 insertions, 55 deletions
diff --git a/src/plugins/platforms/android/qandroidplatformoffscreensurface.cpp b/src/plugins/platforms/android/qandroidplatformoffscreensurface.cpp
index f9589cea1a..5237218d62 100644
--- a/src/plugins/platforms/android/qandroidplatformoffscreensurface.cpp
+++ b/src/plugins/platforms/android/qandroidplatformoffscreensurface.cpp
@@ -1,66 +1,25 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the 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) 2020 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 "qandroidplatformoffscreensurface.h"
 
-#include <QtGui/QOffscreenSurface>
 #include <QtGui/private/qeglconvenience_p.h>
 
-#include <android/native_window.h>
-
 QT_BEGIN_NAMESPACE
 
-QAndroidPlatformOffscreenSurface::QAndroidPlatformOffscreenSurface(EGLDisplay display, const QSurfaceFormat &format, QOffscreenSurface *offscreenSurface)
-    : QPlatformOffscreenSurface(offscreenSurface)
-    , m_format(format)
-    , m_display(display)
-    , m_surface(EGL_NO_SURFACE)
+QAndroidPlatformOffscreenSurface::QAndroidPlatformOffscreenSurface(
+        ANativeWindow *nativeSurface, EGLDisplay display, QOffscreenSurface *offscreenSurface)
+    : QPlatformOffscreenSurface(offscreenSurface), m_display(display), m_surface(EGL_NO_SURFACE)
 {
-    // Get native handle
-    ANativeWindow *surfaceTexture = (ANativeWindow*)offscreenSurface->nativeHandle();
-
-    EGLConfig config = q_configFromGLFormat(m_display, m_format, false);
-    if (config) {
-        const EGLint attributes[] = {
-            EGL_NONE
-        };
-        m_surface = eglCreateWindowSurface(m_display, config, surfaceTexture, attributes);
+    // FIXME: Read surface format properties from native surface using ANativeWindow_getFormat
+    m_format.setAlphaBufferSize(8);
+    m_format.setRedBufferSize(8);
+    m_format.setGreenBufferSize(8);
+    m_format.setBlueBufferSize(8);
+
+    if (EGLConfig config = q_configFromGLFormat(m_display, m_format, false)) {
+        const EGLint attributes[] = { EGL_NONE };
+        m_surface = eglCreateWindowSurface(m_display, config, nativeSurface, attributes);
     }
 }