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

platformsupport/scenes/opengl: don't crash when creating the texture fails

Browse source
This commit is contained in:
Xaver Hugl 2023-11-23 19:06:26 +01:00
parent 985f0edf88
commit 9e03a219cb
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/platformsupport/scenes/opengl/basiceglsurfacetexture_wayland.cpp
View file

@ -103,16 +103,18 @@ void BasicEGLSurfaceTextureWayland::updateShmTexture(GraphicsBuffer *buffer, con
bool BasicEGLSurfaceTextureWayland::loadDmabufTexture(GraphicsBuffer *buffer) bool BasicEGLSurfaceTextureWayland::loadDmabufTexture(GraphicsBuffer *buffer)
{ {
auto createTexture = [this](EGLImageKHR image, const QSize &size, bool isExternalOnly) { auto createTexture = [this](EGLImageKHR image, const QSize &size, bool isExternalOnly) -> std::shared_ptr<GLTexture> {
if (Q_UNLIKELY(image == EGL_NO_IMAGE_KHR)) { if (Q_UNLIKELY(image == EGL_NO_IMAGE_KHR)) {
qCritical(KWIN_OPENGL) << "Invalid dmabuf-based wl_buffer"; qCritical(KWIN_OPENGL) << "Invalid dmabuf-based wl_buffer";
return std::shared_ptr<GLTexture>(); return nullptr;
} }
GLint target = isExternalOnly ? GL_TEXTURE_EXTERNAL_OES : GL_TEXTURE_2D; GLint target = isExternalOnly ? GL_TEXTURE_EXTERNAL_OES : GL_TEXTURE_2D;
auto texture = std::make_shared<GLTexture>(target); auto texture = std::make_shared<GLTexture>(target);
texture->setSize(size); texture->setSize(size);
texture->create(); if (!texture->create()) {
return nullptr;
}
texture->setWrapMode(GL_CLAMP_TO_EDGE); texture->setWrapMode(GL_CLAMP_TO_EDGE);
texture->setFilter(GL_LINEAR); texture->setFilter(GL_LINEAR);
texture->bind(); texture->bind();