bad2ac47f8
In 73f3f501f3, the classes were
moved out of Qt Gui, and a mechanism to attach them to the
QOpenGLContext was implemented using a QMap and a connection
on destroyed to delete it.
This solution was not thread-safe, so the suggestion was to either
add a mutex or to make an opaque pointer for the storage in the
(thread-affine) QOpenGLContextPrivate.
I decided to go with the latter. A solution using hash lookups
and mutexes seems to complex when the only benefit is to avoid
forward declarations from Qt Gui to Qt OpenGL in private API.
Especially since this dependency already exists with
the "textureFunctions", which serve the same purpose,
although the destructor is being passed in as an explicit
function pointer there, probably because the ambition was
to use a forward declaration rather than a superclass.
Fixes: QTBUG-82742
Change-Id: I5c6b82c5b33d9cb73ad1ec05d3fc3e87a9eae4cf
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
88 lines
3.1 KiB
C++
88 lines
3.1 KiB
C++
/****************************************************************************
|
|
**
|
|
** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB)
|
|
** Contact: https://www.qt.io/licensing/
|
|
**
|
|
** This file is part of the QtOpenGL 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$
|
|
**
|
|
**
|
|
** This file was generated by glgen version 0.1
|
|
** Command line was: glgen
|
|
**
|
|
** glgen is Copyright (C) 2012 Klaralvdalens Datakonsult AB (KDAB)
|
|
**
|
|
** This is an auto-generated file.
|
|
** Do not edit! All changes made to it will be lost.
|
|
**
|
|
****************************************************************************/
|
|
|
|
#ifndef QOPENGLVERSIONFUNCTIONS_P_H
|
|
#define QOPENGLVERSIONFUNCTIONS_P_H
|
|
|
|
//
|
|
// W A R N I N G
|
|
// -------------
|
|
//
|
|
// This file is not part of the Qt API. It exists purely as an
|
|
// implementation detail. This header file may change from version to
|
|
// version without notice, or even be removed.
|
|
//
|
|
// We mean it.
|
|
//
|
|
|
|
#include "qopenglversionfunctions.h"
|
|
|
|
#include <QtGui/private/qopenglcontext_p.h>
|
|
|
|
#include <QtOpenGL/qtopenglglobal.h>
|
|
#include <QtOpenGL/QOpenGLVersionProfile>
|
|
#include <QtCore/QSet>
|
|
|
|
QT_BEGIN_NAMESPACE
|
|
|
|
class QAbstractOpenGLFunctions;
|
|
|
|
class QOpenGLContextVersionData : public QOpenGLContextVersionFunctionHelper
|
|
{
|
|
public:
|
|
QHash<QOpenGLVersionProfile, QAbstractOpenGLFunctions *> functions;
|
|
QOpenGLVersionFunctionsStorage functionsStorage;
|
|
QSet<QAbstractOpenGLFunctions *> externalFunctions;
|
|
~QOpenGLContextVersionData() override;
|
|
static QOpenGLContextVersionData *forContext(QOpenGLContext *context);
|
|
};
|
|
|
|
QT_END_NAMESPACE
|
|
|
|
#endif // QOPENGLVERSIONFUNCTIONS_P_H
|