diff options
| author | Rhys Weatherley <rhys.weatherley@nokia.com> | 2009-05-10 22:20:36 (GMT) |
|---|---|---|
| committer | Rhys Weatherley <rhys.weatherley@nokia.com> | 2009-05-10 22:20:36 (GMT) |
| commit | a93e6cbae8dfa71aad2da9a69f5320bd44bc8dab (patch) | |
| tree | 675f136da8258c64d063d924861382ae980c3928 /src/opengl | |
| parent | 6395cd6d6ccbf0c15f77ef3061a0bac7189c575b (diff) | |
| parent | d03757e2bcf267790bf84d1b0e78c39c87b571ca (diff) | |
| download | Qt-a93e6cbae8dfa71aad2da9a69f5320bd44bc8dab.zip Qt-a93e6cbae8dfa71aad2da9a69f5320bd44bc8dab.tar.gz Qt-a93e6cbae8dfa71aad2da9a69f5320bd44bc8dab.tar.bz2 | |
Merge branch 'shader-api'
Diffstat (limited to 'src/opengl')
| -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 87abf60..5d4d5bf 100644 --- a/src/opengl/qglpixmapfilter.cpp +++ b/src/opengl/qglpixmapfilter.cpp @@ -183,7 +183,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"), 0); // GL_TEXTURE_0 + m_program.setUniformValue(m_program.uniformLocation("texture"), GLint(0)); // GL_TEXTURE_0 m_colorUniform = m_program.uniformLocation("color"); } |