diff options
Diffstat (limited to 'src/opengl/qopenglvertexarrayobject.cpp')
| -rw-r--r-- | src/opengl/qopenglvertexarrayobject.cpp | 49 |
1 files changed, 8 insertions, 41 deletions
diff --git a/src/opengl/qopenglvertexarrayobject.cpp b/src/opengl/qopenglvertexarrayobject.cpp index 63e37727f9..98374fb9e2 100644 --- a/src/opengl/qopenglvertexarrayobject.cpp +++ b/src/opengl/qopenglvertexarrayobject.cpp @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2014 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com, author Sean Harmer <sean.harmer@kdab.com> -** 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$ -** -****************************************************************************/ +// Copyright (C) 2014 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com, author Sean Harmer <sean.harmer@kdab.com> +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #include "qopenglvertexarrayobject.h" @@ -46,8 +10,11 @@ #include <QtGui/qguiapplication.h> #include <QtOpenGL/QOpenGLVersionFunctionsFactory> -#include <QtOpenGL/qopenglfunctions_3_0.h> -#include <QtOpenGL/qopenglfunctions_3_2_core.h> + +#if !QT_CONFIG(opengles2) +# include <QtOpenGL/qopenglfunctions_3_0.h> +# include <QtOpenGL/qopenglfunctions_3_2_core.h> +#endif #include <private/qopenglcontext_p.h> #include <private/qopenglextensions_p.h> @@ -274,7 +241,7 @@ void QOpenGLVertexArrayObjectPrivate::destroy() vao = 0; } - if (oldContext && oldContextSurface) { + if (oldContext && oldContextSurface && oldContextSurface->surfaceHandle()) { if (!oldContext->makeCurrent(oldContextSurface)) qWarning("QOpenGLVertexArrayObject::destroy() failed to restore current context"); } |