From 8a9bd001c947e6888d37e99fc456339fd2b51b36 Mon Sep 17 00:00:00 2001
From: BogDan Vatra <bogdan@kde.org>
Date: Fri, 17 Jan 2014 10:31:27 +0200
Subject: Support multiple native surfaces on Android.

Support for multiple native surfaces is needed by applications that need
to mix raster windows with GL windows.
Rework the raster and opengl implementation, get rid of eglfs and
fbconvenience dependencies.
Create a single android platform plugin.

[ChangeLog][Android] Rework the raster and opengl implementation.
[ChangeLog][Android] Create a single android platform plugin.

Task-number: QTBUG-34650

Change-Id: I9b1ab51554823329dda8cfbf8fef27c38f917c7b
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
---
 .../android/qandroidplatformopenglwindow.h         | 83 ++++++++++++++++++++++
 1 file changed, 83 insertions(+)
 create mode 100644 src/plugins/platforms/android/qandroidplatformopenglwindow.h

(limited to 'src/plugins/platforms/android/qandroidplatformopenglwindow.h')

diff --git a/src/plugins/platforms/android/qandroidplatformopenglwindow.h b/src/plugins/platforms/android/qandroidplatformopenglwindow.h
new file mode 100644
index 0000000000..820453ab01
--- /dev/null
+++ b/src/plugins/platforms/android/qandroidplatformopenglwindow.h
@@ -0,0 +1,83 @@
+/****************************************************************************
+**
+** Copyright (C) 2014 BogDan Vatra <bogdan@kde.org>
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** 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 Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/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 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights.  These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QANDROIDPLATFORMOPENGLWINDOW_H
+#define QANDROIDPLATFORMOPENGLWINDOW_H
+
+#include <EGL/egl.h>
+#include <QWaitCondition>
+#include <QtCore/private/qjni_p.h>
+
+#include "androidsurfaceclient.h"
+#include "qandroidplatformwindow.h"
+
+QT_BEGIN_NAMESPACE
+
+class QAndroidPlatformOpenGLWindow : public QAndroidPlatformWindow, public AndroidSurfaceClient
+{
+public:
+    explicit QAndroidPlatformOpenGLWindow(QWindow *window, EGLDisplay display);
+    ~QAndroidPlatformOpenGLWindow();
+
+    void setGeometry(const QRect &rect);
+    EGLSurface eglSurface(EGLConfig config);
+
+    void checkNativeSurface(EGLConfig config);
+
+protected:
+    virtual void surfaceChanged(JNIEnv *jniEnv, jobject surface, int w, int h);
+    void createEgl(EGLConfig config);
+    void clearEgl();
+
+private:
+    EGLDisplay m_eglDisplay;
+    EGLSurface m_eglSurface = EGL_NO_SURFACE;
+    EGLNativeWindowType m_nativeWindow = nullptr;
+
+    int m_nativeSurfaceId = -1;
+    QJNIObjectPrivate m_androidSurface;
+    QJNIObjectPrivate m_changedAndroidSurface;
+    QWaitCondition m_surfaceWaitCondition;
+};
+
+QT_END_NAMESPACE
+#endif // QANDROIDPLATFORMOPENGLWINDOW_H
-- 
cgit v1.2.3