diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2009-05-18 04:50:32 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2009-05-18 04:50:32 (GMT) |
| commit | 0ed3e397eaebd1220d745c61cb3433998cbd9dd9 (patch) | |
| tree | 72df51427046c494e15334c0295ef14db8756c7d /src | |
| parent | 2b025bf4a4d07469df984aeda03d5f163fc274ce (diff) | |
| parent | d03757e2bcf267790bf84d1b0e78c39c87b571ca (diff) | |
| download | Qt-0ed3e397eaebd1220d745c61cb3433998cbd9dd9.zip Qt-0ed3e397eaebd1220d745c61cb3433998cbd9dd9.tar.gz Qt-0ed3e397eaebd1220d745c61cb3433998cbd9dd9.tar.bz2 | |
Merge branch 'shader-api' of git@scm.dev.nokia.troll.no:qt/qt-graphics-team into kinetic-declarativeui
Conflicts:
src/opengl/qglpixmapfilter.cpp
Diffstat (limited to 'src')
| -rw-r--r-- | src/opengl/qglpixmapfilter.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/opengl/qglpixmapfilter.cpp b/src/opengl/qglpixmapfilter.cpp index 0bfed12..83e6717 100644 --- a/src/opengl/qglpixmapfilter.cpp +++ b/src/opengl/qglpixmapfilter.cpp @@ -172,7 +172,7 @@ QGLPixmapColorizeFilter::QGLPixmapColorizeFilter() m_program.addShader(QGLShader::FragmentShader, qt_gl_colorize_filter); m_program.link(); m_program.enable(); - m_program.setUniformValue(m_program.uniformLocation("texture"),GLint(0)); // GL_TEXTURE_0 + m_program.setUniformValue(m_program.uniformLocation("texture"), GLint(0)); // GL_TEXTURE_0 m_colorUniform = m_program.uniformLocation("color"); } |