diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-11 14:49:14 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-11 14:49:14 (GMT) |
| commit | a50eed92125dc366163dc09164912eaf105d513f (patch) | |
| tree | b2220a1703e6ac71cee660d024bba6f5c0cb9e0f /src | |
| parent | 3ab4fe8969f443bab867ac15c3b7d35ae31d9903 (diff) | |
| parent | d8b693310ef268c4f58bd2e04b7613460b76bac3 (diff) | |
| download | Qt-a50eed92125dc366163dc09164912eaf105d513f.zip Qt-a50eed92125dc366163dc09164912eaf105d513f.tar.gz Qt-a50eed92125dc366163dc09164912eaf105d513f.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fixed QGLPixmapDropShadowFilter on Nvidia hardware.
Diffstat (limited to 'src')
| -rw-r--r-- | src/opengl/qglpixmapfilter.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/opengl/qglpixmapfilter.cpp b/src/opengl/qglpixmapfilter.cpp index d5a11d9..bfa5ef1 100644 --- a/src/opengl/qglpixmapfilter.cpp +++ b/src/opengl/qglpixmapfilter.cpp @@ -591,10 +591,11 @@ bool QGLPixmapDropShadowFilter::processGL(QPainter *painter, const QPointF &pos, qt_blurImage(image, r * qreal(0.5), false, 1); - GLuint texture = generateBlurTexture(image.size(), GL_ALPHA); - - glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, image.width(), image.height(), GL_ALPHA, - GL_UNSIGNED_BYTE, image.bits()); + GLuint texture; + glGenTextures(1, &texture); + glBindTexture(GL_TEXTURE_2D, texture); + glTexImage2D(GL_TEXTURE_2D, 0, GL_ALPHA, image.width(), image.height(), + 0, GL_ALPHA, GL_UNSIGNED_BYTE, image.bits()); info = new QGLBlurTextureInfo(image, texture, r); } |