diff options
| author | Luboš Luňák <l.lunak@collabora.com> | 2020-03-10 12:43:45 +0100 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@collabora.com> | 2020-03-18 10:47:49 +0100 |
| commit | 076926cef97c685b3d9221510e7560c034ebd2ed (patch) | |
| tree | 9a7bf0c33ceb68575bea9e5683b6c9d40fbefb1e /vcl/Library_vclplug_gen.mk | |
| parent | 64c6c4279f70555511af2d2ba80bcd32cbc7a798 (diff) | |
implement text rendering using directly Skia (X11)
The Cairo-based way reuses code that is used for OpenGL, but it's
needlessly complicated, given that Skia itself is capable of text
rendering as well.
This requires a small patch for Skia so that it uses the FcPattern*
we use for selecting a font.
The rendering with this commit is usable, but visually the result
is noticeably different, so this will need tweaks to the font
rendering (TBD).
Change-Id: I058c282307106c929ccc9faa7b2bddfabf0f0a2c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90580
Tested-by: Jenkins
Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
Diffstat (limited to 'vcl/Library_vclplug_gen.mk')
| -rw-r--r-- | vcl/Library_vclplug_gen.mk | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/vcl/Library_vclplug_gen.mk b/vcl/Library_vclplug_gen.mk index 500783ed67e1..34ca4df4ba50 100644 --- a/vcl/Library_vclplug_gen.mk +++ b/vcl/Library_vclplug_gen.mk @@ -60,7 +60,10 @@ $(eval $(call gb_Library_use_externals,vclplug_gen,\ icuuc \ valgrind \ Xrender \ - $(if $(filter SKIA,$(BUILD_TYPE)),skia) \ + $(if $(filter SKIA,$(BUILD_TYPE)), \ + skia \ + fontconfig \ + ) \ )) $(eval $(call gb_Library_add_libs,vclplug_gen,\ @@ -111,7 +114,9 @@ $(eval $(call gb_Library_add_exception_objects,vclplug_gen,\ $(if $(filter SKIA,$(BUILD_TYPE)), \ vcl/skia/x11/cairotextrender \ vcl/skia/x11/gdiimpl \ - vcl/skia/x11/salvd) \ + vcl/skia/x11/salvd \ + vcl/skia/x11/textrender \ + ) \ )) # ultimately we want to split the x11 dependencies out |