diff options
author | Luboš Luňák <l.lunak@collabora.com> | 2020-12-08 10:44:52 +0100 |
---|---|---|
committer | Luboš Luňák <l.lunak@collabora.com> | 2020-12-09 11:46:47 +0100 |
commit | 16e93759134a05a52ef218c4a5ce0f3ea67b0221 (patch) | |
tree | cdf9b1122ace6ccd6a12a3edeeb629f70e29eb3a /officecfg | |
parent | 8d6c51bc9ca9663b4a9328024d2a3fcf07677ba4 (diff) |
remove isVCLOpenGLEnabled() settings, add DisableOpenGL option
The VCL OpenGL backend code has been removed, so the settings
for it no longer make sense.
But there's still the code for detecting if OpenGL is broken,
and that one makes sense to keep. It turns out other OpenGL code
(such as slideshows) doesn't even use that, so turn this into
a new DisableOpenGL option, make OpenGL-related failsafe code
set and use that, and OpenGL code should use
OpenGLHelper::supportsOpenGL() to make sure OpenGL use is not blocked.
Change-Id: Iec83f204e89bfb0b6eea13be77da8f0f4727a074
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107398
Tested-by: Jenkins
Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
Diffstat (limited to 'officecfg')
-rw-r--r-- | officecfg/registry/data/org/openoffice/Office/Common.xcu | 5 | ||||
-rw-r--r-- | officecfg/registry/schema/org/openoffice/Office/Common.xcs | 13 |
2 files changed, 2 insertions, 16 deletions
diff --git a/officecfg/registry/data/org/openoffice/Office/Common.xcu b/officecfg/registry/data/org/openoffice/Office/Common.xcu index e4c3fca51f7e..cb53de0292a5 100644 --- a/officecfg/registry/data/org/openoffice/Office/Common.xcu +++ b/officecfg/registry/data/org/openoffice/Office/Common.xcu @@ -50,11 +50,6 @@ </prop> </node> <node oor:name="VCL"> - <prop oor:name="UseOpenGL" oor:type="xs:boolean"> - <value install:module="macosx">false</value> - <value install:module="unx">false</value> - <value install:module="wnt">false</value> - </prop> <prop oor:name="UseSkia" oor:type="xs:boolean"> <value install:module="macosx">false</value> <value install:module="unx">false</value> diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs b/officecfg/registry/schema/org/openoffice/Office/Common.xcs index 02e62d950ed2..2f961f0532a2 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs @@ -850,18 +850,9 @@ <info> <desc>Contains settings for VCL.</desc> </info> - <prop oor:name="UseOpenGL" oor:type="xs:boolean" oor:nillable="false"> + <prop oor:name="DisableOpenGL" oor:type="xs:boolean" oor:nillable="false"> <info> - <desc>Specifies if OpenGL rendering should be used in VCL backends - supporting it.</desc> - </info> - <value>false</value> - </prop> - <prop oor:name="ForceOpenGL" oor:type="xs:boolean" oor:nillable="false"> - <info> - <desc>Specifies if OpenGL rendering should be used in VCL backends - supporting it. This one forces the use of OpenGL even if the - denylist would block the OpenGL driver.</desc> + <desc>Specifies if all OpenGL usage should be disabled.</desc> </info> <value>false</value> </prop> |