diff options
author | Jocelyn Turcotte <jocelyn.turcotte@digia.com> | 2014-07-01 19:20:25 +0200 |
---|---|---|
committer | Erik Verbruggen <erik.verbruggen@digia.com> | 2014-08-05 12:29:25 +0200 |
commit | ead09e6b1fbfceacb68ee0e2e721c723300b0df6 (patch) | |
tree | ec44837c9a1033c62806ad22ff6346473d6a9489 /src/quick/scenegraph | |
parent | 5e504b36a1bc17df09fa28f1a26703023466f440 (diff) |
Use the renamed qt_gl_global_share_context
Change-Id: I438c33a1dc83fd0cd1ec08bb4e4a1257a3216ca2
Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
Diffstat (limited to 'src/quick/scenegraph')
-rw-r--r-- | src/quick/scenegraph/qsgrenderloop.cpp | 4 | ||||
-rw-r--r-- | src/quick/scenegraph/qsgthreadedrenderloop.cpp | 4 | ||||
-rw-r--r-- | src/quick/scenegraph/qsgwindowsrenderloop.cpp | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/quick/scenegraph/qsgrenderloop.cpp b/src/quick/scenegraph/qsgrenderloop.cpp index 73b64b4f9b..064d363412 100644 --- a/src/quick/scenegraph/qsgrenderloop.cpp +++ b/src/quick/scenegraph/qsgrenderloop.cpp @@ -334,8 +334,8 @@ void QSGGuiThreadRenderLoop::renderWindow(QQuickWindow *window) if (!gl) { gl = new QOpenGLContext(); gl->setFormat(window->requestedFormat()); - if (QOpenGLContextPrivate::globalShareContext()) - gl->setShareContext(QOpenGLContextPrivate::globalShareContext()); + if (qt_gl_global_share_context()) + gl->setShareContext(qt_gl_global_share_context()); if (!gl->create()) { const bool isEs = gl->isOpenGLES(); delete gl; diff --git a/src/quick/scenegraph/qsgthreadedrenderloop.cpp b/src/quick/scenegraph/qsgthreadedrenderloop.cpp index 793a247427..84ae3f818b 100644 --- a/src/quick/scenegraph/qsgthreadedrenderloop.cpp +++ b/src/quick/scenegraph/qsgthreadedrenderloop.cpp @@ -889,8 +889,8 @@ void QSGThreadedRenderLoop::handleExposure(QQuickWindow *window) if (!w->thread->gl) { w->thread->gl = new QOpenGLContext(); - if (QOpenGLContextPrivate::globalShareContext()) - w->thread->gl->setShareContext(QOpenGLContextPrivate::globalShareContext()); + if (qt_gl_global_share_context()) + w->thread->gl->setShareContext(qt_gl_global_share_context()); w->thread->gl->setFormat(w->window->requestedFormat()); if (!w->thread->gl->create()) { const bool isEs = w->thread->gl->isOpenGLES(); diff --git a/src/quick/scenegraph/qsgwindowsrenderloop.cpp b/src/quick/scenegraph/qsgwindowsrenderloop.cpp index 70f80689f5..671b341046 100644 --- a/src/quick/scenegraph/qsgwindowsrenderloop.cpp +++ b/src/quick/scenegraph/qsgwindowsrenderloop.cpp @@ -162,8 +162,8 @@ void QSGWindowsRenderLoop::show(QQuickWindow *window) RLDEBUG(" - creating GL context"); m_gl = new QOpenGLContext(); m_gl->setFormat(window->requestedFormat()); - if (QOpenGLContextPrivate::globalShareContext()) - m_gl->setShareContext(QOpenGLContextPrivate::globalShareContext()); + if (qt_gl_global_share_context()) + m_gl->setShareContext(qt_gl_global_share_context()); bool created = m_gl->create(); if (!created) { const bool isEs = m_gl->isOpenGLES(); |