[perf/perf] Remove ttf-parser backend
This commit is contained in:
Behdad Esfahbod
parent
4aaa0af7d9
commit
746c3c03c5
|
|
@ -1,20 +1,11 @@
|
|||
google_benchmark = subproject('google-benchmark')
|
||||
google_benchmark_dep = google_benchmark.get_variable('google_benchmark_dep')
|
||||
|
||||
ttf_parser_dep = null_dep
|
||||
if get_option('experimental_api') and add_languages('rust', required: false, native: true)
|
||||
ttf_parser_dep = subproject('ttf-parser').get_variable('ttf_parser_dep')
|
||||
endif
|
||||
|
||||
benchmark('perf', executable('perf', 'perf.cc',
|
||||
dependencies: [
|
||||
google_benchmark_dep, freetype_dep,
|
||||
|
||||
# the last two, thread and dl, aren't nice as ttf-parser isn't no_std yet
|
||||
# https://github.com/RazrFalcon/ttf-parser/issues/29
|
||||
ttf_parser_dep, thread_dep, cpp.find_library('dl'),
|
||||
],
|
||||
cpp_args: ttf_parser_dep.found() ? ['-DHAVE_TTFPARSER'] : [],
|
||||
cpp_args: [],
|
||||
include_directories: [incconfig, incsrc],
|
||||
link_with: [libharfbuzz],
|
||||
install: false,
|
||||
|
|
|
|||
|
|
@ -3,12 +3,6 @@
|
|||
#include "hb.h"
|
||||
#include "hb-ot.h"
|
||||
|
||||
#ifdef HAVE_TTFPARSER
|
||||
#include "ttfparser.h"
|
||||
#endif
|
||||
|
||||
#define HB_UNUSED __attribute__((unused))
|
||||
|
||||
static void
|
||||
_hb_move_to (hb_draw_funcs_t *, void *, hb_draw_state_t *, float, float, void *) {}
|
||||
|
||||
|
|
@ -24,14 +18,6 @@ _hb_cubic_to (hb_draw_funcs_t *, void *, hb_draw_state_t *, float, float, float,
|
|||
static void
|
||||
_hb_close_path (hb_draw_funcs_t *, void *, hb_draw_state_t *, void *) {}
|
||||
|
||||
#ifdef HAVE_TTFPARSER
|
||||
static void _tp_move_to (float x HB_UNUSED, float y HB_UNUSED, void *data HB_UNUSED) {}
|
||||
static void _tp_line_to (float x, float y, void *data) {}
|
||||
static void _tp_quad_to (float x1, float y1, float x, float y, void *data) {}
|
||||
static void _tp_curve_to (float x1, float y1, float x2, float y2, float x, float y, void *data) {}
|
||||
static void _tp_close_path (void *data) {}
|
||||
#endif
|
||||
|
||||
static void draw (benchmark::State &state, const char *font_path, bool is_var, backend_t backend)
|
||||
{
|
||||
hb_font_t *font;
|
||||
|
|
@ -46,60 +32,29 @@ static void draw (benchmark::State &state, const char *font_path, bool is_var, b
|
|||
hb_face_destroy (face);
|
||||
}
|
||||
|
||||
if (backend == HARFBUZZ || backend == FREETYPE)
|
||||
if (is_var)
|
||||
{
|
||||
if (is_var)
|
||||
{
|
||||
hb_variation_t wght = {HB_TAG ('w','g','h','t'), 500};
|
||||
hb_font_set_variations (font, &wght, 1);
|
||||
}
|
||||
hb_draw_funcs_t *draw_funcs = hb_draw_funcs_create ();
|
||||
hb_draw_funcs_set_move_to_func (draw_funcs, _hb_move_to, nullptr, nullptr);
|
||||
hb_draw_funcs_set_line_to_func (draw_funcs, _hb_line_to, nullptr, nullptr);
|
||||
hb_draw_funcs_set_quadratic_to_func (draw_funcs, _hb_quadratic_to, nullptr, nullptr);
|
||||
hb_draw_funcs_set_cubic_to_func (draw_funcs, _hb_cubic_to, nullptr, nullptr);
|
||||
hb_draw_funcs_set_close_path_func (draw_funcs, _hb_close_path, nullptr, nullptr);
|
||||
|
||||
if (backend == FREETYPE)
|
||||
{
|
||||
hb_ft_font_set_funcs (font);
|
||||
hb_ft_font_set_load_flags (font, FT_LOAD_NO_HINTING | FT_LOAD_NO_SCALE);
|
||||
}
|
||||
|
||||
for (auto _ : state)
|
||||
for (unsigned gid = 0; gid < num_glyphs; ++gid)
|
||||
hb_font_get_glyph_shape (font, gid, draw_funcs, nullptr);
|
||||
|
||||
hb_draw_funcs_destroy (draw_funcs);
|
||||
hb_variation_t wght = {HB_TAG ('w','g','h','t'), 500};
|
||||
hb_font_set_variations (font, &wght, 1);
|
||||
}
|
||||
else if (backend == TTF_PARSER)
|
||||
hb_draw_funcs_t *draw_funcs = hb_draw_funcs_create ();
|
||||
hb_draw_funcs_set_move_to_func (draw_funcs, _hb_move_to, nullptr, nullptr);
|
||||
hb_draw_funcs_set_line_to_func (draw_funcs, _hb_line_to, nullptr, nullptr);
|
||||
hb_draw_funcs_set_quadratic_to_func (draw_funcs, _hb_quadratic_to, nullptr, nullptr);
|
||||
hb_draw_funcs_set_cubic_to_func (draw_funcs, _hb_cubic_to, nullptr, nullptr);
|
||||
hb_draw_funcs_set_close_path_func (draw_funcs, _hb_close_path, nullptr, nullptr);
|
||||
|
||||
if (backend == FREETYPE)
|
||||
{
|
||||
#ifdef HAVE_TTFPARSER
|
||||
ttfp_face *tp_font = (ttfp_face *) malloc (ttfp_face_size_of ());
|
||||
hb_blob_t *blob = hb_face_reference_blob (hb_font_get_face (font));
|
||||
assert (ttfp_face_init (hb_blob_get_data (blob, nullptr), hb_blob_get_length (blob), 0, tp_font));
|
||||
if (is_var) ttfp_set_variation (tp_font, TTFP_TAG('w','g','h','t'), 500);
|
||||
|
||||
ttfp_outline_builder builder;
|
||||
builder.move_to = _tp_move_to;
|
||||
builder.line_to = _tp_line_to;
|
||||
builder.quad_to = _tp_quad_to;
|
||||
builder.curve_to = _tp_curve_to;
|
||||
builder.close_path = _tp_close_path;
|
||||
|
||||
ttfp_rect bbox;
|
||||
for (auto _ : state)
|
||||
for (unsigned gid = 0; gid < num_glyphs; ++gid)
|
||||
ttfp_outline_glyph (tp_font, builder, &builder, gid, &bbox);
|
||||
|
||||
hb_blob_destroy (blob);
|
||||
free (tp_font);
|
||||
#else
|
||||
state.SkipWithError("ttfparser not available.");
|
||||
return;
|
||||
#endif
|
||||
hb_ft_font_set_funcs (font);
|
||||
hb_ft_font_set_load_flags (font, FT_LOAD_NO_HINTING | FT_LOAD_NO_SCALE);
|
||||
}
|
||||
else abort ();
|
||||
|
||||
for (auto _ : state)
|
||||
for (unsigned gid = 0; gid < num_glyphs; ++gid)
|
||||
hb_font_get_glyph_shape (font, gid, draw_funcs, nullptr);
|
||||
|
||||
hb_draw_funcs_destroy (draw_funcs);
|
||||
|
||||
hb_font_destroy (font);
|
||||
}
|
||||
|
|
@ -108,32 +63,24 @@ static void draw (benchmark::State &state, const char *font_path, bool is_var, b
|
|||
|
||||
BENCHMARK_CAPTURE (draw, cff - ot - SourceSansPro, FONT_BASE_PATH "SourceSansPro-Regular.otf", false, HARFBUZZ);
|
||||
BENCHMARK_CAPTURE (draw, cff - ft - SourceSansPro, FONT_BASE_PATH "SourceSansPro-Regular.otf", false, FREETYPE);
|
||||
BENCHMARK_CAPTURE (draw, cff - tp - SourceSansPro, FONT_BASE_PATH "SourceSansPro-Regular.otf", false, TTF_PARSER);
|
||||
|
||||
BENCHMARK_CAPTURE (draw, cff2 - ot - AdobeVFPrototype, FONT_BASE_PATH "AdobeVFPrototype.otf", false, HARFBUZZ);
|
||||
BENCHMARK_CAPTURE (draw, cff2 - ft - AdobeVFPrototype, FONT_BASE_PATH "AdobeVFPrototype.otf", false, FREETYPE);
|
||||
BENCHMARK_CAPTURE (draw, cff2 - tp - AdobeVFPrototype, FONT_BASE_PATH "AdobeVFPrototype.otf", false, TTF_PARSER);
|
||||
|
||||
BENCHMARK_CAPTURE (draw, cff2/vf - ot - AdobeVFPrototype, FONT_BASE_PATH "AdobeVFPrototype.otf", true, HARFBUZZ);
|
||||
BENCHMARK_CAPTURE (draw, cff2/vf - ft - AdobeVFPrototype, FONT_BASE_PATH "AdobeVFPrototype.otf", true, FREETYPE);
|
||||
BENCHMARK_CAPTURE (draw, cff2/vf - tp - AdobeVFPrototype, FONT_BASE_PATH "AdobeVFPrototype.otf", true, TTF_PARSER);
|
||||
|
||||
BENCHMARK_CAPTURE (draw, glyf - ot - SourceSerifVariable, FONT_BASE_PATH "SourceSerifVariable-Roman.ttf", false, HARFBUZZ);
|
||||
BENCHMARK_CAPTURE (draw, glyf - ft - SourceSerifVariable, FONT_BASE_PATH "SourceSerifVariable-Roman.ttf", false, FREETYPE);
|
||||
BENCHMARK_CAPTURE (draw, glyf - tp - SourceSerifVariable, FONT_BASE_PATH "SourceSerifVariable-Roman.ttf", false, TTF_PARSER);
|
||||
|
||||
BENCHMARK_CAPTURE (draw, glyf/vf - ot - SourceSerifVariable, FONT_BASE_PATH "SourceSerifVariable-Roman.ttf", true, HARFBUZZ);
|
||||
BENCHMARK_CAPTURE (draw, glyf/vf - ft - SourceSerifVariable, FONT_BASE_PATH "SourceSerifVariable-Roman.ttf", true, FREETYPE);
|
||||
BENCHMARK_CAPTURE (draw, glyf/vf - tp - SourceSerifVariable, FONT_BASE_PATH "SourceSerifVariable-Roman.ttf", true, TTF_PARSER);
|
||||
|
||||
BENCHMARK_CAPTURE (draw, glyf - ot - Comfortaa, FONT_BASE_PATH "Comfortaa-Regular-new.ttf", false, HARFBUZZ);
|
||||
BENCHMARK_CAPTURE (draw, glyf - ft - Comfortaa, FONT_BASE_PATH "Comfortaa-Regular-new.ttf", false, FREETYPE);
|
||||
BENCHMARK_CAPTURE (draw, glyf - tp - Comfortaa, FONT_BASE_PATH "Comfortaa-Regular-new.ttf", false, TTF_PARSER);
|
||||
|
||||
BENCHMARK_CAPTURE (draw, glyf/vf - ot - Comfortaa, FONT_BASE_PATH "Comfortaa-Regular-new.ttf", true, HARFBUZZ);
|
||||
BENCHMARK_CAPTURE (draw, glyf/vf - ft - Comfortaa, FONT_BASE_PATH "Comfortaa-Regular-new.ttf", true, FREETYPE);
|
||||
BENCHMARK_CAPTURE (draw, glyf/vf - tp - Comfortaa, FONT_BASE_PATH "Comfortaa-Regular-new.ttf", true, TTF_PARSER);
|
||||
|
||||
BENCHMARK_CAPTURE (draw, glyf - ot - Roboto, FONT_BASE_PATH "Roboto-Regular.ttf", false, HARFBUZZ);
|
||||
BENCHMARK_CAPTURE (draw, glyf - ft - Roboto, FONT_BASE_PATH "Roboto-Regular.ttf", false, FREETYPE);
|
||||
BENCHMARK_CAPTURE (draw, glyf - tp - Roboto, FONT_BASE_PATH "Roboto-Regular.ttf", false, TTF_PARSER);
|
||||
|
|
|
|||
|
|
@ -4,10 +4,6 @@
|
|||
#include "hb-ft.h"
|
||||
#include "hb-ot.h"
|
||||
|
||||
#ifdef HAVE_TTFPARSER
|
||||
#include "ttfparser.h"
|
||||
#endif
|
||||
|
||||
static void extents (benchmark::State &state, const char *font_path, bool is_var, backend_t backend)
|
||||
{
|
||||
hb_font_t *font;
|
||||
|
|
@ -28,39 +24,16 @@ static void extents (benchmark::State &state, const char *font_path, bool is_var
|
|||
hb_font_set_variations (font, &wght, 1);
|
||||
}
|
||||
|
||||
if (backend == HARFBUZZ || backend == FREETYPE)
|
||||
if (backend == FREETYPE)
|
||||
{
|
||||
if (backend == FREETYPE)
|
||||
{
|
||||
hb_ft_font_set_funcs (font);
|
||||
hb_ft_font_set_load_flags (font, FT_LOAD_NO_HINTING | FT_LOAD_NO_SCALE);
|
||||
}
|
||||
|
||||
hb_glyph_extents_t extents;
|
||||
for (auto _ : state)
|
||||
for (unsigned gid = 0; gid < num_glyphs; ++gid)
|
||||
hb_font_get_glyph_extents (font, gid, &extents);
|
||||
hb_ft_font_set_funcs (font);
|
||||
hb_ft_font_set_load_flags (font, FT_LOAD_NO_HINTING | FT_LOAD_NO_SCALE);
|
||||
}
|
||||
else if (backend == TTF_PARSER)
|
||||
{
|
||||
#ifdef HAVE_TTFPARSER
|
||||
ttfp_face *tp_font = (ttfp_face *) malloc (ttfp_face_size_of ());
|
||||
hb_blob_t *blob = hb_face_reference_blob (hb_font_get_face (font));
|
||||
assert (ttfp_face_init (hb_blob_get_data (blob, nullptr), hb_blob_get_length (blob), 0, tp_font));
|
||||
if (is_var) ttfp_set_variation (tp_font, TTFP_TAG('w','g','h','t'), 500);
|
||||
|
||||
ttfp_rect bbox;
|
||||
for (auto _ : state)
|
||||
for (unsigned gid = 0; gid < num_glyphs; ++gid)
|
||||
ttfp_get_glyph_bbox(tp_font, gid, &bbox);
|
||||
|
||||
hb_blob_destroy (blob);
|
||||
free (tp_font);
|
||||
#else
|
||||
state.SkipWithError("ttfparser not available.");
|
||||
return;
|
||||
#endif
|
||||
}
|
||||
hb_glyph_extents_t extents;
|
||||
for (auto _ : state)
|
||||
for (unsigned gid = 0; gid < num_glyphs; ++gid)
|
||||
hb_font_get_glyph_extents (font, gid, &extents);
|
||||
|
||||
hb_font_destroy (font);
|
||||
}
|
||||
|
|
@ -69,33 +42,24 @@ static void extents (benchmark::State &state, const char *font_path, bool is_var
|
|||
|
||||
BENCHMARK_CAPTURE (extents, cff - ot - SourceSansPro, FONT_BASE_PATH "SourceSansPro-Regular.otf", false, HARFBUZZ);
|
||||
BENCHMARK_CAPTURE (extents, cff - ft - SourceSansPro, FONT_BASE_PATH "SourceSansPro-Regular.otf", false, FREETYPE);
|
||||
BENCHMARK_CAPTURE (extents, cff - tp - SourceSansPro, FONT_BASE_PATH "SourceSansPro-Regular.otf", false, TTF_PARSER);
|
||||
|
||||
BENCHMARK_CAPTURE (extents, cff2 - ot - AdobeVFPrototype, FONT_BASE_PATH "AdobeVFPrototype.otf", false, HARFBUZZ);
|
||||
BENCHMARK_CAPTURE (extents, cff2 - ft - AdobeVFPrototype, FONT_BASE_PATH "AdobeVFPrototype.otf", false, FREETYPE);
|
||||
BENCHMARK_CAPTURE (extents, cff2 - tp - AdobeVFPrototype, FONT_BASE_PATH "AdobeVFPrototype.otf", false, TTF_PARSER);
|
||||
|
||||
BENCHMARK_CAPTURE (extents, cff2/vf - ot - AdobeVFPrototype, FONT_BASE_PATH "AdobeVFPrototype.otf", true, HARFBUZZ);
|
||||
BENCHMARK_CAPTURE (extents, cff2/vf - ft - AdobeVFPrototype, FONT_BASE_PATH "AdobeVFPrototype.otf", true, FREETYPE);
|
||||
BENCHMARK_CAPTURE (extents, cff2/vf - tp - AdobeVFPrototype, FONT_BASE_PATH "AdobeVFPrototype.otf", true, TTF_PARSER);
|
||||
|
||||
BENCHMARK_CAPTURE (extents, glyf - ot - SourceSerifVariable, FONT_BASE_PATH "SourceSerifVariable-Roman.ttf", false, HARFBUZZ);
|
||||
BENCHMARK_CAPTURE (extents, glyf - ft - SourceSerifVariable, FONT_BASE_PATH "SourceSerifVariable-Roman.ttf", false, FREETYPE);
|
||||
BENCHMARK_CAPTURE (extents, glyf - tp - SourceSerifVariable, FONT_BASE_PATH "SourceSerifVariable-Roman.ttf", false, TTF_PARSER);
|
||||
|
||||
BENCHMARK_CAPTURE (extents, glyf/vf - ot - SourceSerifVariable, FONT_BASE_PATH "SourceSerifVariable-Roman.ttf", true, HARFBUZZ);
|
||||
BENCHMARK_CAPTURE (extents, glyf/vf - ft - SourceSerifVariable, FONT_BASE_PATH "SourceSerifVariable-Roman.ttf", true, FREETYPE);
|
||||
BENCHMARK_CAPTURE (extents, glyf/vf - tp - SourceSerifVariable, FONT_BASE_PATH "SourceSerifVariable-Roman.ttf", true, TTF_PARSER);
|
||||
|
||||
BENCHMARK_CAPTURE (extents, glyf - ot - Comfortaa, FONT_BASE_PATH "Comfortaa-Regular-new.ttf", false, HARFBUZZ);
|
||||
BENCHMARK_CAPTURE (extents, glyf - ft - Comfortaa, FONT_BASE_PATH "Comfortaa-Regular-new.ttf", false, FREETYPE);
|
||||
BENCHMARK_CAPTURE (extents, glyf - tp - Comfortaa, FONT_BASE_PATH "Comfortaa-Regular-new.ttf", false, TTF_PARSER);
|
||||
|
||||
BENCHMARK_CAPTURE (extents, glyf/vf - ot - Comfortaa, FONT_BASE_PATH "Comfortaa-Regular-new.ttf", true, HARFBUZZ);
|
||||
BENCHMARK_CAPTURE (extents, glyf/vf - ft - Comfortaa, FONT_BASE_PATH "Comfortaa-Regular-new.ttf", true, FREETYPE);
|
||||
BENCHMARK_CAPTURE (extents, glyf/vf - tp - Comfortaa, FONT_BASE_PATH "Comfortaa-Regular-new.ttf", true, TTF_PARSER);
|
||||
|
||||
BENCHMARK_CAPTURE (extents, glyf - ot - Roboto, FONT_BASE_PATH "Roboto-Regular.ttf", false, HARFBUZZ);
|
||||
BENCHMARK_CAPTURE (extents, glyf - ft - Roboto, FONT_BASE_PATH "Roboto-Regular.ttf", false, FREETYPE);
|
||||
BENCHMARK_CAPTURE (extents, glyf - tp - Roboto, FONT_BASE_PATH "Roboto-Regular.ttf", false, TTF_PARSER);
|
||||
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
#endif
|
||||
|
||||
#ifdef HAVE_FREETYPE
|
||||
enum backend_t { HARFBUZZ, FREETYPE, TTF_PARSER };
|
||||
enum backend_t { HARFBUZZ, FREETYPE };
|
||||
#include "perf-extents.hh"
|
||||
#include "perf-draw.hh"
|
||||
#endif
|
||||
|
|
|
|||
Loading…
Reference in New Issue