From 9b201853ad02fa8af86f8ea36d691a034eaf0cbd Mon Sep 17 00:00:00 2001 From: =?utf8?q?Samuel=20R=C3=B8dal?= Date: Mon, 1 Oct 2012 17:25:01 +0200 Subject: [PATCH] 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 --- examples/opengl/cube/mainwidget.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) 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")); -- 2.7.4