summaryrefslogtreecommitdiffstats
path: root/src/plugins/platforms/ios/qioswindow.h
diff options
context:
space:
mode:
authorTor Arne Vestbø <tor.arne.vestbo@digia.com>2012-11-06 16:24:19 +0100
committerTor Arne Vestbø <tor.arne.vestbo@digia.com>2013-02-27 23:55:37 +0100
commit3c4f48f9e2ad9163d012d4afb36037d7efea8e3a (patch)
treedb92232d83d818e7d8191c4a3ad1539c825607d5 /src/plugins/platforms/ios/qioswindow.h
parentac8d906a3a61b3dd43aaf546e5f83e25d117631c (diff)
iOS: Implement QPlatformOpenGLContext
The iOS platform GL context is an EAGLContext, which is wrapped by the new class QIOSContext. The class takes care of makeCurrent() and swapBuffers(), but defers framebuffer management to the corresponding QIOSWindow. At the moment only a single framebuffer is created, and changing the geometry of the QWindow does not trigger any sort of invalidation of the buffers. The implementation assumes OpenGL ES2.x support. Though strictly speaking we could support ES1 for QtGui, it serves little purpose as Qt Quick 2 requires ES2. This patch also disabled touch event synthesization until we have figured out where we will maintain the connection to UIWindow. QPlatformOpenGLContext::getProcAddress() for getting extensions is implemented by using dlsym() to look up the symbol. This should not present any issues for App Store deployment, like dlopen() would. Change-Id: I166f800f3ecc0d180133c590465371ac1642b0ec Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
Diffstat (limited to 'src/plugins/platforms/ios/qioswindow.h')
-rw-r--r--src/plugins/platforms/ios/qioswindow.h97
1 files changed, 28 insertions, 69 deletions
diff --git a/src/plugins/platforms/ios/qioswindow.h b/src/plugins/platforms/ios/qioswindow.h
index 2d3d5b072f..d8f49db55b 100644
--- a/src/plugins/platforms/ios/qioswindow.h
+++ b/src/plugins/platforms/ios/qioswindow.h
@@ -1,38 +1,38 @@
/****************************************************************************
**
-** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.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
-** 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.
+** 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, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
+** 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.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
+** 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$
@@ -45,24 +45,11 @@
#include <qpa/qplatformwindow.h>
#import <UIKit/UIKit.h>
-#import <OpenGLES/ES1/gl.h>
-#import <OpenGLES/ES1/glext.h>
-#import <OpenGLES/ES2/gl.h>
-#import <OpenGLES/ES2/glext.h>
-#import <OpenGLES/EAGL.h>
+
+class QIOSContext;
@interface EAGLView : UIView <UIKeyInput>
{
- QPlatformWindow *m_window;
- EAGLContext *m_context;
-
- GLint m_framebufferWidth;
- GLint m_framebufferHeight;
-
- GLuint m_framebuffer, m_colorRenderbuffer, m_depthRenderbuffer;
-
- id delegate;
- // ------- Text Input ----------
UITextAutocapitalizationType autocapitalizationType;
UITextAutocorrectionType autocorrectionType;
BOOL enablesReturnKeyAutomatically;
@@ -72,19 +59,8 @@
BOOL secureTextEntry;
}
-- (void)setContext:(EAGLContext *)newContext;
-- (void)presentFramebuffer;
-- (void)deleteFramebuffer;
-- (void)createFramebuffer;
-- (void)makeCurrent;
-- (void)setWindow:(QPlatformWindow *)window;
- (void)sendMouseEventForTouches:(NSSet *)touches withEvent:(UIEvent *)event fakeButtons:(Qt::MouseButtons)buttons;
-@property (readonly,getter=fbo) GLint fbo;
-@property (nonatomic, assign) id delegate;
-
-// ------- Text Input ----------
-
@property(nonatomic) UITextAutocapitalizationType autocapitalizationType;
@property(nonatomic) UITextAutocorrectionType autocorrectionType;
@property(nonatomic) BOOL enablesReturnKeyAutomatically;
@@ -95,39 +71,22 @@
@end
-@protocol EAGLViewDelegate
-- (void)eaglView:(EAGLView *)view usesFramebuffer:(GLuint)buffer;
-@end
-
-class EAGLPlatformContext;
-
QT_BEGIN_NAMESPACE
-class QIOSScreen;
-
class QIOSWindow : public QPlatformWindow
{
public:
explicit QIOSWindow(QWindow *window);
~QIOSWindow();
- UIWindow *nativeWindow() const { return m_window; }
- EAGLView *nativeView() const { return m_view; }
void setGeometry(const QRect &rect);
- UIWindow *ensureNativeWindow();
+ GLuint framebufferObject(const QIOSContext &context) const;
- QPlatformOpenGLContext *glContext() const;
-
- QIOSScreen *platformScreen() const { return m_screen; }
+ EAGLView *nativeView() const { return m_view; }
- void updateGeometryAndOrientation();
private:
- QIOSScreen *m_screen;
- UIWindow *m_window;
- CGRect m_frame;
EAGLView *m_view;
- mutable EAGLPlatformContext *m_context;
};
QT_END_NAMESPACE