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

backends/drm: fix EglGbmLayerSurface::doesSurfaceFit with multi gpu

Browse source 
CCBUG: 478921
This commit is contained in:
Xaver Hugl 2024-02-06 14:21:23 +01:00
parent 6d0f1fedc0
commit 1583b2c717
1 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -284,14 +284,24 @@ bool EglGbmLayerSurface::checkSurface(const QSize &size, const QMap<uint32_t, QL
bool EglGbmLayerSurface::doesSurfaceFit(Surface *surface, const QSize &size, const QMap<uint32_t, QList<uint64_t>> &formats) const
{
if (!surface) {
if (!surface || !surface->gbmSwapchain || surface->gbmSwapchain->size() != size) {
return false;
}
const auto &swapchain = surface->gbmSwapchain;
return swapchain
&& swapchain->size() == size
&& formats.contains(swapchain->format())
&& (surface->forceLinear || swapchain->modifier() == DRM_FORMAT_MOD_INVALID || formats[swapchain->format()].contains(swapchain->modifier()));
switch (surface->importMode) {
case MultiGpuImportMode::None:
case MultiGpuImportMode::Dmabuf:
case MultiGpuImportMode::LinearDmabuf: {
const auto format = surface->gbmSwapchain->format();
return formats.contains(format) && (surface->gbmSwapchain->modifier() == DRM_FORMAT_MOD_INVALID || formats[format].contains(surface->gbmSwapchain->modifier()));
}
case MultiGpuImportMode::DumbBuffer:
return formats.contains(surface->importDumbSwapchain->format());
case MultiGpuImportMode::Egl: {
const auto format = surface->importGbmSwapchain->format();
return formats.contains(format) && (surface->importGbmSwapchain->modifier() == DRM_FORMAT_MOD_INVALID || formats[format].contains(surface->importGbmSwapchain->modifier()));
}
}
Q_UNREACHABLE();
}
std::unique_ptr<EglGbmLayerSurface::Surface> EglGbmLayerSurface::createSurface(const QSize &size, const QMap<uint32_t, QList<uint64_t>> &formats) const