From 8471a422e3b4514904ce904aa5aadfab679b4190 Mon Sep 17 00:00:00 2001 From: Johan Klokkhammer Helsing Date: Thu, 23 Jan 2020 14:04:32 +0100 Subject: Move QOpenGLVersionProfile to its own files Prepare to move it out of QtGui Task-number: QTBUG-74409 Change-Id: Iefde4945ede27cf3c2f6f50e5a693c03625cadf6 Reviewed-by: Laszlo Agocs --- src/gui/kernel/qopenglcontext.cpp | 167 -------------------------------------- src/gui/kernel/qopenglcontext.h | 52 +----------- 2 files changed, 2 insertions(+), 217 deletions(-) (limited to 'src/gui/kernel') diff --git a/src/gui/kernel/qopenglcontext.cpp b/src/gui/kernel/qopenglcontext.cpp index ae5a98e832..b0474ceb3d 100644 --- a/src/gui/kernel/qopenglcontext.cpp +++ b/src/gui/kernel/qopenglcontext.cpp @@ -65,158 +65,6 @@ QT_BEGIN_NAMESPACE -class QOpenGLVersionProfilePrivate -{ -public: - QOpenGLVersionProfilePrivate() - : majorVersion(0), - minorVersion(0), - profile(QSurfaceFormat::NoProfile) - {} - - int majorVersion; - int minorVersion; - QSurfaceFormat::OpenGLContextProfile profile; -}; - - -/*! - \class QOpenGLVersionProfile - \inmodule QtGui - \since 5.1 - \brief The QOpenGLVersionProfile class represents the version and if applicable - the profile of an OpenGL context. - - An object of this class can be passed to QOpenGLContext::versionFunctions() to - request a functions object for a specific version and profile of OpenGL. - - It also contains some helper functions to check if a version supports profiles - or is a legacy version. -*/ - -/*! - Creates a default invalid QOpenGLVersionProfile object. -*/ -QOpenGLVersionProfile::QOpenGLVersionProfile() - : d(new QOpenGLVersionProfilePrivate) -{ -} - -/*! - Creates a QOpenGLVersionProfile object initialised with the version and profile - from \a format. -*/ -QOpenGLVersionProfile::QOpenGLVersionProfile(const QSurfaceFormat &format) - : d(new QOpenGLVersionProfilePrivate) -{ - d->majorVersion = format.majorVersion(); - d->minorVersion = format.minorVersion(); - d->profile = format.profile(); -} - -/*! - Constructs a copy of \a other. -*/ -QOpenGLVersionProfile::QOpenGLVersionProfile(const QOpenGLVersionProfile &other) - : d(new QOpenGLVersionProfilePrivate) -{ - *d = *(other.d); -} - -/*! - Destroys the QOpenGLVersionProfile object. -*/ -QOpenGLVersionProfile::~QOpenGLVersionProfile() -{ - delete d; -} - -/*! - Assigns the version and profile of \a rhs to this QOpenGLVersionProfile object. -*/ -QOpenGLVersionProfile &QOpenGLVersionProfile::operator=(const QOpenGLVersionProfile &rhs) -{ - if (this == &rhs) - return *this; - *d = *(rhs.d); - return *this; -} - -/*! - Returns a QPair where the components represent the major and minor OpenGL - version numbers respectively. - - \sa setVersion() -*/ -QPair QOpenGLVersionProfile::version() const -{ - return qMakePair( d->majorVersion, d->minorVersion); -} - -/*! - Sets the major and minor version numbers to \a majorVersion and \a minorVersion respectively. - - \sa version() -*/ -void QOpenGLVersionProfile::setVersion(int majorVersion, int minorVersion) -{ - d->majorVersion = majorVersion; - d->minorVersion = minorVersion; -} - -/*! - Returns the OpenGL profile. Only makes sense if profiles are supported by this version. - - \sa setProfile() -*/ -QSurfaceFormat::OpenGLContextProfile QOpenGLVersionProfile::profile() const -{ - return d->profile; -} - -/*! - Sets the OpenGL profile \a profile. Only makes sense if profiles are supported by - this version. - - \sa profile() -*/ -void QOpenGLVersionProfile::setProfile(QSurfaceFormat::OpenGLContextProfile profile) -{ - d->profile = profile; -} - -/*! - Returns \c true if profiles are supported by the OpenGL version returned by version(). Only - OpenGL versions >= 3.2 support profiles. - - \sa profile(), version() -*/ -bool QOpenGLVersionProfile::hasProfiles() const -{ - return ( d->majorVersion > 3 - || (d->majorVersion == 3 && d->minorVersion > 1)); -} - -/*! - Returns \c true is the OpenGL version returned by version() contains deprecated functions - and does not support profiles i.e. if the OpenGL version is <= 3.1. -*/ -bool QOpenGLVersionProfile::isLegacyVersion() const -{ - return (d->majorVersion < 3 || (d->majorVersion == 3 && d->minorVersion == 0)); -} - -/*! - Returns \c true if the version number is valid. Note that for a default constructed - QOpenGLVersionProfile object this function will return \c false. - - \sa setVersion(), version() -*/ -bool QOpenGLVersionProfile::isValid() const -{ - return d->majorVersion > 0 && d->minorVersion >= 0; -} - class QGuiGLThreadContext { public: @@ -1629,21 +1477,6 @@ void QOpenGLMultiGroupSharedResource::cleanup(QOpenGLContextGroup *group, QOpenG } #ifndef QT_NO_DEBUG_STREAM -QDebug operator<<(QDebug debug, const QOpenGLVersionProfile &vp) -{ - QDebugStateSaver saver(debug); - debug.nospace(); - debug << "QOpenGLVersionProfile("; - if (vp.isValid()) { - debug << vp.version().first << '.' << vp.version().second - << ", profile=" << vp.profile(); - } else { - debug << "invalid"; - } - debug << ')'; - return debug; -} - QDebug operator<<(QDebug debug, const QOpenGLContext *ctx) { QDebugStateSaver saver(debug); diff --git a/src/gui/kernel/qopenglcontext.h b/src/gui/kernel/qopenglcontext.h index a96ea56d7b..b26a3e2ede 100644 --- a/src/gui/kernel/qopenglcontext.h +++ b/src/gui/kernel/qopenglcontext.h @@ -59,12 +59,9 @@ #include #include +// TODO: ideally get rid of this include +#include -#if QT_DEPRECATED_SINCE(5, 6) -#include -#endif -#include -#include #include QT_BEGIN_NAMESPACE @@ -79,50 +76,6 @@ class QPlatformOpenGLContext; class QScreen; class QSurface; -class QOpenGLVersionProfilePrivate; - -class Q_GUI_EXPORT QOpenGLVersionProfile -{ -public: - QOpenGLVersionProfile(); - explicit QOpenGLVersionProfile(const QSurfaceFormat &format); - QOpenGLVersionProfile(const QOpenGLVersionProfile &other); - ~QOpenGLVersionProfile(); - - QOpenGLVersionProfile &operator=(const QOpenGLVersionProfile &rhs); - - QPair version() const; - void setVersion(int majorVersion, int minorVersion); - - QSurfaceFormat::OpenGLContextProfile profile() const; - void setProfile(QSurfaceFormat::OpenGLContextProfile profile); - - bool hasProfiles() const; - bool isLegacyVersion() const; - bool isValid() const; - -private: - QOpenGLVersionProfilePrivate* d; -}; - -inline uint qHash(const QOpenGLVersionProfile &v, uint seed = 0) -{ - return qHash(static_cast(v.profile() * 1000) - + v.version().first * 100 + v.version().second * 10, seed); -} - -inline bool operator==(const QOpenGLVersionProfile &lhs, const QOpenGLVersionProfile &rhs) -{ - if (lhs.profile() != rhs.profile()) - return false; - return lhs.version() == rhs.version(); -} - -inline bool operator!=(const QOpenGLVersionProfile &lhs, const QOpenGLVersionProfile &rhs) -{ - return !operator==(lhs, rhs); -} - class Q_GUI_EXPORT QOpenGLContextGroup : public QObject { Q_OBJECT @@ -245,7 +198,6 @@ private: }; #ifndef QT_NO_DEBUG_STREAM -Q_GUI_EXPORT QDebug operator<<(QDebug debug, const QOpenGLVersionProfile &vp); Q_GUI_EXPORT QDebug operator<<(QDebug debug, const QOpenGLContext *ctx); Q_GUI_EXPORT QDebug operator<<(QDebug debug, const QOpenGLContextGroup *cg); #endif // !QT_NO_DEBUG_STREAM -- cgit v1.2.3