summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDominik Holland <dominik.holland@pelagicore.com>2017-01-16 10:05:48 +0100
committerDominik Holland <dominik.holland@pelagicore.com>2017-01-19 11:06:53 +0000
commit6fd787b9647eb0b17821a22974e40ae04cb4817e (patch)
tree184b741e113f5c38ce1b9c594c966e1a66d8e273
parent20632f711e6b13b14e7beb28786b9de0f4f9e151 (diff)
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 <paul.tvete@qt.io>
-rw-r--r--src/hardwareintegration/compositor/wayland-egl/waylandeglclientbufferintegration.cpp4
1 files changed, 3 insertions, 1 deletions
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.