diff options
Diffstat (limited to 'src/gui/opengl/qopenglfunctions_2_0.cpp')
| -rw-r--r-- | src/gui/opengl/qopenglfunctions_2_0.cpp | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/src/gui/opengl/qopenglfunctions_2_0.cpp b/src/gui/opengl/qopenglfunctions_2_0.cpp index 1d4f70706a..5df7bc7c56 100644 --- a/src/gui/opengl/qopenglfunctions_2_0.cpp +++ b/src/gui/opengl/qopenglfunctions_2_0.cpp @@ -73,7 +73,7 @@ QOpenGLFunctions_2_0::QOpenGLFunctions_2_0() , d_1_2_Deprecated(0) , d_1_3_Deprecated(0) , d_1_4_Deprecated(0) - , d_2_0_Deprecated(0) + , m_reserved_2_0_Deprecated(Q_NULLPTR) { } @@ -127,10 +127,6 @@ QOpenGLFunctions_2_0::~QOpenGLFunctions_2_0() QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_4_Deprecated->context, QOpenGLFunctions_1_4_DeprecatedBackend::versionStatus()); delete d_1_4_Deprecated; } - if (d_2_0_Deprecated && !d_2_0_Deprecated->refs.deref()) { - QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_2_0_Deprecated->context, QOpenGLFunctions_2_0_DeprecatedBackend::versionStatus()); - delete d_2_0_Deprecated; - } } bool QOpenGLFunctions_2_0::initializeOpenGLFunctions() @@ -244,14 +240,6 @@ bool QOpenGLFunctions_2_0::initializeOpenGLFunctions() d_1_4_Deprecated = static_cast<QOpenGLFunctions_1_4_DeprecatedBackend*>(d); d->refs.ref(); - d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_2_0_DeprecatedBackend::versionStatus()); - if (!d) { - d = new QOpenGLFunctions_2_0_DeprecatedBackend(context); - QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_2_0_DeprecatedBackend::versionStatus(), d); - } - d_2_0_Deprecated = static_cast<QOpenGLFunctions_2_0_DeprecatedBackend*>(d); - d->refs.ref(); - QAbstractOpenGLFunctions::initializeOpenGLFunctions(); } return isInitialized(); |