diff options
| author | Laszlo Agocs <laszlo.agocs@digia.com> | 2014-02-11 14:59:30 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-02-13 20:54:01 +0100 |
| commit | ff11af4fbc2948a3a3bc635549c7ac349d249abc (patch) | |
| tree | 79d6544923010bb740913842c550a010c6ae6922 /src/gui | |
| parent | 5b422304a9b97b628dc9990fd67e2f293d535b41 (diff) | |
QOpenGLWidget and new-style compositing on eglfs
Integrate with QOpenGLTextureBlitter, QOpenGLWidget and friends.
Change-Id: Ic2867b713a21a3d2820d546174fc9164b3dd220c
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/painting/qplatformbackingstore.cpp | 6 | ||||
| -rw-r--r-- | src/gui/painting/qplatformbackingstore.h | 2 |
2 files changed, 8 insertions, 0 deletions
diff --git a/src/gui/painting/qplatformbackingstore.cpp b/src/gui/painting/qplatformbackingstore.cpp index d2b1f056d7..a77fbb6826 100644 --- a/src/gui/painting/qplatformbackingstore.cpp +++ b/src/gui/painting/qplatformbackingstore.cpp @@ -156,6 +156,12 @@ void QPlatformTextureList::appendTexture(GLuint textureId, const QRect &geometry bi.rect = geometry; d->textures.append(bi); } + +void QPlatformTextureList::clear() +{ + Q_D(QPlatformTextureList); + d->textures.clear(); +} #endif // QT_NO_OPENGL /*! diff --git a/src/gui/painting/qplatformbackingstore.h b/src/gui/painting/qplatformbackingstore.h index a662a2290b..76fd3d40b4 100644 --- a/src/gui/painting/qplatformbackingstore.h +++ b/src/gui/painting/qplatformbackingstore.h @@ -81,12 +81,14 @@ public: ~QPlatformTextureList(); int count() const; + bool isEmpty() const { return count() == 0; } GLuint textureId(int index) const; QRect geometry(int index) const; void lock(bool on); bool isLocked() const; void appendTexture(GLuint textureId, const QRect &geometry); + void clear(); Q_SIGNALS: void locked(bool); |