diff options
| author | Morten Sorvig <msorvig@trolltech.com> | 2009-09-17 04:52:40 (GMT) |
|---|---|---|
| committer | Morten Sorvig <msorvig@trolltech.com> | 2009-09-17 04:52:40 (GMT) |
| commit | 4bf2d055aa31a7d2768538368d2984a3d594650e (patch) | |
| tree | ccf2345bf6c31dee238c8486c79a842dbb214f07 /src/opengl/gl2paintengineex/qglengineshadermanager_p.h | |
| parent | db8f89cdb4fcb0d8436db80d50221308900dca01 (diff) | |
| parent | 64e03f7ada9eb6af7c65dbea7a36ebcb3f4e67fb (diff) | |
| download | Qt-4bf2d055aa31a7d2768538368d2984a3d594650e.zip Qt-4bf2d055aa31a7d2768538368d2984a3d594650e.tar.gz Qt-4bf2d055aa31a7d2768538368d2984a3d594650e.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'src/opengl/gl2paintengineex/qglengineshadermanager_p.h')
| -rw-r--r-- | src/opengl/gl2paintengineex/qglengineshadermanager_p.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/opengl/gl2paintengineex/qglengineshadermanager_p.h b/src/opengl/gl2paintengineex/qglengineshadermanager_p.h index 423df99..3c5a5f5 100644 --- a/src/opengl/gl2paintengineex/qglengineshadermanager_p.h +++ b/src/opengl/gl2paintengineex/qglengineshadermanager_p.h @@ -245,6 +245,8 @@ struct QGLEngineShaderProg QVector<uint> uniformLocations; + bool useTextureCoords; + bool operator==(const QGLEngineShaderProg& other) { // We don't care about the program return ( mainVertexShader == other.mainVertexShader && @@ -408,7 +410,6 @@ public: void optimiseForBrushTransform(const QTransform &transform); void setSrcPixelType(Qt::BrushStyle); void setSrcPixelType(PixelSrcType); // For non-brush sources, like pixmaps & images - void setTextureCoordsEnabled(bool); // For images & text glyphs void setUseGlobalOpacity(bool); void setMaskType(MaskType); void setCompositionMode(QPainter::CompositionMode); @@ -450,7 +451,6 @@ private: int srcPixelType; bool useGlobalOpacity; MaskType maskType; - bool useTextureCoords; QPainter::CompositionMode compositionMode; QGLCustomShaderStage* customSrcStage; |