3d619c995b
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
55 lines
1.4 KiB
C++
55 lines
1.4 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/>.
|
|
*********************************************************************/
|
|
#ifndef KWIN_DRM_GBM_SURFACE_H
|
|
#define KWIN_DRM_GBM_SURFACE_H
|
|
|
|
#include <stdint.h>
|
|
|
|
struct gbm_bo;
|
|
struct gbm_device;
|
|
struct gbm_surface;
|
|
|
|
namespace KWin
|
|
{
|
|
|
|
class GbmSurface
|
|
{
|
|
public:
|
|
explicit GbmSurface(gbm_device *gbm, uint32_t width, uint32_t height, uint32_t format, uint32_t flags);
|
|
~GbmSurface();
|
|
|
|
gbm_bo *lockFrontBuffer();
|
|
void releaseBuffer(gbm_bo *bo);
|
|
|
|
operator bool() const {
|
|
return m_surface != nullptr;
|
|
}
|
|
|
|
gbm_surface* surface() const {
|
|
return m_surface;
|
|
}
|
|
|
|
private:
|
|
gbm_surface *m_surface;
|
|
};
|
|
|
|
}
|
|
|
|
#endif
|