Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/man/kmscon.1.xml.in
Original file line number Diff line number Diff line change
Expand Up @@ -511,7 +511,7 @@
<term><option>--render-engine {engine}</option></term>
<listitem>
<para>Specify console the rendering engine. Available engines are
`bblit', `bbulk', and `gltex'.
`bbulk', and `gltex'.
(default: detect by GPU type)</para>
</listitem>
</varlistentry>
Expand Down
1 change: 0 additions & 1 deletion meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,6 @@ foreach name, reqs : {
'video_fbdev': [],
'video_drm2d': [libdrm_deps],
'video_drm3d': [libdrm_deps, gbm_deps, egl_deps, glesv2_deps],
'renderer_bbulk': [],
'renderer_gltex': [glesv2_deps],
'font_unifont': [],
'font_pango': [pango_deps],
Expand Down
2 changes: 0 additions & 2 deletions meson.options
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@ option('video_drm3d', type: 'feature', value: 'auto',
description: 'drm3d video backend')

# renderers
option('renderer_bbulk', type: 'feature', value: 'auto',
description: 'bbulk renderer')
option('renderer_gltex', type: 'feature', value: 'auto',
description: 'gltex renderer')

Expand Down
2 changes: 1 addition & 1 deletion scripts/etc/kmscon.conf
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
## Enable 3d rendering (only useful with gltex)
#hwaccel

## Text renderer, can be [gltex, bblit, bbluk]
## Text renderer, can be [gltex, bbluk]
## gltex only works with hwaccel enabled, and others work with hwaccel disabled
#render-engine=gltex

Expand Down
4 changes: 2 additions & 2 deletions src/kmscon_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -628,7 +628,7 @@ int main(int argc, char **argv)

kmscon_load_modules();
kmscon_font_register(&kmscon_font_8x16_ops);
kmscon_text_register(&kmscon_text_bblit_ops);
kmscon_text_register(&kmscon_text_bbulk_ops);
uterm_register_drm2d();
uterm_register_fbdev();

Expand Down Expand Up @@ -670,7 +670,7 @@ int main(int argc, char **argv)

destroy_app(&app);
err_unload:
kmscon_text_unregister(kmscon_text_bblit_ops.name);
kmscon_text_unregister(kmscon_text_bbulk_ops.name);
kmscon_font_unregister(kmscon_font_8x16_ops.name);
kmscon_unload_modules();
kmscon_conf_free(conf_ctx);
Expand Down
58 changes: 0 additions & 58 deletions src/kmscon_mod_bbulk.c

This file was deleted.

14 changes: 1 addition & 13 deletions src/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -198,18 +198,6 @@ if enable_font_pango
)
endif

if enable_renderer_bbulk
mod_bbulk = shared_module('mod-bbulk', [
'text_bbulk.c',
'kmscon_mod_bbulk.c',
],
name_prefix: '',
dependencies: [libtsm_deps, shl_deps],
install: true,
install_dir: moduledir,
)
endif

if enable_renderer_gltex
mod_gltex = shared_module('mod-gltex', [
'text_gltex.c',
Expand Down Expand Up @@ -244,7 +232,7 @@ kmscon_srcs = [
'font_rotate.c',
'font_8x16.c',
'text.c',
'text_bblit.c',
'text_bbulk.c',
'kmscon_seat.c',
'kmscon_conf.c',
'kmscon_main.c',
Expand Down
1 change: 0 additions & 1 deletion src/text.h
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,6 @@ int kmscon_text_draw_cb(struct tsm_screen *con,

/* modularized backends */

extern struct kmscon_text_ops kmscon_text_bblit_ops;
extern struct kmscon_text_ops kmscon_text_bbulk_ops;
extern struct kmscon_text_ops kmscon_text_gltex_ops;

Expand Down
Loading