diff options
Diffstat (limited to 'src/scenegraph/coreapi/renderer.cpp')
| -rw-r--r-- | src/scenegraph/coreapi/renderer.cpp | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/src/scenegraph/coreapi/renderer.cpp b/src/scenegraph/coreapi/renderer.cpp index e082acb..39818d4 100644 --- a/src/scenegraph/coreapi/renderer.cpp +++ b/src/scenegraph/coreapi/renderer.cpp @@ -46,7 +46,6 @@ #include <qglattributevalue.h> #include <QGLShaderProgram> #include <qglframebufferobject.h> -#include <qglext.h> #include <QtGui/qapplication.h> //#define RENDERER_DEBUG @@ -144,21 +143,15 @@ void Renderer::setTexture(int unit, const QGLTexture2D *texture) return; // Select the texture unit and bind the texture. - qt_gl_ActiveTexture(GL_TEXTURE0 + unit); + glActiveTexture(GL_TEXTURE0 + unit); if (!texture) { glBindTexture(GL_TEXTURE_2D, 0); -#if !defined(QT_OPENGL_ES_2) - glDisable(GL_TEXTURE_2D); -#endif } else { const_cast<QGLTexture2D *>(texture)->bind(); -#if !defined(QT_OPENGL_ES_2) - glEnable(GL_TEXTURE_2D); -#endif } if (unit != 0) - qt_gl_ActiveTexture(GL_TEXTURE0); + glActiveTexture(GL_TEXTURE0); } AbstractEffectProgram *Renderer::prepareMaterial(AbstractEffect *material) |