diff options
| author | Friedemann Kleint <Friedemann.Kleint@digia.com> | 2014-07-07 16:57:20 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@digia.com> | 2014-07-08 04:31:50 +0200 |
| commit | f7e5dcd2b331a850bbc1a6e9fb7394b84152c289 (patch) | |
| tree | cf15937d828dbd54cbb1e1a233229ea2c41417e5 | |
| parent | e1e551dabd4efc9cb486322098a072d4e337817c (diff) | |
Call glBindTexture() via QOpenGLFunctions in qsg_safeguard_texture().
Fix linking for dynamic OpenGL builds.
Change-Id: I82e6597d2cb9a74707e3f1e9fce245cce1a5d72b
Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
| -rw-r--r-- | src/quick/scenegraph/util/qsgtexture.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/quick/scenegraph/util/qsgtexture.cpp b/src/quick/scenegraph/util/qsgtexture.cpp index e9e6c14f4e..02dd2efae3 100644 --- a/src/quick/scenegraph/util/qsgtexture.cpp +++ b/src/quick/scenegraph/util/qsgtexture.cpp @@ -47,6 +47,8 @@ #include <private/qqmlglobal_p.h> #include <QtGui/qguiapplication.h> #include <QtGui/qpa/qplatformnativeinterface.h> +#include <QtGui/qopenglcontext.h> +#include <QtGui/qopenglfunctions.h> #include <private/qsgmaterialshader_p.h> @@ -283,7 +285,7 @@ bool qsg_safeguard_texture(QSGTexture *texture) if (!qsg_valid_texture_set()->contains(texture)) { qWarning() << "Invalid texture accessed:" << (void *) texture; qsg_set_material_failure(); - glBindTexture(GL_TEXTURE_2D, 0); + QOpenGLContext::currentContext()->functions()->glBindTexture(GL_TEXTURE_2D, 0); return false; } return true; |