diff options
| author | Luboš Luňák <l.lunak@collabora.com> | 2020-12-04 12:14:47 +0100 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@collabora.com> | 2020-12-07 20:46:49 +0100 |
| commit | db89f53c31af997b9bf422b0e784afba8d62a42e (patch) | |
| tree | da11fedb71f01b6d21a32f95c0a9ccecb43fc265 /canvas | |
| parent | 6265cfca9d775198e81166b914f5dcaea58802db (diff) | |
remove OpenGL VCL backend code
It is by now practically unmaintained, even bugreports in bugzilla
have been already closed for it. AFAICT this used to be really
used only on Windows, where it's no longer the default.
There's still some OpenGL code left, because there are still two
other places that use OpenGL. One is OpenGL slideshows, which
reuse some of the base OpenGL code (and I've checked they
still work even after this removal). Second one is OpenGL canvas,
which it seems has never been finished or enabled (or so it
most probably should be dumped too).
Change-Id: I7ea5aef77ec252eb8e712d167db591209be84a13
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107290
Tested-by: Jenkins
Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
Diffstat (limited to 'canvas')
| -rw-r--r-- | canvas/source/cairo/cairo_canvas.cxx | 2 | ||||
| -rw-r--r-- | canvas/source/directx/dx_canvas.cxx | 2 | ||||
| -rw-r--r-- | canvas/source/factory/cf_service.cxx | 6 |
3 files changed, 0 insertions, 10 deletions
diff --git a/canvas/source/cairo/cairo_canvas.cxx b/canvas/source/cairo/cairo_canvas.cxx index 64c65d4cd904..394ffe773871 100644 --- a/canvas/source/cairo/cairo_canvas.cxx +++ b/canvas/source/cairo/cairo_canvas.cxx @@ -48,8 +48,6 @@ namespace cairocanvas if( !maArguments.hasElements() ) return; - // tdf#93870 - force VCL canvas in OpenGL mode for now. - assert( !OpenGLWrapper::isVCLOpenGLEnabled() ); assert( !SkiaHelper::isVCLSkiaEnabled() ); /* maArguments: diff --git a/canvas/source/directx/dx_canvas.cxx b/canvas/source/directx/dx_canvas.cxx index 08ce658249db..a571d4085d6d 100644 --- a/canvas/source/directx/dx_canvas.cxx +++ b/canvas/source/directx/dx_canvas.cxx @@ -77,8 +77,6 @@ namespace dxcanvas if( maArguments.getLength() == 0 ) return; - // tdf#93870 - force VCL canvas in OpenGL mode for now. - assert( !OpenGLWrapper::isVCLOpenGLEnabled() ); assert( !SkiaHelper::isVCLSkiaEnabled() ); SAL_INFO("canvas.directx", "Canvas::initialize called" ); diff --git a/canvas/source/factory/cf_service.cxx b/canvas/source/factory/cf_service.cxx index 9bb75d5e26b0..608aaaf1d0a2 100644 --- a/canvas/source/factory/cf_service.cxx +++ b/canvas/source/factory/cf_service.cxx @@ -299,12 +299,6 @@ Reference<XInterface> CanvasFactory::lookupAndUse( m_bCacheHasForcedLastImpl, "ForceSafeServiceImpl" ); - // tdf#93870 - force VCL canvas in OpenGL mode for now. -#if HAVE_FEATURE_OPENGL - if( OpenGLWrapper::isVCLOpenGLEnabled() ) - bForceLastEntry = true; -#endif - // use anti-aliasing canvas, if config flag set (or not existing) bool bUseAAEntry(true); checkConfigFlag( bUseAAEntry, |