From 8193f9e0ecc0a7592310e1c26310ba502c091374 Mon Sep 17 00:00:00 2001 From: Johan Klokkhammer Helsing Date: Wed, 22 Jan 2020 16:01:53 +0100 Subject: Move QOpenGLVertexArrayObject from QtGui to QtOpenGL Task-number: QTBUG-74409 Change-Id: I6442693ca2b28b3a66f0f4fb41843e1e404df32b Reviewed-by: Laszlo Agocs --- src/gui/opengl/qopenglvertexarrayobject_p.h | 125 ---------------------------- 1 file changed, 125 deletions(-) delete mode 100644 src/gui/opengl/qopenglvertexarrayobject_p.h (limited to 'src/gui/opengl/qopenglvertexarrayobject_p.h') diff --git a/src/gui/opengl/qopenglvertexarrayobject_p.h b/src/gui/opengl/qopenglvertexarrayobject_p.h deleted file mode 100644 index fd3a6f0f89..0000000000 --- a/src/gui/opengl/qopenglvertexarrayobject_p.h +++ /dev/null @@ -1,125 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2014 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com, author Sean Harmer -** 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$ -** -****************************************************************************/ - -#ifndef QOPENGLVERTEXARRAYOBJECT_P_H -#define QOPENGLVERTEXARRAYOBJECT_P_H - -// -// W A R N I N G -// ------------- -// -// This file is not part of the Qt API. It exists for the convenience -// of the Qt OpenGL classes. This header file may change from -// version to version without notice, or even be removed. -// -// We mean it. -// - -#include - -#ifndef QT_NO_OPENGL - -#include - -QT_BEGIN_NAMESPACE - -class QOpenGLVertexArrayObjectHelper; -class QOpenGLContext; - -void Q_GUI_EXPORT qtInitializeVertexArrayObjectHelper(QOpenGLVertexArrayObjectHelper *helper, QOpenGLContext *context); - -class QOpenGLVertexArrayObjectHelper -{ - Q_DISABLE_COPY(QOpenGLVertexArrayObjectHelper) - -public: - explicit inline QOpenGLVertexArrayObjectHelper(QOpenGLContext *context) - : GenVertexArrays(nullptr) - , DeleteVertexArrays(nullptr) - , BindVertexArray(nullptr) - , IsVertexArray(nullptr) - { - qtInitializeVertexArrayObjectHelper(this, context); - } - - inline bool isValid() const - { - return GenVertexArrays && DeleteVertexArrays && BindVertexArray && IsVertexArray; - } - - inline void glGenVertexArrays(GLsizei n, GLuint *arrays) const - { - GenVertexArrays(n, arrays); - } - - inline void glDeleteVertexArrays(GLsizei n, const GLuint *arrays) const - { - DeleteVertexArrays(n, arrays); - } - - inline void glBindVertexArray(GLuint array) const - { - BindVertexArray(array); - } - - inline GLboolean glIsVertexArray(GLuint array) const - { - return IsVertexArray(array); - } - -private: - friend void Q_GUI_EXPORT qtInitializeVertexArrayObjectHelper(QOpenGLVertexArrayObjectHelper *helper, QOpenGLContext *context); - - // Function signatures are equivalent between desktop core, ARB, APPLE, ES 3 and ES 2 extensions - typedef void (QOPENGLF_APIENTRYP qt_GenVertexArrays_t)(GLsizei n, GLuint *arrays); - typedef void (QOPENGLF_APIENTRYP qt_DeleteVertexArrays_t)(GLsizei n, const GLuint *arrays); - typedef void (QOPENGLF_APIENTRYP qt_BindVertexArray_t)(GLuint array); - typedef GLboolean (QOPENGLF_APIENTRYP qt_IsVertexArray_t)(GLuint array); - - qt_GenVertexArrays_t GenVertexArrays; - qt_DeleteVertexArrays_t DeleteVertexArrays; - qt_BindVertexArray_t BindVertexArray; - qt_IsVertexArray_t IsVertexArray; -}; - -QT_END_NAMESPACE - -#endif // QT_NO_OPENGL - -#endif // QOPENGLVERTEXARRAYOBJECT_P_H -- cgit v1.2.3