diff options
author | Anton Kindestam <antonki@kth.se> | 2019-09-12 21:00:50 +0200 |
---|---|---|
committer | Jan Ekström <jeebjp@gmail.com> | 2019-09-18 23:59:32 +0300 |
commit | e08f235578aa6305a41e7c7132225e58bd191ef0 (patch) | |
tree | 5a96a85f873f1dc0e117d2fb3fb0191e6e44c462 /video/out/gpu | |
parent | b04ddcdc0b24c8d594bcb001c964035aa7ebd008 (diff) | |
download | mpv-e08f235578aa6305a41e7c7132225e58bd191ef0.tar.bz2 mpv-e08f235578aa6305a41e7c7132225e58bd191ef0.tar.xz |
drm: fix libmpv ABI breakage introduced in 351c083487050c88adb0e3d60f2174850f869018
Extending the client-allocated mpv_opengl_drm_params struct
constituted a break of ABI that could cause UB.
Create a clean break by deprecating "drm_params" and related structs
and enum values, and replacing it with "drm_params_v2".
Also fix some comments and code that wrongly assumed that open could
return any other negative number than -1 for failure.
This commit updates the libmpv version to 1.104
Diffstat (limited to 'video/out/gpu')
-rw-r--r-- | video/out/gpu/libmpv_gpu.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/video/out/gpu/libmpv_gpu.c b/video/out/gpu/libmpv_gpu.c index 5ca4ebb7ca..b8edc694db 100644 --- a/video/out/gpu/libmpv_gpu.c +++ b/video/out/gpu/libmpv_gpu.c @@ -32,14 +32,14 @@ static const struct native_resource_entry native_resource_map[] = { .name = "wl", .size = 0, }, - [MPV_RENDER_PARAM_DRM_DISPLAY] = { - .name = "drm_params", - .size = sizeof (mpv_opengl_drm_params), - }, [MPV_RENDER_PARAM_DRM_DRAW_SURFACE_SIZE] = { .name = "drm_draw_surface_size", .size = sizeof (mpv_opengl_drm_draw_surface_size), }, + [MPV_RENDER_PARAM_DRM_DISPLAY_V2] = { + .name = "drm_params_v2", + .size = sizeof (mpv_opengl_drm_params_v2), + }, }; static int init(struct render_backend *ctx, mpv_render_param *params) |