5bca058826
Summary:
In 47343fb we made GBM buffer shared.
What we wanted to do was:
Unbox the shared_pointer<GBMSurface> to give us a GBMSurface* object
Call the gbm_surface*() on that operator
Then cast that to a void* for eglCreatePlatformWindowSurfaceEXT
What we did:
Cast the std::shared_ptr<GBMSurface> to a gbm_surface* then cast that
to void*.
This is just a garbage value and it crashes in Mesa when we do our first
paint.
I've replaced that with an explicit method then we can use shared_ptr's
-> operator rather than get() which does the right thing in a readable
way.
Test Plan:
It crashed after rebasing to master (for Aleix too)
No longer crashes
Reviewers: #plasma
Subscribers: plasma-devel, kwin, #kwin
Tags: #kwin
Differential Revision: https://phabricator.kde.org/D8251
119 lines
3 KiB
C++
119 lines
3 KiB
C++
/********************************************************************
|
|
KWin - the KDE window manager
|
|
This file is part of the KDE project.
|
|
|
|
Copyright (C) 2017 Martin Flöser <mgraesslin@kde.org>
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 2 of the License, or
|
|
(at your option) any later version.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
*********************************************************************/
|
|
#include "../plugins/platforms/drm/gbm_surface.h"
|
|
#include <QtTest/QtTest>
|
|
|
|
#include <gbm.h>
|
|
|
|
// mocking
|
|
|
|
struct gbm_device {
|
|
bool surfaceShouldFail = false;
|
|
};
|
|
|
|
struct gbm_surface {
|
|
uint32_t width;
|
|
uint32_t height;
|
|
uint32_t format;
|
|
uint32_t flags;
|
|
};
|
|
|
|
struct gbm_bo {
|
|
};
|
|
|
|
struct gbm_surface *gbm_surface_create(struct gbm_device *gbm, uint32_t width, uint32_t height, uint32_t format, uint32_t flags)
|
|
{
|
|
if (gbm && gbm->surfaceShouldFail) {
|
|
return nullptr;
|
|
}
|
|
auto ret = new gbm_surface{width, height, format, flags};
|
|
return ret;
|
|
}
|
|
|
|
void gbm_surface_destroy(struct gbm_surface *surface)
|
|
{
|
|
delete surface;
|
|
}
|
|
|
|
struct gbm_bo *gbm_surface_lock_front_buffer(struct gbm_surface *surface)
|
|
{
|
|
Q_UNUSED(surface)
|
|
return new gbm_bo;
|
|
}
|
|
|
|
void gbm_surface_release_buffer(struct gbm_surface *surface, struct gbm_bo *bo)
|
|
{
|
|
Q_UNUSED(surface)
|
|
delete bo;
|
|
}
|
|
|
|
using KWin::GbmSurface;
|
|
|
|
class GbmSurfaceTest : public QObject
|
|
{
|
|
Q_OBJECT
|
|
private Q_SLOTS:
|
|
void testCreate();
|
|
void testCreateFailure();
|
|
void testBo();
|
|
};
|
|
|
|
void GbmSurfaceTest::testCreate()
|
|
{
|
|
GbmSurface surface(nullptr, 2, 3, 4, 5);
|
|
gbm_surface *native = surface.surface();
|
|
QVERIFY(surface);
|
|
QCOMPARE(native->width, 2u);
|
|
QCOMPARE(native->height, 3u);
|
|
QCOMPARE(native->format, 4u);
|
|
QCOMPARE(native->flags, 5u);
|
|
}
|
|
|
|
void GbmSurfaceTest::testCreateFailure()
|
|
{
|
|
gbm_device dev{true};
|
|
GbmSurface surface(&dev, 2, 3, 4, 5);
|
|
QVERIFY(!surface);
|
|
gbm_surface *native = surface.surface();
|
|
QVERIFY(!native);
|
|
}
|
|
|
|
void GbmSurfaceTest::testBo()
|
|
{
|
|
GbmSurface surface(nullptr, 2, 3, 4, 5);
|
|
// release buffer on nullptr should not be a problem
|
|
surface.releaseBuffer(nullptr);
|
|
// now an actual buffer
|
|
auto bo = surface.lockFrontBuffer();
|
|
surface.releaseBuffer(bo);
|
|
|
|
// and a surface which fails
|
|
gbm_device dev{true};
|
|
GbmSurface surface2(&dev, 2, 3, 4, 5);
|
|
QVERIFY(!surface2.lockFrontBuffer());
|
|
auto bo2 = surface.lockFrontBuffer();
|
|
// this won't do anything
|
|
surface2.releaseBuffer(bo2);
|
|
// so we need to clean up properly
|
|
surface.releaseBuffer(bo2);
|
|
}
|
|
|
|
QTEST_GUILESS_MAIN(GbmSurfaceTest)
|
|
#include "test_gbm_surface.moc"
|