diff options
Diffstat (limited to 'vcl/source/opengl')
| -rw-r--r-- | vcl/source/opengl/OpenGLHelper.cxx | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/vcl/source/opengl/OpenGLHelper.cxx b/vcl/source/opengl/OpenGLHelper.cxx index 588ae70cabe0..882f35d424af 100644 --- a/vcl/source/opengl/OpenGLHelper.cxx +++ b/vcl/source/opengl/OpenGLHelper.cxx @@ -956,8 +956,8 @@ bool OpenGLHelper::isVCLOpenGLEnabled() static bool bEnable = false; static bool bForceOpenGL = false; - // If we are a console app, then we don't use OpenGL - if ( Application::IsConsoleOnly() ) + // No hardware rendering, so no OpenGL + if (Application::IsBitmapRendering()) return false; //tdf#106155, disable GL while loading certain bitmaps needed for the initial toplevel windows @@ -988,19 +988,14 @@ bool OpenGLHelper::isVCLOpenGLEnabled() else if (bSupportsVCLOpenGL) { static bool bEnableGLEnv = !!getenv("SAL_ENABLEGL"); - static bool bHeadlessPlugin = []{ - OUString plugin; - rtl::Bootstrap::get("SAL_USE_VCLPLUGIN", plugin); - return plugin == "svp"; - }(); bEnable = bEnableGLEnv; if (officecfg::Office::Common::VCL::UseOpenGL::get()) bEnable = true; - // Force disable in safe mode or when running with headless plugin - if (bHeadlessPlugin || Application::IsSafeModeEnabled()) + // Force disable in safe mode + if (Application::IsSafeModeEnabled()) bEnable = false; bRet = bEnable; |