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

backends/drm: add more nullptr checks for m_surface

Browse source 
BUG: 475380
This commit is contained in:
Xaver Hugl 2023-10-10 21:55:44 +02:00
parent ed1969c3d9
commit aaffd459ce
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/backends/drm/drm_egl_layer_surface.cpp
View file

@ -191,12 +191,16 @@ EglGbmBackend *EglGbmLayerSurface::eglBackend() const
std::shared_ptr<DrmFramebuffer> EglGbmLayerSurface::currentBuffer() const std::shared_ptr<DrmFramebuffer> EglGbmLayerSurface::currentBuffer() const
{ {
return m_surface->currentFramebuffer; return m_surface ? m_surface->currentFramebuffer : nullptr;
} }
const ColorDescription &EglGbmLayerSurface::colorDescription() const const ColorDescription &EglGbmLayerSurface::colorDescription() const
{ {
return m_surface->shadowTexture ? m_surface->intermediaryColorDescription : m_surface->targetColorDescription; if (m_surface) {
return m_surface->shadowTexture ? m_surface->intermediaryColorDescription : m_surface->targetColorDescription;
} else {
return ColorDescription::sRGB;
}
} }
bool EglGbmLayerSurface::doesSurfaceFit(const QSize &size, const QMap<uint32_t, QVector<uint64_t>> &formats) const bool EglGbmLayerSurface::doesSurfaceFit(const QSize &size, const QMap<uint32_t, QVector<uint64_t>> &formats) const
@ -206,7 +210,11 @@ bool EglGbmLayerSurface::doesSurfaceFit(const QSize &size, const QMap<uint32_t,
std::shared_ptr<GLTexture> EglGbmLayerSurface::texture() const std::shared_ptr<GLTexture> EglGbmLayerSurface::texture() const
{ {
return m_surface->shadowTexture ? m_surface->shadowTexture : m_surface->currentSlot->texture(); if (m_surface) {
return m_surface->shadowTexture ? m_surface->shadowTexture : m_surface->currentSlot->texture();
} else {
return nullptr;
}
} }
std::shared_ptr<DrmFramebuffer> EglGbmLayerSurface::renderTestBuffer(const QSize &bufferSize, const QMap<uint32_t, QVector<uint64_t>> &formats) std::shared_ptr<DrmFramebuffer> EglGbmLayerSurface::renderTestBuffer(const QSize &bufferSize, const QMap<uint32_t, QVector<uint64_t>> &formats)