From: Samuel Rødal <samuel.rodal@digia.com>
Date: Mon, 1 Oct 2012 15:25:01 +0000 (+0200)
Subject: Made cube example not use glActiveTexture.
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9b201853ad02fa8af86f8ea36d691a034eaf0cbd;p=profile%2Fivi%2Fqtbase.git

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>
---

diff --git a/examples/opengl/cube/mainwidget.cpp b/examples/opengl/cube/mainwidget.cpp
index 3aeb21e..c1001cd 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"));