diff options
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) { |