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

autotests: Fix TestWaylandSurface

Browse source 
The API of SurfaceInterface was changed so it always maintains an opaque
region.

At the surface commit, if the attached buffer is opaque, the whole
surface will be marked opaque. Otherwise, the specified opaque region
will be intersected with the surface rect.
This commit is contained in:
Vlad Zahorodnii 2022-04-15 11:53:30 +03:00
parent bb28c84ec4
commit c157e948e2
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/wayland/autotests/client/test_wayland_surface.cpp
View file

@ -625,6 +625,10 @@ void TestWaylandSurface::testOpaque()
QCOMPARE(opaqueRegionChangedSpy.count(), 0); QCOMPARE(opaqueRegionChangedSpy.count(), 0);
// so let's commit to get the new region // so let's commit to get the new region
QImage black(20, 40, QImage::Format_ARGB32_Premultiplied);
black.fill(Qt::black);
QSharedPointer<KWayland::Client::Buffer> buffer1 = m_shm->createBuffer(black).toStrongRef();
s->attachBuffer(buffer1);
s->commit(Surface::CommitFlag::None); s->commit(Surface::CommitFlag::None);
QVERIFY(opaqueRegionChangedSpy.wait()); QVERIFY(opaqueRegionChangedSpy.wait());
QCOMPARE(opaqueRegionChangedSpy.count(), 1); QCOMPARE(opaqueRegionChangedSpy.count(), 1);
@ -638,13 +642,13 @@ void TestWaylandSurface::testOpaque()
QCOMPARE(opaqueRegionChangedSpy.count(), 1); QCOMPARE(opaqueRegionChangedSpy.count(), 1);
QCOMPARE(serverSurface->opaque(), QRegion(0, 10, 20, 30)); QCOMPARE(serverSurface->opaque(), QRegion(0, 10, 20, 30));
// let's change the opaque region // let's change the opaque region, it will be clipped with rect(0, 0, 20, 40)
s->setOpaqueRegion(m_compositor->createRegion(QRegion(10, 20, 30, 40)).get()); s->setOpaqueRegion(m_compositor->createRegion(QRegion(10, 20, 30, 40)).get());
s->commit(Surface::CommitFlag::None); s->commit(Surface::CommitFlag::None);
QVERIFY(opaqueRegionChangedSpy.wait()); QVERIFY(opaqueRegionChangedSpy.wait());
QCOMPARE(opaqueRegionChangedSpy.count(), 2); QCOMPARE(opaqueRegionChangedSpy.count(), 2);
QCOMPARE(opaqueRegionChangedSpy.last().first().value<QRegion>(), QRegion(10, 20, 30, 40)); QCOMPARE(opaqueRegionChangedSpy.last().first().value<QRegion>(), QRegion(10, 20, 10, 20));
QCOMPARE(serverSurface->opaque(), QRegion(10, 20, 30, 40)); QCOMPARE(serverSurface->opaque(), QRegion(10, 20, 10, 20));
// and let's go back to an empty region // and let's go back to an empty region
s->setOpaqueRegion(); s->setOpaqueRegion();