diff options
| author | Morten Johan Sørvig <morten.sorvig@nokia.com> | 2010-01-12 08:07:22 (GMT) |
|---|---|---|
| committer | Morten Johan Sørvig <morten.sorvig@nokia.com> | 2010-01-12 08:07:22 (GMT) |
| commit | b73b5e5a99418cef3b218435382724ab71999558 (patch) | |
| tree | 1b41b496472fac0fd47d93daa3593271e7ac7a7e /src/opengl/gl2paintengineex/qglengineshadermanager_p.h | |
| parent | 705ebaea0d81c76c97e7230f0acbe85442981555 (diff) | |
| parent | e8f45c5ba8371053817f13e70d78b06f229d8666 (diff) | |
| download | Qt-b73b5e5a99418cef3b218435382724ab71999558.zip Qt-b73b5e5a99418cef3b218435382724ab71999558.tar.gz Qt-b73b5e5a99418cef3b218435382724ab71999558.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt
Diffstat (limited to 'src/opengl/gl2paintengineex/qglengineshadermanager_p.h')
| -rw-r--r-- | src/opengl/gl2paintengineex/qglengineshadermanager_p.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/opengl/gl2paintengineex/qglengineshadermanager_p.h b/src/opengl/gl2paintengineex/qglengineshadermanager_p.h index 1ec4cdc..a3464d4 100644 --- a/src/opengl/gl2paintengineex/qglengineshadermanager_p.h +++ b/src/opengl/gl2paintengineex/qglengineshadermanager_p.h @@ -344,6 +344,7 @@ public: */ QGLEngineSharedShaders(const QGLContext *context); + ~QGLEngineSharedShaders(); QGLShaderProgram *simpleProgram() { return simpleShaderProg; } QGLShaderProgram *blitProgram() { return blitShaderProg; } @@ -468,6 +469,9 @@ public: void setDirty(); // someone has manually changed the current shader program bool useCorrectShaderProg(); // returns true if the shader program needed to be changed + void useSimpleProgram(); + void useBlitProgram(); + QGLShaderProgram* currentProgram(); // Returns pointer to the shader the manager has chosen QGLShaderProgram* simpleProgram(); // Used to draw into e.g. stencil buffers QGLShaderProgram* blitProgram(); // Used to blit a texture into the framebuffer |