diff options
| author | axis <qt-info@nokia.com> | 2009-11-04 14:07:39 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2009-11-04 14:07:39 (GMT) |
| commit | 9cda9fb4bb496a7c589767bdcead131dbcdeeb79 (patch) | |
| tree | 2302096f06d4629ea62a85317429daa74ce6f02d /src/opengl/qglshaderprogram.h | |
| parent | be6357bfa96cdaffa5797fef99e95cac7121e5b3 (diff) | |
| parent | 7905101fb5ef18c776be515b9287356b1efc5ceb (diff) | |
| download | Qt-9cda9fb4bb496a7c589767bdcead131dbcdeeb79.zip Qt-9cda9fb4bb496a7c589767bdcead131dbcdeeb79.tar.gz Qt-9cda9fb4bb496a7c589767bdcead131dbcdeeb79.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6-s60
Diffstat (limited to 'src/opengl/qglshaderprogram.h')
| -rw-r--r-- | src/opengl/qglshaderprogram.h | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/src/opengl/qglshaderprogram.h b/src/opengl/qglshaderprogram.h index 708cf09..b7bd2d7 100644 --- a/src/opengl/qglshaderprogram.h +++ b/src/opengl/qglshaderprogram.h @@ -66,12 +66,7 @@ public: enum ShaderTypeBits { VertexShader = 0x0001, - FragmentShader = 0x0002, - - PartialShader = 0x1000, - - PartialVertexShader = PartialShader | VertexShader, - PartialFragmentShader = PartialShader | FragmentShader + FragmentShader = 0x0002 }; Q_DECLARE_FLAGS(ShaderType, ShaderTypeBits) @@ -100,8 +95,6 @@ private: Q_DISABLE_COPY(QGLShader) Q_DECLARE_PRIVATE(QGLShader) - - bool compile(const QList<QGLShader *>& shaders, QGLShader::ShaderType type); }; Q_DECLARE_OPERATORS_FOR_FLAGS(QGLShader::ShaderType) |