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

backends/drm: don't crash if importing a texture fails

Browse source 
CCBUG: 456500
This commit is contained in:
Xaver Hugl 2022-07-13 21:51:22 +02:00
parent c8c1b05661
commit 636b411b31
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/backends/drm/drm_backend.cpp
View file

@ -647,7 +647,14 @@ std::shared_ptr<DmaBufTexture> DrmBackend::createDmaBufTexture(const QSize &size
gbm_bo_destroy(bo); gbm_bo_destroy(bo);
const auto eglBackend = static_cast<EglGbmBackend *>(m_renderBackend); const auto eglBackend = static_cast<EglGbmBackend *>(m_renderBackend);
eglBackend->makeCurrent(); eglBackend->makeCurrent();
return std::make_shared<DmaBufTexture>(eglBackend->importDmaBufAsTexture(attributes), attributes); if (auto texture = eglBackend->importDmaBufAsTexture(attributes)) {
return std::make_shared<DmaBufTexture>(texture, attributes);
} else {
for (int i = 0; i < attributes.planeCount; ++i) {
::close(attributes.fd[i]);
}
return nullptr;
}
} }
DrmGpu *DrmBackend::primaryGpu() const DrmGpu *DrmBackend::primaryGpu() const