From 6fd787b9647eb0b17821a22974e40ae04cb4817e Mon Sep 17 00:00:00 2001 From: Dominik Holland Date: Mon, 16 Jan 2017 10:05:48 +0100 Subject: eglstream: Return if we don't have a OpenGL context Having an warning message should be enough, no need to still try to bind the texture and end in an assert. Change-Id: I6a5f297e1d2b01ca3649775be53ac28d7dcc6479 Reviewed-by: Paul Olav Tvete --- .../compositor/wayland-egl/waylandeglclientbufferintegration.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/hardwareintegration/compositor/wayland-egl/waylandeglclientbufferintegration.cpp') diff --git a/src/hardwareintegration/compositor/wayland-egl/waylandeglclientbufferintegration.cpp b/src/hardwareintegration/compositor/wayland-egl/waylandeglclientbufferintegration.cpp index 8b87db971..1e6723a04 100644 --- a/src/hardwareintegration/compositor/wayland-egl/waylandeglclientbufferintegration.cpp +++ b/src/hardwareintegration/compositor/wayland-egl/waylandeglclientbufferintegration.cpp @@ -298,8 +298,10 @@ void WaylandEglClientBufferIntegrationPrivate::init_egl_fd_texture(WaylandEglCli } state.eglMode = BufferState::ModeEGLStream; - if (!QOpenGLContext::currentContext()) + if (!QOpenGLContext::currentContext()) { qWarning("EglClientBufferIntegration: creating texture with no current context"); + return; + } //TODO This texture might end up in a different context than the quick item which wants to use it, this needs to be fixed somehow. -- cgit v1.2.3