From a380342ba4102e9c07fe2676d0a637603c2c4d24 Mon Sep 17 00:00:00 2001 From: Andy Shaw Date: Thu, 18 Dec 2014 09:21:28 +0100 Subject: Fix compile issue with -opengl dynamic on Windows Change-Id: I2b17482c0e8d04718e91b9772784afce4ebdc101 Reviewed-by: Laszlo Agocs --- examples/quick/scenegraph/sgengine/window.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'examples/quick/scenegraph') diff --git a/examples/quick/scenegraph/sgengine/window.cpp b/examples/quick/scenegraph/sgengine/window.cpp index 9af4029165..bc371a38f6 100644 --- a/examples/quick/scenegraph/sgengine/window.cpp +++ b/examples/quick/scenegraph/sgengine/window.cpp @@ -47,6 +47,7 @@ #include #include #include +#include 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 -- cgit v1.2.3