Revision d5de0b1...

Go back to digest for 24th November 2013

Bug Fixes in KDE Base

Martin Gräßlin committed changes in [kde-workspace] /:

Better handling for making the compositing OpenGL context current

With QtQuick2 it's possible that the scene graph rendering context either
lives in an own thread or uses the main GUI thread. In the latter case
it's the same thread as our compositing OpenGL context lives in. This
means our basic assumption that between two rendering passes the context
stays current does not hold.

The code already ensured that before we start a rendering pass the
context is made current, but there are many more possible cases. If we
use OpenGL in areas not triggered by the rendering loop but in response
to other events the context needs to be made current. This includes the
loading and unloading of effects (some effects use OpenGL in the static
effect check, in the ctor and dtor), background loading of texture data,
lazy loading after first usage invoked by shortcut, etc. etc.

To properly handle these cases new methods are added to EffectsHandler
to make the compositing OpenGL context current. These calls delegate down
into the scene. On non-OpenGL scenes they are noop, but on OpenGL they go
into the backend and make the context current. In addition they ensure
that Qt doesn't think that it's QOpenGLContext is current by calling
doneCurrent() on the QOpenGLContext::currentContext(). This unfortunately
causes an additional call to makeCurrent with a null context, but there
is no other way to tell Qt - it doesn't notice when a different context
is made current with low level API calls. In the multi-threaded
architecture this doesn't matter as ::currentContext() returns null.

A short evaluation showed that a transition to QOpenGLContext doesn't
seem feasible. Qt only supports either GLX or EGL while KWin supports
both and when entering the transition phase for Wayland, it would become
extremely tricky if our native platform is X11, but we want a Wayland
EGL context. A future solution might be to have a "KWin-QPA plugin" which
uses either xcb or Wayland and hides everything from Qt.

The API documentation is extended to describe when the effects-framework
ensures that an OpenGL context is current. The effects are changed to
make the context current in cases where it's not guaranteed. This has
been done by looking for creation or deletion of GLTextures and Shaders.
If there are other OpenGL usages outside the rendering loop, ctor/dtor
this needs to be changed, too.

File Changes

Modified 18 files
  •   kwin/effects.cpp
  •   kwin/effects.h
  •   kwin/eglonxbackend.cpp
  •   kwin/eglonxbackend.h
  •   kwin/glxbackend.cpp
  •   kwin/glxbackend.h
  •   kwin/paintredirector.cpp
  •   kwin/scene.cpp
  •   kwin/scene.h
  •   kwin/scene_opengl.cpp
  •   kwin/scene_opengl.h
  •   kwin/libkwineffects/kwineffects.h
  •   kwin/effects/cube/cube.cpp
  •   kwin/effects/magnifier/magnifier.cpp
  •   kwin/effects/screenedge/screenedgeeffect.cpp
  •   kwin/effects/startupfeedback/startupfeedback.cpp
  •   kwin/effects/trackmouse/trackmouse.cpp
  •   kwin/effects/zoom/zoom.cpp
18 files changed in total