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 /vcl/source/outdev | |
| 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 'vcl/source/outdev')
| -rw-r--r-- | vcl/source/outdev/bitmap.cxx | 5 | ||||
| -rw-r--r-- | vcl/source/outdev/text.cxx | 8 |
2 files changed, 1 insertions, 12 deletions
diff --git a/vcl/source/outdev/bitmap.cxx b/vcl/source/outdev/bitmap.cxx index cd2ea0cfce6b..3e35ec8d8540 100644 --- a/vcl/source/outdev/bitmap.cxx +++ b/vcl/source/outdev/bitmap.cxx @@ -697,10 +697,7 @@ void OutputDevice::DrawDeviceAlphaBitmap( const Bitmap& rBmp, const AlphaMask& r return; } - // we need to make sure OpenGL never reaches this slow code path -#if HAVE_FEATURE_OPENGL - assert(!OpenGLHelper::isVCLOpenGLEnabled()); -#endif + // we need to make sure Skia never reaches this slow code path assert(!SkiaHelper::isVCLSkiaEnabled()); } diff --git a/vcl/source/outdev/text.cxx b/vcl/source/outdev/text.cxx index 48a04b3b122f..5677268ba0dd 100644 --- a/vcl/source/outdev/text.cxx +++ b/vcl/source/outdev/text.cxx @@ -871,14 +871,6 @@ void OutputDevice::DrawText( const Point& rStartPt, const OUString& rStr, if(mpFontInstance->mpConversion) pLayoutCache = nullptr; -#ifdef MACOSX - // FIXME: tdf#112990 - // Cache text layout crashes on mac with OpenGL enabled - // Force it to not use the cache - if(OpenGLHelper::isVCLOpenGLEnabled()) - pLayoutCache = nullptr; -#endif - std::unique_ptr<SalLayout> pSalLayout = ImplLayout(rStr, nIndex, nLen, rStartPt, 0, nullptr, eDefaultLayout, nullptr, pLayoutCache); if(pSalLayout) { |