diff options
author | Niklas Haas <git@haasn.dev> | 2021-10-04 06:18:55 +0200 |
---|---|---|
committer | Niklas Haas <github-daiK1o@haasn.dev> | 2021-10-04 12:09:58 +0200 |
commit | 275c00974e51e87db76f975234ae1c9b2c413292 (patch) | |
tree | 2a291e8568c23779ba990ba77947914e84ed7b9c /video/out/hwdec/hwdec_vaapi_vk.c | |
parent | 48e8cb6a8994eff198543bd576935054d4ac827c (diff) | |
download | mpv-275c00974e51e87db76f975234ae1c9b2c413292.tar.bz2 mpv-275c00974e51e87db76f975234ae1c9b2c413292.tar.xz |
vo_gpu: libplacebo: drop conditional code paths for old versions
No longer needed with the bump to v3.104.
Diffstat (limited to 'video/out/hwdec/hwdec_vaapi_vk.c')
-rw-r--r-- | video/out/hwdec/hwdec_vaapi_vk.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/video/out/hwdec/hwdec_vaapi_vk.c b/video/out/hwdec/hwdec_vaapi_vk.c index 328560b0ab..b6af805e39 100644 --- a/video/out/hwdec/hwdec_vaapi_vk.c +++ b/video/out/hwdec/hwdec_vaapi_vk.c @@ -46,13 +46,8 @@ static bool vaapi_vk_map(struct ra_hwdec_mapper *mapper, bool probing) uint32_t offset = p->desc.layers[n].offset[0]; uint32_t pitch = p->desc.layers[n].pitch[0]; -#if PL_API_VER >= 88 // AMD drivers do not return the size in the surface description, so we - // need to query it manually. The reason we guard this logic behind - // PL_API_VER >= 88 is that the same drivers also require DRM format - // modifier support in order to not produce corrupted textures, so - // having this #ifdef merely exists to protect users from combining - // too-new mpv with too-old libplacebo. + // need to query it manually. if (size == 0) { size = lseek(fd, 0, SEEK_END); if (size == -1) { @@ -67,7 +62,6 @@ static bool vaapi_vk_map(struct ra_hwdec_mapper *mapper, bool probing) return false; } } -#endif struct pl_tex_params tex_params = { .w = mp_image_plane_w(&p->layout, n), @@ -82,12 +76,8 @@ static bool vaapi_vk_map(struct ra_hwdec_mapper *mapper, bool probing) }, .size = size, .offset = offset, -#if PL_API_VER >= 88 .drm_format_mod = p->desc.objects[id].drm_format_modifier, -#endif -#if PL_API_VER >= 106 .stride_w = pitch, -#endif }, }; |