diff options
| author | Niklas Haas <git@haasn.xyz> | 2018-11-10 12:53:33 +0100 |
|---|---|---|
| committer | Jan Ekström <jeebjp@gmail.com> | 2019-04-21 23:55:22 +0300 |
| commit | 7006d6752d7da21870dfdb2b0d7640a3734f748c (patch) | |
| tree | 035ca58d22de438e834d212e97b73d03a4248d98 /wscript_build.py | |
| parent | 9f7dcc0726ab635fb34fb7310e54b1aec9467f14 (diff) | |
| download | mpv-7006d6752d7da21870dfdb2b0d7640a3734f748c.tar.bz2 mpv-7006d6752d7da21870dfdb2b0d7640a3734f748c.tar.xz | |
vo_gpu: vulkan: use libplacebo instead
This commit rips out the entire mpv vulkan implementation in favor of
exposing lightweight wrappers on top of libplacebo instead, which
provides much of the same except in a more up-to-date and polished form.
This (finally) unifies the code base between mpv and libplacebo, which
is something I've been hoping to do for a long time.
Note: The ra_pl wrappers are abstract enough from the actual libplacebo
device type that we can in theory re-use them for other devices like
d3d11 or even opengl in the future, so I moved them to a separate
directory for the time being. However, the rest of the code is still
vulkan-specific, so I've kept the "vulkan" naming and file paths, rather
than introducing a new `--gpu-api` type. (Which would have been ended up
with significantly more code duplicaiton)
Plus, the code and functionality is similar enough that for most users
this should just be a straight-up drop-in replacement.
Note: This commit excludes some changes; specifically, the updates to
context_win and hwdec_cuda are deferred to separate commits for
authorship reasons.
Diffstat (limited to 'wscript_build.py')
| -rw-r--r-- | wscript_build.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/wscript_build.py b/wscript_build.py index 38f704ef34..99f14990ac 100644 --- a/wscript_build.py +++ b/wscript_build.py @@ -445,6 +445,8 @@ def build(ctx): ( "video/out/gpu/utils.c" ), ( "video/out/gpu/video.c" ), ( "video/out/gpu/video_shaders.c" ), + ( "video/out/placebo/ra_pl.c", "libplacebo" ), + ( "video/out/placebo/utils.c", "libplacebo" ), ( "video/out/opengl/angle_dynamic.c", "egl-angle" ), ( "video/out/opengl/common.c", "gl" ), ( "video/out/opengl/context.c", "gl" ), @@ -495,11 +497,8 @@ def build(ctx): ( "video/out/vo_xv.c", "xv" ), ( "video/out/vulkan/context.c", "vulkan" ), ( "video/out/vulkan/context_wayland.c", "vulkan && wayland" ), - ( "video/out/vulkan/context_win.c", "vulkan && win32-desktop" ), + #( "video/out/vulkan/context_win.c", "vulkan && win32-desktop" ), ( "video/out/vulkan/context_xlib.c", "vulkan && x11" ), - ( "video/out/vulkan/formats.c", "vulkan" ), - ( "video/out/vulkan/malloc.c", "vulkan" ), - ( "video/out/vulkan/ra_vk.c", "vulkan" ), ( "video/out/vulkan/utils.c", "vulkan" ), ( "video/out/w32_common.c", "win32-desktop" ), ( "video/out/wayland/idle-inhibit-v1.c", "wayland" ), |