yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Properly update EGL Texture for sub-surface buffers

Browse source 
We need to use the tracked damage instead of Toplevel's damage.
This commit is contained in:
Martin Gräßlin 2016-04-01 09:52:56 +02:00
parent baca72a9c4
commit 1a166f36e2
1 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
abstract_egl_backend.cpp
View file

@ -22,6 +22,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "wayland_server.h"
#include <KWayland/Server/buffer_interface.h>
#include <KWayland/Server/display.h>
#include <KWayland/Server/surface_interface.h>
// kwin libs
#include <kwinglplatform.h>
// Qt
@ -289,6 +290,9 @@ bool AbstractEglTexture::loadTexture(WindowPixmap *pixmap)
return loadTexture(pixmap->pixmap(), pixmap->toplevel()->size());
}
// try Wayland loading
if (auto s = pixmap->surface()) {
s->resetTrackedDamage();
}
if (buffer->shmBuffer()) {
return loadShmTexture(buffer);
} else {
@ -339,6 +343,7 @@ void AbstractEglTexture::updateTexture(WindowPixmap *pixmap)
}
return;
}
auto s = pixmap->surface();
if (!buffer->shmBuffer()) {
q->bind();
EGLImageKHR image = attach(buffer);
@ -347,16 +352,20 @@ void AbstractEglTexture::updateTexture(WindowPixmap *pixmap)
eglDestroyImageKHR(m_backend->eglDisplay(), m_image);
m_image = image;
}
if (s) {
s->resetTrackedDamage();
}
return;
}
// shm fallback
const QImage &image = buffer->data();
if (image.isNull()) {
if (image.isNull() || !s) {
return;
}
Q_ASSERT(image.size() == m_size);
q->bind();
const QRegion &damage = pixmap->toplevel()->damage();
const QRegion damage = s->trackedDamage();
s->resetTrackedDamage();
// TODO: this should be shared with GLTexture::update
if (GLPlatform::instance()->isGLES()) {