diff options
| author | Luboš Luňák <l.lunak@collabora.com> | 2019-11-26 12:15:27 +0100 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@collabora.com> | 2019-11-27 09:55:19 +0100 |
| commit | 5e063cd7bb63772e6aab3a029dec13abcd748526 (patch) | |
| tree | 7528bca0516971ca3ea1dd8495e3018b806c5c5d | |
| parent | f448eb55d38db52d9b465ea2a4ba9170ebf7b4bf (diff) | |
always test Skia before OpenGL
Skia/Vulkan as the newer technology should be preferred, currently Skia
is not enabled by default, but that can change later. And this
should be consistent, otherwise the about dialog can claim OpenGL is
used while it's actually Skia that gets selected elsewhere.
Change-Id: I185feb231c28a119a1152e92afb54a1e8c41af6f
| -rw-r--r-- | vcl/qa/cppunit/BitmapTest.cxx | 4 | ||||
| -rw-r--r-- | vcl/source/app/svapp.cxx | 10 | ||||
| -rw-r--r-- | vcl/source/outdev/bitmap.cxx | 4 |
3 files changed, 8 insertions, 10 deletions
diff --git a/vcl/qa/cppunit/BitmapTest.cxx b/vcl/qa/cppunit/BitmapTest.cxx index 4db31a0f88fc..0ce45cf5641b 100644 --- a/vcl/qa/cppunit/BitmapTest.cxx +++ b/vcl/qa/cppunit/BitmapTest.cxx @@ -357,10 +357,10 @@ void BitmapTest::testConvert() //it would be nice to find and change the stride for quartz to be the same as everyone else CPPUNIT_ASSERT_EQUAL(static_cast<sal_uInt32>(10), pReadAccess->GetScanlineSize()); #else + if (!SkiaHelper::isVCLSkiaEnabled()) #if HAVE_FEATURE_OPENGL - if (!OpenGLHelper::isVCLOpenGLEnabled()) + if (!OpenGLHelper::isVCLOpenGLEnabled()) #endif - if (!SkiaHelper::isVCLSkiaEnabled()) CPPUNIT_ASSERT_EQUAL(static_cast<sal_uInt32>(12), pReadAccess->GetScanlineSize()); #endif CPPUNIT_ASSERT(pReadAccess->HasPalette()); diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx index 511e6dd5e598..df57b56ac327 100644 --- a/vcl/source/app/svapp.cxx +++ b/vcl/source/app/svapp.cxx @@ -1148,11 +1148,6 @@ OUString Application::GetHWOSConfInfo() aDetails.append( "; " ); aDetails.append( VclResId(SV_APP_UIRENDER) ); -#if HAVE_FEATURE_OPENGL - if ( OpenGLWrapper::isVCLOpenGLEnabled() ) - aDetails.append( VclResId(SV_APP_GL) ); - else -#endif #if HAVE_FEATURE_SKIA if ( SkiaHelper::isVCLSkiaEnabled() ) { @@ -1168,6 +1163,11 @@ OUString Application::GetHWOSConfInfo() } else #endif +#if HAVE_FEATURE_OPENGL + if ( OpenGLWrapper::isVCLOpenGLEnabled() ) + aDetails.append( VclResId(SV_APP_GL) ); + else +#endif aDetails.append( VclResId(SV_APP_DEFAULT) ); aDetails.append( "; " ); diff --git a/vcl/source/outdev/bitmap.cxx b/vcl/source/outdev/bitmap.cxx index 0bce168579cc..7ab069c2f443 100644 --- a/vcl/source/outdev/bitmap.cxx +++ b/vcl/source/outdev/bitmap.cxx @@ -687,12 +687,10 @@ void OutputDevice::DrawDeviceAlphaBitmap( const Bitmap& rBmp, const AlphaMask& r // we need to make sure OpenGL never reaches this slow code path + assert(!SkiaHelper::isVCLSkiaEnabled()); #if HAVE_FEATURE_OPENGL assert(!OpenGLHelper::isVCLOpenGLEnabled()); #endif -#if HAVE_FEATURE_SKIA - assert(!SkiaHelper::isVCLSkiaEnabled()); -#endif tools::Rectangle aBmpRect(Point(), rBmp.GetSizePixel()); if (!aBmpRect.Intersection(tools::Rectangle(rSrcPtPixel, rSrcSizePixel)).IsEmpty()) { |