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
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,6 @@ explicitly enable it via command line:
|`font_pango`| `auto` | Pango based scalable font renderer |
|`renderer_bbulk`| `auto` | Simple 2D software-renderer (bulk-mode) |
|`renderer_gltex`| `auto` | OpenGLESv2 accelerated renderer |
|`renderer_pixman`| `auto` | pixman based renderer |
|`session_dummy`| `auto` | Dummy fallback session |
|`session_terminal`| `auto` | Terminal-emulator sessions |

Expand Down
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', `gltex', and `pixman'.
`bblit', `bbulk', and `gltex'.
(default: detect by GPU type)</para>
</listitem>
</varlistentry>
Expand Down
2 changes: 0 additions & 2 deletions meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,6 @@ gbm_deps = dependency('gbm', disabler: true, required: get_option('video_drm3d')
egl_deps = dependency('egl', disabler: true, required: get_option('video_drm3d'))
glesv2_deps = dependency('glesv2', disabler: true, required: require_glesv2)
pango_deps = dependency('pangoft2', disabler: true, required: get_option('font_pango'))
pixman_deps = dependency('pixman-1', disabler: true, required: get_option('renderer_pixman'))
xsltproc = find_program('xsltproc', native: true, disabler: true, required: get_option('docs'))
check_deps = dependency('check', disabler: true, required: get_option('tests'))

Expand All @@ -101,7 +100,6 @@ foreach name, reqs : {
'video_drm3d': [libdrm_deps, gbm_deps, egl_deps, glesv2_deps],
'renderer_bbulk': [],
'renderer_gltex': [glesv2_deps],
'renderer_pixman': [pixman_deps],
'font_unifont': [],
'font_pango': [pango_deps],
'session_dummy': [],
Expand Down
2 changes: 0 additions & 2 deletions meson.options
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,6 @@ option('renderer_bbulk', type: 'feature', value: 'auto',
description: 'bbulk renderer')
option('renderer_gltex', type: 'feature', value: 'auto',
description: 'gltex renderer')
option('renderer_pixman', type: 'feature', value: 'auto',
description: 'pixman renderer')

# font backends
option('font_unifont', type: 'feature', value: 'auto',
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, pixman, bblit, bbluk]
## Text renderer, can be [gltex, bblit, bbluk]
## gltex only works with hwaccel enabled, and others work with hwaccel disabled
#render-engine=gltex

Expand Down
57 changes: 0 additions & 57 deletions src/kmscon_mod_pixman.c

This file was deleted.

14 changes: 0 additions & 14 deletions src/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -148,8 +148,6 @@ if enable_video_drm3d
'uterm_mod_drm3d.c',
embed_gen.process('uterm_drm3d_blend.vert', extra_args: shader_regex),
embed_gen.process('uterm_drm3d_blend.frag', extra_args: shader_regex),
embed_gen.process('uterm_drm3d_blit.vert', extra_args: shader_regex),
embed_gen.process('uterm_drm3d_blit.frag', extra_args: shader_regex),
embed_gen.process('uterm_drm3d_fill.vert', extra_args: shader_regex),
embed_gen.process('uterm_drm3d_fill.frag', extra_args: shader_regex),
],
Expand Down Expand Up @@ -226,18 +224,6 @@ if enable_renderer_gltex
)
endif

if enable_renderer_pixman
mod_pixman = shared_module('mod-pixman', [
'text_pixman.c',
'kmscon_mod_pixman.c',
],
name_prefix: '',
dependencies: [libtsm_deps, pixman_deps, shl_deps],
install: true,
install_dir: moduledir,
)
endif

#
# Binaries
# These are the sources for the main binaries and test programs. They mostly
Expand Down
1 change: 0 additions & 1 deletion src/text.h
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,5 @@ int kmscon_text_draw_cb(struct tsm_screen *con,
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;
extern struct kmscon_text_ops kmscon_text_pixman_ops;

#endif /* KMSCON_TEXT_H */
Loading