summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorLuboš Luňák <l.lunak@collabora.com>2019-11-18 12:24:59 +0100
committerLuboš Luňák <l.lunak@collabora.com>2019-11-27 09:55:17 +0100
commit48c92ecb2ee04a25fd14f818b1fb7d752cde58c1 (patch)
tree6b046ddda6e87b70b8beb6beb89396ced5e682ab /vcl
parentc019d96dddaa7abc13cc94299dff6a858c50e58f (diff)
make about dialog differentiate between Skia with Vulkan or raster
Since they are technically still two different rendering implementations. Change-Id: I83c324b384b7acfcc84e729271d00b995327eec6
Diffstat (limited to 'vcl')
-rw-r--r--vcl/inc/strings.hrc3
-rw-r--r--vcl/source/app/svapp.cxx14
2 files changed, 15 insertions, 2 deletions
diff --git a/vcl/inc/strings.hrc b/vcl/inc/strings.hrc
index d8f73a587722..e378b54814bd 100644
--- a/vcl/inc/strings.hrc
+++ b/vcl/inc/strings.hrc
@@ -125,7 +125,8 @@
#define SV_APP_OSVERSION NC_("SV_APP_OSVERSION", "OS: ")
#define SV_APP_UIRENDER NC_("SV_APP_UIRENDER", "UI render: ")
#define SV_APP_GL NC_("SV_APP_GL", "GL")
-#define SV_APP_SKIA NC_("SV_APP_SKIA", "Skia")
+#define SV_APP_SKIA_VULKAN NC_("SV_APP_SKIA_VULKAN", "Skia/Vulkan")
+#define SV_APP_SKIA_RASTER NC_("SV_APP_SKIA_RASTER", "Skia/Raster")
#define SV_APP_DEFAULT NC_("SV_APP_DEFAULT", "default")
#define SV_MSGBOX_INFO NC_("SV_MSGBOX_INFO", "Information")
diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
index 4b97754bebbe..511e6dd5e598 100644
--- a/vcl/source/app/svapp.cxx
+++ b/vcl/source/app/svapp.cxx
@@ -1153,9 +1153,21 @@ OUString Application::GetHWOSConfInfo()
aDetails.append( VclResId(SV_APP_GL) );
else
#endif
+#if HAVE_FEATURE_SKIA
if ( SkiaHelper::isVCLSkiaEnabled() )
- aDetails.append( VclResId(SV_APP_SKIA) );
+ {
+ switch(SkiaHelper::renderMethodToUse())
+ {
+ case SkiaHelper::RenderVulkan:
+ aDetails.append( VclResId(SV_APP_SKIA_VULKAN) );
+ break;
+ case SkiaHelper::RenderRaster:
+ aDetails.append( VclResId(SV_APP_SKIA_RASTER) );
+ break;
+ }
+ }
else
+#endif
aDetails.append( VclResId(SV_APP_DEFAULT) );
aDetails.append( "; " );