diff options
| author | Samuel Rødal <sroedal@trolltech.com> | 2009-10-28 17:02:40 (GMT) |
|---|---|---|
| committer | Samuel Rødal <sroedal@trolltech.com> | 2009-10-29 09:47:14 (GMT) |
| commit | 8f527513fd2bc280d3613759d411e8e4e96a522e (patch) | |
| tree | e9d506ec9decc41db1a351a148862fb9e0cf7f24 /src/opengl | |
| parent | 7d5b560f71e0f11c20b7ebef11f3095e760ca32c (diff) | |
| download | Qt-8f527513fd2bc280d3613759d411e8e4e96a522e.zip Qt-8f527513fd2bc280d3613759d411e8e4e96a522e.tar.gz Qt-8f527513fd2bc280d3613759d411e8e4e96a522e.tar.bz2 | |
Got rid of redundant texture parameter settings in GL pixmap filters.
The texture parameters are set in drawTexture anyways.
Reviewed-by: Gunnar Sletta
Diffstat (limited to 'src/opengl')
| -rw-r--r-- | src/opengl/qglpixmapfilter.cpp | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/src/opengl/qglpixmapfilter.cpp b/src/opengl/qglpixmapfilter.cpp index e381a5d..2af69e0 100644 --- a/src/opengl/qglpixmapfilter.cpp +++ b/src/opengl/qglpixmapfilter.cpp @@ -381,14 +381,6 @@ bool QGLPixmapBlurFilter::processGL(QPainter *painter, const QPointF &pos, const if (!fbo) return false; - glBindTexture(GL_TEXTURE_2D, fbo->texture()); - - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); - glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); - glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); - glBindTexture(GL_TEXTURE_2D, 0); - // prepare for updateUniforms m_textureSize = src.size(); @@ -632,14 +624,6 @@ bool QGLPixmapDropShadowFilter::processGL(QPainter *painter, const QPointF &pos, if (!fbo) return false; - glBindTexture(GL_TEXTURE_2D, fbo->texture()); - - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); - glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); - glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); - glBindTexture(GL_TEXTURE_2D, 0); - // prepare for updateUniforms m_textureSize = src.size(); |