diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2022-03-22 09:54:05 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2022-03-28 14:31:07 +0200 |
| commit | 8a734ba9287f8d25c3c3df50b4efc91b9035127d (patch) | |
| tree | 14f9afd88331d88ef809a8c9c8e282a613f0e844 /canvas | |
| parent | 6b147d3369ece427e490d3108de6ec9f7448c570 (diff) | |
Drop support for OpenGL denylist on X11
...which appears to have become even less relevant with
db89f53c31af997b9bf422b0e784afba8d62a42e "remove OpenGL VCL backend code". And
the vcl/unx/glxtest.cxx machinery that it is based on is (a) known to cause
issues like <https://gitlab.freedesktop.org/mesa/mesa/-/issues/3957>
"LibreOffice's OpenGL version detection code hangs when running inside a flatpak
container with a different mesa version", and (b) is one of the two reasons why
an soffice that uses Wayland nevertheless also requires Xwayland during startup
(the other reason being oosplash). So getting rid of the glxtest machinery is
beneficial.
The remaining two potential uses of OpenGL on X11/Wayland are the obscure
css.rendering.SpriteCanvas.OGL service implementation (about which
db89f53c31af997b9bf422b0e784afba8d62a42e states that "it seems has never been
finished or enabled (or so it most probably should be dumped too)") and some
slideshow transitions. About the latter, Caolán stated on IRC: "I think we
grew this set of stuff to check for dodgy opengl primarily for the case where
vcl used opengl for ordinary UI optimizations; but I think that use is gone now
so I wonder does it make sense to just drop all of that entirely; for just slide
transitions we apparently survived fine without the denylist for ages". (And in
any case there is still the WatchdogThread support with OpenGLZone::hardDisable
in VCLExceptionSignal_impl, vcl/source/app/svmain.cxx, should any OpenGL code
run into problems.)
(The removal of gb_LinkTarget_use_glxtest from gb_LinkTarget_use_vclmain, which
indirectly brought in gb_LinkTarget_use_libraries,*,vcl, revealed that an
explicit use of vcl was missing from various Executables etc., which thus had to
be added now.)
Change-Id: Ifa5220fd09910a4459ca546d9655e479a2e38f1e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131943
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'canvas')
| -rw-r--r-- | canvas/Executable_canvasdemo.mk | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/canvas/Executable_canvasdemo.mk b/canvas/Executable_canvasdemo.mk index e47ae11dd13f..b213293e4780 100644 --- a/canvas/Executable_canvasdemo.mk +++ b/canvas/Executable_canvasdemo.mk @@ -31,6 +31,7 @@ $(eval $(call gb_Executable_use_libraries,canvasdemo,\ tl \ sal \ salhelper \ + vcl \ )) $(eval $(call gb_Executable_add_exception_objects,canvasdemo,\ |