diff options
Diffstat (limited to 'src/gui/kernel/qopenglcontext_platform.h')
| -rw-r--r-- | src/gui/kernel/qopenglcontext_platform.h | 64 |
1 files changed, 21 insertions, 43 deletions
diff --git a/src/gui/kernel/qopenglcontext_platform.h b/src/gui/kernel/qopenglcontext_platform.h index 7627e34c20..1f84cf6ce3 100644 --- a/src/gui/kernel/qopenglcontext_platform.h +++ b/src/gui/kernel/qopenglcontext_platform.h @@ -1,45 +1,18 @@ -/**************************************************************************** -** -** Copyright (C) 2020 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) 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 #ifndef QOPENGLCONTEXT_PLATFORM_H #define QOPENGLCONTEXT_PLATFORM_H +// +// W A R N I N G +// ------------- +// +// This file is part of the native interface APIs. Usage of +// this API may make your code source and binary incompatible +// with future versions of Qt. +// + #ifndef QT_NO_OPENGL #include <QtGui/qtguiglobal.h> @@ -58,9 +31,10 @@ struct __GLXcontextRec; typedef struct __GLXcontextRec *GLXContext; #if QT_CONFIG(egl) typedef void *EGLContext; typedef void *EGLDisplay; +typedef void *EGLConfig; #endif -#if !defined(Q_OS_MACOS) && defined(Q_CLANG_QDOC) +#if !defined(Q_OS_MACOS) && defined(Q_QDOC) typedef void *NSOpenGLContext; #endif @@ -68,7 +42,7 @@ QT_BEGIN_NAMESPACE namespace QNativeInterface { -#if defined(Q_OS_MACOS) || defined(Q_CLANG_QDOC) +#if defined(Q_OS_MACOS) || defined(Q_QDOC) struct Q_GUI_EXPORT QCocoaGLContext { QT_DECLARE_NATIVE_INTERFACE(QCocoaGLContext, 1, QOpenGLContext) @@ -77,7 +51,7 @@ struct Q_GUI_EXPORT QCocoaGLContext }; #endif -#if defined(Q_OS_WIN) || defined(Q_CLANG_QDOC) +#if defined(Q_OS_WIN) || defined(Q_QDOC) struct Q_GUI_EXPORT QWGLContext { QT_DECLARE_NATIVE_INTERFACE(QWGLContext, 1, QOpenGLContext) @@ -87,7 +61,7 @@ struct Q_GUI_EXPORT QWGLContext }; #endif -#if QT_CONFIG(xcb_glx_plugin) || defined(Q_CLANG_QDOC) +#if QT_CONFIG(xcb_glx_plugin) || defined(Q_QDOC) struct Q_GUI_EXPORT QGLXContext { QT_DECLARE_NATIVE_INTERFACE(QGLXContext, 1, QOpenGLContext) @@ -97,12 +71,16 @@ struct Q_GUI_EXPORT QGLXContext }; #endif -#if QT_CONFIG(egl) || defined(Q_CLANG_QDOC) +#if QT_CONFIG(egl) || defined(Q_QDOC) struct Q_GUI_EXPORT QEGLContext { QT_DECLARE_NATIVE_INTERFACE(QEGLContext, 1, QOpenGLContext) static QOpenGLContext *fromNative(EGLContext context, EGLDisplay display, QOpenGLContext *shareContext = nullptr); virtual EGLContext nativeContext() const = 0; + virtual EGLConfig config() const = 0; + virtual EGLDisplay display() const = 0; + + virtual void invalidateContext() = 0; }; #endif |