diff options
| author | Rhys Weatherley <rhys.weatherley@nokia.com> | 2009-05-10 22:09:29 (GMT) |
|---|---|---|
| committer | Rhys Weatherley <rhys.weatherley@nokia.com> | 2009-05-10 22:09:29 (GMT) |
| commit | d03757e2bcf267790bf84d1b0e78c39c87b571ca (patch) | |
| tree | 2af233a7ad2db09796289f0e73118989d2cace82 /src | |
| parent | 79bc8f778f0b7b935ce3d808d8c91c3730f886bb (diff) | |
| download | Qt-d03757e2bcf267790bf84d1b0e78c39c87b571ca.zip Qt-d03757e2bcf267790bf84d1b0e78c39c87b571ca.tar.gz Qt-d03757e2bcf267790bf84d1b0e78c39c87b571ca.tar.bz2 | |
Mac OSX compile errors in shader usage
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 4b811e5..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"), 0); // GL_TEXTURE_0 + m_program.setUniformValue(m_program.uniformLocation("texture"), GLint(0)); // GL_TEXTURE_0 m_colorUniform = m_program.uniformLocation("color"); } |