Fix compile issue with -opengl dynamic on Windows
authorAndy Shaw <andy.shaw@digia.com>
Thu, 18 Dec 2014 08:21:28 +0000 (09:21 +0100)
committerAndy Shaw <andy.shaw@digia.com>
Thu, 18 Dec 2014 21:57:49 +0000 (22:57 +0100)
Change-Id: I2b17482c0e8d04718e91b9772784afce4ebdc101
Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
examples/quick/scenegraph/sgengine/window.cpp

index 9af4029..bc371a3 100644 (file)
@@ -47,6 +47,7 @@
 #include <QSGTransformNode>
 #include <QScreen>
 #include <QVariantAnimation>
+#include <QOpenGLFunctions>
 
 class Item {
 public:
@@ -213,13 +214,14 @@ void Window::initialize()
     m_sgRenderer->setClearColor(QColor(32, 32, 32));
 
     // With QSGEngine::createTextureFromId
+    QOpenGLFunctions glFuncs(m_context.data());
     GLuint glTexture;
-    glGenTextures(1, &glTexture);
-    glBindTexture(GL_TEXTURE_2D, glTexture);
+    glFuncs.glGenTextures(1, &glTexture);
+    glFuncs.glBindTexture(GL_TEXTURE_2D, glTexture);
     QImage smile = QImage(":/scenegraph/sgengine/face-smile.png").scaled(48, 48, Qt::KeepAspectRatio, Qt::SmoothTransformation);
     smile = smile.convertToFormat(QImage::Format_RGBA8888_Premultiplied);
     Q_ASSERT(!smile.isNull());
-    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, smile.width(), smile.height(), 0, GL_RGBA, GL_UNSIGNED_BYTE, smile.constBits());
+    glFuncs.glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, smile.width(), smile.height(), 0, GL_RGBA, GL_UNSIGNED_BYTE, smile.constBits());
     m_smileTexture.reset(m_sgEngine->createTextureFromId(glTexture, smile.size(), QFlag(QSGEngine::TextureOwnsGLTexture | QSGEngine::TextureHasAlphaChannel)));
 
     // With QSGEngine::createTextureFromImage