Use GLyphy for text on Windows (broken)

Desktop / LibreOffice - Tor Lillqvist [collabora.com] - 19 November 2015 06:05 UTC

Work in progress. Produces visible text in some cases, but not nearly all. The text that is visible is roughly in the right place and of the right size, but horribly ugly. Compare to glyphy-demo, which does produce beautiful text, so the problem is not in the GLyphy code but in the way we use it.

Include sources from GLyphy's "demo" directory (with only slight modifications to avoid unconditional debug output) and use that "demo" API from vcl.

The changes to existing vcl code are all in one place, in the winlayout.cxx file.

a12454b Use GLyphy for text on Windows (broken)
vcl/Library_vcl.mk | 2 +
vcl/glyphy/demo.cxx | 19 ++
vcl/glyphy/demo/demo-atlas.cc | 144 +++++++++
vcl/glyphy/demo/demo-buffer.cc | 191 ++++++++++++
vcl/glyphy/demo/demo-font.cc | 333 +++++++++++++++++++++
vcl/glyphy/demo/demo-shader.cc | 212 +++++++++++++
vcl/glyphy/demo/matrix4x4.c | 481 +++++++++++++++++++++++++++++
vcl/inc/glyphy/demo.hxx | 21 ++
vcl/inc/glyphy/demo/demo-atlas-glsl.h | 18 ++
vcl/inc/glyphy/demo/demo-atlas.h | 54 ++++
vcl/inc/glyphy/demo/demo-buffer.h | 64 ++++
vcl/inc/glyphy/demo/demo-common.h | 186 ++++++++++++
vcl/inc/glyphy/demo/demo-font.h | 88 ++++++
vcl/inc/glyphy/demo/demo-fshader-glsl.h | 88 ++++++
vcl/inc/glyphy/demo/demo-shader.h | 47 +++
vcl/inc/glyphy/demo/demo-vshader-glsl.h | 24 ++
vcl/inc/glyphy/demo/matrix4x4.h | 107 +++++++
vcl/win/source/gdi/winlayout.cxx | 499 ++++++++++++-------------------
18 files changed, 2270 insertions(+), 308 deletions(-)

Upstream: cgit.freedesktop.org


  • Share