summaryrefslogtreecommitdiffstats
path: root/src/core/gl_surface_qt.h
diff options
context:
space:
mode:
authorAndras Becsi <andras.becsi@digia.com>2014-06-13 18:17:07 +0200
committerAndras Becsi <andras.becsi@digia.com>2014-08-02 10:28:49 +0200
commitddd8ab311271b59514ce0748301e634ca988b62b (patch)
tree7f2cf020558a4eb20b16c000efb77b029f56f076 /src/core/gl_surface_qt.h
parent4ffc07ddb8739da9e94a2b23b03c63fd7b74c09a (diff)
Implement GLSurfaceQt and exclude chromium's implementation
This makes it possible to use the same EGLConfig that is used by Qt when initializing the EGL surface instead of relying on eglChooseConfig. We can use the native interface to query the used config from Qt to avoid EGL_BAD_MATCH errors during initialization. This depends on patches in the qtbase dev branch, which will become Qt 5.4 at some point, therefore we can only merge this patch if we make Qt 5.4 a hard-dependency of QtWebEngine. Change-Id: I94319433b0790994ecbf543b74e7d12fa4767e32 Reviewed-by: Michael Bruning <michael.bruning@digia.com>
Diffstat (limited to 'src/core/gl_surface_qt.h')
-rw-r--r--src/core/gl_surface_qt.h75
1 files changed, 75 insertions, 0 deletions
diff --git a/src/core/gl_surface_qt.h b/src/core/gl_surface_qt.h
new file mode 100644
index 000000000..010f7064a
--- /dev/null
+++ b/src/core/gl_surface_qt.h
@@ -0,0 +1,75 @@
+/****************************************************************************
+**
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the QtWebEngine module 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 GL_SURFACE_QT_H_
+#define GL_SURFACE_QT_H_
+
+#include "ui/gfx/size.h"
+#include "ui/gl/gl_surface.h"
+
+#include <QtCore/qcompilerdetection.h> // Needed for Q_DECL_OVERRIDE
+
+namespace gfx {
+
+class GLSurfaceQt: public GLSurface {
+public:
+ explicit GLSurfaceQt(const gfx::Size& size);
+
+ // Implement GLSurface.
+ virtual void* GetDisplay() Q_DECL_OVERRIDE;
+ virtual void* GetConfig() Q_DECL_OVERRIDE;
+ virtual bool IsOffscreen() Q_DECL_OVERRIDE;
+ virtual bool SwapBuffers() Q_DECL_OVERRIDE;
+ virtual gfx::Size GetSize() Q_DECL_OVERRIDE;
+
+protected:
+ GLSurfaceQt();
+ virtual ~GLSurfaceQt();
+
+ gfx::Size m_size;
+
+private:
+ DISALLOW_COPY_AND_ASSIGN(GLSurfaceQt);
+};
+
+}
+
+#endif