diff options
| author | Laszlo Agocs <laszlo.agocs@digia.com> | 2014-04-08 15:05:21 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-05-23 12:23:09 +0200 |
| commit | e950557e1133e8aac65a453597ab35400a5b9a10 (patch) | |
| tree | 835e04f12a584274cec65efaa6071001247417ee /src/quick/items/context2d/qquickcontext2dtexture.cpp | |
| parent | 8a28462c13907800caf44c16580e0b2a2ee99f69 (diff) | |
Avoid direct GL calls in Quick
Change-Id: I9b8673fb3292c9d5ad2f9e8e63f56dc661699be6
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Diffstat (limited to 'src/quick/items/context2d/qquickcontext2dtexture.cpp')
| -rw-r--r-- | src/quick/items/context2d/qquickcontext2dtexture.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/quick/items/context2d/qquickcontext2dtexture.cpp b/src/quick/items/context2d/qquickcontext2dtexture.cpp index ef1b65a04f..19071ba01f 100644 --- a/src/quick/items/context2d/qquickcontext2dtexture.cpp +++ b/src/quick/items/context2d/qquickcontext2dtexture.cpp @@ -414,7 +414,7 @@ QQuickContext2DFBOTexture::~QQuickContext2DFBOTexture() delete m_multisampledFbo; delete m_paint_device; - glDeleteTextures(2, m_displayTextures); + QOpenGLContext::currentContext()->functions()->glDeleteTextures(2, m_displayTextures); } QSGTexture *QQuickContext2DFBOTexture::textureForNextFrame(QSGTexture *lastTexture) @@ -601,15 +601,16 @@ void QQuickContext2DFBOTexture::endPainting() if (m_onCustomThread) m_mutex.lock(); + QOpenGLFunctions *funcs = QOpenGLContext::currentContext()->functions(); if (m_displayTextures[0] == 0) { m_displayTexture = 1; - glGenTextures(2, m_displayTextures); + funcs->glGenTextures(2, m_displayTextures); } m_fbo->bind(); GLuint target = m_displayTexture == 0 ? 1 : 0; - glBindTexture(GL_TEXTURE_2D, m_displayTextures[target]); - glCopyTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, 0, 0, m_fbo->width(), m_fbo->height(), 0); + funcs->glBindTexture(GL_TEXTURE_2D, m_displayTextures[target]); + funcs->glCopyTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, 0, 0, m_fbo->width(), m_fbo->height(), 0); if (m_onCustomThread) m_mutex.unlock(); |