diff options
author | Samuel Rødal <samuel.rodal@nokia.com> | 2011-09-07 10:31:03 +0200 |
---|---|---|
committer | Paul Olav Tvete <paul.tvete@nokia.com> | 2011-09-08 11:07:56 +0200 |
commit | 1b1831500142c995137f5e4b1bc03d21aa08e1e1 (patch) | |
tree | 5fcd21ee23c37fbe3466fde353d0bcfd09a051e2 /examples/opengl/paintedwindow/paintedwindow.h | |
parent | 68974d8e647febb80a47d9cf6ce9452f3ce4fa21 (diff) |
Improved and made public the QOpenGLPaintDevice API.
The new API is more flexible, allowing the use of QOpenGLPaintDevice
with any QOpenGLContext, and putting more responsibility on the user for
ensuring the correct FBO is current (the user knows best anyhow).
Task-number: QTBUG-21263
Change-Id: I50b954125f552baef52fbb3fe2ed907a11ad519c
Reviewed-on: http://codereview.qt-project.org/4325
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Paul Olav Tvete <paul.tvete@nokia.com>
Diffstat (limited to 'examples/opengl/paintedwindow/paintedwindow.h')
-rw-r--r-- | examples/opengl/paintedwindow/paintedwindow.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/examples/opengl/paintedwindow/paintedwindow.h b/examples/opengl/paintedwindow/paintedwindow.h index 9e1b43638c..9da9992a3e 100644 --- a/examples/opengl/paintedwindow/paintedwindow.h +++ b/examples/opengl/paintedwindow/paintedwindow.h @@ -20,11 +20,7 @@ private slots: private: void resizeEvent(QResizeEvent *); + void exposeEvent(QExposeEvent *); QOpenGLContext *m_context; - QOpenGLFramebufferObject *m_fbo; - QOpenGLShaderProgram *m_program; - - GLuint m_vertexAttribute; - GLuint m_texCoordsAttribute; }; |