Skip to content

Commit

Permalink
vo_gpu: remove mali-fbdev
Browse files Browse the repository at this point in the history
Useless at this point, I don't even know if it still works, or how to
test it.
  • Loading branch information
wm4 committed Sep 19, 2019
1 parent ba31c15 commit 83d7123
Show file tree
Hide file tree
Showing 5 changed files with 2 additions and 176 deletions.
2 changes: 0 additions & 2 deletions DOCS/man/options.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5176,8 +5176,6 @@ The following video options are currently all specific to ``--vo=gpu`` and
X11/EGL
android
Android/EGL. Requires ``--wid`` be set to an ``android.view.Surface``.
mali-fbdev
Direct fbdev/EGL support on some ARM/MALI devices.
vdpauglx
Use vdpau presentation with GLX as backing. Experimental use only.
Using this will have no advantage (other than additional bugs or
Expand Down
4 changes: 0 additions & 4 deletions video/out/gpu/context.c
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ extern const struct ra_ctx_fns ra_ctx_angle;
extern const struct ra_ctx_fns ra_ctx_dxgl;
extern const struct ra_ctx_fns ra_ctx_rpi;
extern const struct ra_ctx_fns ra_ctx_android;
extern const struct ra_ctx_fns ra_ctx_mali_fbdev;
extern const struct ra_ctx_fns ra_ctx_vdpauglx;

/* Vulkan */
Expand Down Expand Up @@ -91,9 +90,6 @@ static const struct ra_ctx_fns *contexts[] = {
#if HAVE_EGL_DRM
&ra_ctx_drm_egl,
#endif
#if HAVE_MALI_FBDEV
&ra_ctx_mali_fbdev,
#endif
#if HAVE_VDPAU_GL_X11
&ra_ctx_vdpauglx,
#endif
Expand Down
158 changes: 0 additions & 158 deletions video/out/opengl/context_mali_fbdev.c

This file was deleted.

13 changes: 2 additions & 11 deletions wscript
Original file line number Diff line number Diff line change
Expand Up @@ -793,20 +793,11 @@ video_output_features = [
'desc': 'OpenGL without platform-specific code (e.g. for libmpv)',
'deps': 'libmpv-shared || libmpv-static',
'func': check_true,
}, {
'name': '--mali-fbdev',
'desc': 'MALI via Linux fbdev',
'deps': 'libdl',
'func': compose_checks(
check_cc(lib="EGL"),
check_statement('EGL/fbdev_window.h', 'struct fbdev_window test'),
check_statement('linux/fb.h', 'struct fb_var_screeninfo test'),
),
}, {
'name': '--gl',
'desc': 'OpenGL context support',
'deps': 'gl-cocoa || gl-x11 || egl-x11 || egl-drm || '
+ 'gl-win32 || gl-wayland || rpi || mali-fbdev || '
+ 'gl-win32 || gl-wayland || rpi || '
+ 'plain-gl',
'func': check_true,
'req': True,
Expand All @@ -830,7 +821,7 @@ video_output_features = [
}, {
'name': 'egl-helpers',
'desc': 'EGL helper functions',
'deps': 'egl-x11 || mali-fbdev || rpi || gl-wayland || egl-drm || ' +
'deps': 'egl-x11 || rpi || gl-wayland || egl-drm || ' +
'egl-angle-win32 || egl-android',
'func': check_true
}
Expand Down
1 change: 0 additions & 1 deletion wscript_build.py
Original file line number Diff line number Diff line change
Expand Up @@ -450,7 +450,6 @@ def swift(task):
( "video/out/opengl/context_drm_egl.c", "egl-drm" ),
( "video/out/opengl/context_dxinterop.c","gl-dxinterop" ),
( "video/out/opengl/context_glx.c", "gl-x11" ),
( "video/out/opengl/context_mali_fbdev.c","mali-fbdev" ),
( "video/out/opengl/context_rpi.c", "rpi" ),
( "video/out/opengl/context_vdpau.c", "vdpau-gl-x11" ),
( "video/out/opengl/context_wayland.c", "gl-wayland" ),
Expand Down

0 comments on commit 83d7123

Please sign in to comment.