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

Change Client::ShmPool to return Client::Buffer* instead of wl_buffer*

Browse source
This commit is contained in:
Martin Gräßlin 2014-09-20 15:11:40 +02:00
parent e33c005118
commit c14bbe9c53
1 changed files with 20 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -265,9 +265,15 @@ void TestWaylandSurface::testAttachBuffer()
QImage blue(24, 24, QImage::Format_ARGB32_Premultiplied); QImage blue(24, 24, QImage::Format_ARGB32_Premultiplied);
blue.fill(QColor(0, 0, 255, 128)); blue.fill(QColor(0, 0, 255, 128));
wl_buffer *blackBuffer = pool.createBuffer(black); wl_buffer *blackBuffer = *(pool.createBuffer(black));
wl_buffer *redBuffer = pool.createBuffer(red); KWayland::Client::Buffer *redBuffer = pool.createBuffer(red);
wl_buffer *blueBuffer = pool.createBuffer(blue); KWayland::Client::Buffer *blueBuffer = pool.createBuffer(blue);
QCOMPARE(blueBuffer->format(), KWayland::Client::Buffer::Format::ARGB32);
QCOMPARE(blueBuffer->size(), blue.size());
QVERIFY(!blueBuffer->isReleased());
QVERIFY(!blueBuffer->isUsed());
QCOMPARE(blueBuffer->stride(), blue.bytesPerLine());
s->attachBuffer(redBuffer); s->attachBuffer(redBuffer);
s->attachBuffer(blackBuffer); s->attachBuffer(blackBuffer);
@ -296,13 +302,23 @@ void TestWaylandSurface::testAttachBuffer()
QCOMPARE(buffer2->data(), red); QCOMPARE(buffer2->data(), red);
QCOMPARE(buffer2->data().format(), QImage::Format_ARGB32); QCOMPARE(buffer2->data().format(), QImage::Format_ARGB32);
buffer2->unref(); buffer2->unref();
QVERIFY(buffer2->isReferenced());
QVERIFY(!redBuffer->isReleased());
// render another frame // render another frame
blueBuffer->setUsed(true);
QVERIFY(blueBuffer->isUsed());
s->attachBuffer(blueBuffer); s->attachBuffer(blueBuffer);
s->damage(QRect(0, 0, 24, 24)); s->damage(QRect(0, 0, 24, 24));
s->commit(KWayland::Client::Surface::CommitFlag::None); s->commit(KWayland::Client::Surface::CommitFlag::None);
damageSpy.clear(); damageSpy.clear();
QVERIFY(damageSpy.wait()); QVERIFY(damageSpy.wait());
QVERIFY(!buffer2->isReferenced());
delete buffer2;
// TODO: we should have a signal on when the Buffer gets released
QTest::qWait(100);
QVERIFY(redBuffer->isReleased());
KWayland::Server::BufferInterface *buffer3 = serverSurface->buffer(); KWayland::Server::BufferInterface *buffer3 = serverSurface->buffer();
buffer3->ref(); buffer3->ref();
QVERIFY(buffer3->shmBuffer()); QVERIFY(buffer3->shmBuffer());
@ -316,6 +332,7 @@ void TestWaylandSurface::testAttachBuffer()
} }
} }
buffer3->unref(); buffer3->unref();
QVERIFY(buffer3->isReferenced());
// TODO: add signal test on release // TODO: add signal test on release
buffer->unref(); buffer->unref();