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

backends/drm: fix recording with direct scanout

Browse source 
BUG: 450943
This commit is contained in:
Xaver Hugl 2022-02-28 17:27:44 +01:00
parent 1256ab4b84
commit 72d9711e5d
1 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/backends/drm/egl_gbm_layer.cpp
View file

@ -20,6 +20,7 @@
#include "surfaceitem_wayland.h" #include "surfaceitem_wayland.h"
#include "kwineglimagetexture.h" #include "kwineglimagetexture.h"
#include "drm_backend.h" #include "drm_backend.h"
#include "kwineglutils_p.h"
#include "KWaylandServer/surface_interface.h" #include "KWaylandServer/surface_interface.h"
#include "KWaylandServer/linuxdmabufv1clientbuffer.h" #include "KWaylandServer/linuxdmabufv1clientbuffer.h"
@ -241,20 +242,26 @@ bool EglGbmLayer::doesSwapchainFit(DumbSwapchain *swapchain) const
QSharedPointer<GLTexture> EglGbmLayer::texture() const QSharedPointer<GLTexture> EglGbmLayer::texture() const
{ {
const auto createImage = [this](GbmBuffer *gbmBuffer) {
EGLImageKHR image = eglCreateImageKHR(m_eglBackend->eglDisplay(), nullptr, EGL_NATIVE_PIXMAP_KHR, gbmBuffer->getBo(), nullptr);
if (image == EGL_NO_IMAGE_KHR) {
qCWarning(KWIN_DRM) << "Failed to record frame: Error creating EGLImageKHR - " << getEglErrorString();
return QSharedPointer<EGLImageTexture>(nullptr);
}
return QSharedPointer<EGLImageTexture>::create(m_eglBackend->eglDisplay(), image, GL_RGBA8, m_displayDevice->sourceSize());
};
if (m_scanoutBuffer) {
return createImage(dynamic_cast<GbmBuffer*>(m_scanoutBuffer.data()));
}
if (m_shadowBuffer) { if (m_shadowBuffer) {
return m_shadowBuffer->texture(); return m_shadowBuffer->texture();
} }
GbmBuffer *gbmBuffer = m_gbmSurface->currentBuffer().get(); GbmBuffer *gbmBuffer = m_gbmSurface->currentBuffer().data();
if (!gbmBuffer) { if (!gbmBuffer) {
qCWarning(KWIN_DRM) << "Failed to record frame: No gbm buffer!"; qCWarning(KWIN_DRM) << "Failed to record frame: No gbm buffer!";
return nullptr; return nullptr;
} }
EGLImageKHR image = eglCreateImageKHR(m_eglBackend->eglDisplay(), nullptr, EGL_NATIVE_PIXMAP_KHR, gbmBuffer->getBo(), nullptr); return createImage(gbmBuffer);
if (image == EGL_NO_IMAGE_KHR) {
qCWarning(KWIN_DRM) << "Failed to record frame: Error creating EGLImageKHR - " << glGetError();
return nullptr;
}
return QSharedPointer<EGLImageTexture>::create(m_eglBackend->eglDisplay(), image, GL_RGBA8, m_displayDevice->sourceSize());
} }
QSharedPointer<DrmBuffer> EglGbmLayer::importBuffer() QSharedPointer<DrmBuffer> EglGbmLayer::importBuffer()