diff options
| author | Samuel Rødal <samuel.rodal@digia.com> | 2012-10-01 17:25:01 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-10-02 10:43:48 +0200 |
| commit | 9b201853ad02fa8af86f8ea36d691a034eaf0cbd (patch) | |
| tree | aac33af8a07eb2c2fdb7d581231d76df9f6fa74e /examples | |
| parent | ef3a544436beaecb4d26349ce115be39b680ef6a (diff) | |
Made cube example not use glActiveTexture.
We're setting the default texture unit anyway, and glActiveTexture would
require resolving through QOpenGLFunctions.
Task-number: QTBUG-24555
Change-Id: Id8d660baaa1532e7b8e623673f501703c76fac65
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/opengl/cube/mainwidget.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/examples/opengl/cube/mainwidget.cpp b/examples/opengl/cube/mainwidget.cpp index 3aeb21ee2f..c1001cda33 100644 --- a/examples/opengl/cube/mainwidget.cpp +++ b/examples/opengl/cube/mainwidget.cpp @@ -173,8 +173,7 @@ void MainWidget::initShaders() //! [4] void MainWidget::initTextures() { - // Loading cube.png to texture unit 0 - glActiveTexture(GL_TEXTURE0); + // Loading cube.png glEnable(GL_TEXTURE_2D); texture = bindTexture(QImage(":/cube.png")); |