Made cube example not use glActiveTexture.
authorSamuel Rødal <samuel.rodal@digia.com>
Mon, 1 Oct 2012 15:25:01 +0000 (17:25 +0200)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Tue, 2 Oct 2012 08:43:48 +0000 (10:43 +0200)
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>
examples/opengl/cube/mainwidget.cpp

index 3aeb21e..c1001cd 100644 (file)
@@ -173,8 +173,7 @@ void MainWidget::initShaders()
 //! [4]
 void MainWidget::initTextures()
 {
 //! [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"));
 
     glEnable(GL_TEXTURE_2D);
     texture = bindTexture(QImage(":/cube.png"));