From f7e5dcd2b331a850bbc1a6e9fb7394b84152c289 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Mon, 7 Jul 2014 16:57:20 +0200 Subject: Call glBindTexture() via QOpenGLFunctions in qsg_safeguard_texture(). Fix linking for dynamic OpenGL builds. Change-Id: I82e6597d2cb9a74707e3f1e9fce245cce1a5d72b Reviewed-by: Laszlo Agocs --- src/quick/scenegraph/util/qsgtexture.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 #include #include +#include +#include #include @@ -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; -- cgit v1.2.3