diff options
Diffstat (limited to 'src/gui/kernel/qplatformopenglcontext.h')
| -rw-r--r-- | src/gui/kernel/qplatformopenglcontext.h | 65 |
1 files changed, 14 insertions, 51 deletions
diff --git a/src/gui/kernel/qplatformopenglcontext.h b/src/gui/kernel/qplatformopenglcontext.h index 8c38d88b56..ac13c42655 100644 --- a/src/gui/kernel/qplatformopenglcontext.h +++ b/src/gui/kernel/qplatformopenglcontext.h @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtGui 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 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) 2016 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 #ifndef QPLATFORMOPENGLCONTEXT_H #define QPLATFORMOPENGLCONTEXT_H @@ -59,6 +23,8 @@ #include <QtGui/qopengl.h> #include <QtGui/qopenglcontext.h> +#include <QtCore/qnativeinterface.h> + QT_BEGIN_NAMESPACE @@ -82,6 +48,9 @@ public: virtual bool makeCurrent(QPlatformSurface *surface) = 0; virtual void doneCurrent() = 0; + virtual void beginFrame(); + virtual void endFrame(); + virtual bool isSharing() const { return false; } virtual bool isValid() const { return true; } @@ -102,18 +71,12 @@ private: Q_DISABLE_COPY(QPlatformOpenGLContext) }; -template <typename T> -T *QOpenGLContext::platformInterface() const -{ - return dynamic_cast<T*>(handle()); -} - -namespace QPlatformInterface::Private { +namespace QNativeInterface::Private { #if defined(Q_OS_MACOS) struct Q_GUI_EXPORT QCocoaGLIntegration { - QT_DECLARE_PLATFORM_INTERFACE(QCocoaGLIntegration) + QT_DECLARE_NATIVE_INTERFACE(QCocoaGLIntegration) virtual QOpenGLContext *createOpenGLContext(NSOpenGLContext *, QOpenGLContext *shareContext) const = 0; }; #endif @@ -121,16 +84,16 @@ struct Q_GUI_EXPORT QCocoaGLIntegration #if defined(Q_OS_WIN) struct Q_GUI_EXPORT QWindowsGLIntegration { - QT_DECLARE_PLATFORM_INTERFACE(QWindowsGLIntegration) + QT_DECLARE_NATIVE_INTERFACE(QWindowsGLIntegration) virtual HMODULE openGLModuleHandle() const = 0; virtual QOpenGLContext *createOpenGLContext(HGLRC context, HWND window, QOpenGLContext *shareContext) const = 0; }; #endif -#if defined(Q_OS_LINUX) +#if QT_CONFIG(xcb_glx_plugin) struct Q_GUI_EXPORT QGLXIntegration { - QT_DECLARE_PLATFORM_INTERFACE(QGLXIntegration) + QT_DECLARE_NATIVE_INTERFACE(QGLXIntegration) virtual QOpenGLContext *createOpenGLContext(GLXContext context, void *visualInfo, QOpenGLContext *shareContext) const = 0; }; #endif @@ -138,12 +101,12 @@ struct Q_GUI_EXPORT QGLXIntegration #if QT_CONFIG(egl) struct Q_GUI_EXPORT QEGLIntegration { - QT_DECLARE_PLATFORM_INTERFACE(QEGLIntegration) + QT_DECLARE_NATIVE_INTERFACE(QEGLIntegration) virtual QOpenGLContext *createOpenGLContext(EGLContext context, EGLDisplay display, QOpenGLContext *shareContext) const = 0; }; #endif -} // QPlatformInterface::Private +} // QNativeInterface::Private QT_END_NAMESPACE |