diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-08-24 14:41:36 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-08-24 14:41:36 (GMT) |
| commit | 7ba3250a1e6cf54c1cacbdf71ac57befd66eed90 (patch) | |
| tree | 0241facd872bab793819f3a9ee5119d9c5690b40 /src/imports/shaders/shadereffectitem.h | |
| parent | 3cc1c3120be39eb5f8598f77ebe2ca541642b1b4 (diff) | |
| parent | 4eb50fbbf414103fb2f9dfb8260f4db5d61190c4 (diff) | |
| download | Qt-7ba3250a1e6cf54c1cacbdf71ac57befd66eed90.zip Qt-7ba3250a1e6cf54c1cacbdf71ac57befd66eed90.tar.gz Qt-7ba3250a1e6cf54c1cacbdf71ac57befd66eed90.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Fix for qml1shaderplugin GPU resource handling on Symbian
Diffstat (limited to 'src/imports/shaders/shadereffectitem.h')
| -rw-r--r-- | src/imports/shaders/shadereffectitem.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/imports/shaders/shadereffectitem.h b/src/imports/shaders/shadereffectitem.h index aebe897..6c225a2 100644 --- a/src/imports/shaders/shadereffectitem.h +++ b/src/imports/shaders/shadereffectitem.h @@ -115,7 +115,7 @@ private: private: QString m_fragment_code; QString m_vertex_code; - QGLShaderProgram m_program; + QGLShaderProgram* m_program; QVector<const char *> m_attributeNames; QSet<QByteArray> m_uniformNames; QSize m_meshResolution; @@ -143,6 +143,8 @@ private: bool m_hasShaderPrograms : 1; bool m_mirrored : 1; bool m_defaultVertexShader : 1; + + QGLFramebufferObject* m_contextObserver; }; QT_END_HEADER |