1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Made cube example not use glActiveTexture.

Browse Source 
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>
This commit is contained in:
Samuel Rødal 2012-10-01 17:25:01 +02:00 committed by The Qt Project
parent ef3a544436
commit 9b201853ad
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
examples/opengl/cube/mainwidget.cpp
View File

@ -173,8 +173,7 @@ void MainWidget::initShaders()
//! [4] //! [4]
void MainWidget::initTextures() void MainWidget::initTextures()
{ {
// Loading cube.png to texture unit 0 // Loading cube.png
glActiveTexture(GL_TEXTURE0);
glEnable(GL_TEXTURE_2D); glEnable(GL_TEXTURE_2D);
texture = bindTexture(QImage(":/cube.png")); texture = bindTexture(QImage(":/cube.png"));