summaryrefslogtreecommitdiffstats
path: root/video/out/vulkan/context_win.c
diff options
context:
space:
mode:
authorNiklas Haas <git@haasn.xyz>2018-11-10 12:53:33 +0100
committerJan Ekström <jeebjp@gmail.com>2019-04-21 23:55:22 +0300
commit7006d6752d7da21870dfdb2b0d7640a3734f748c (patch)
tree035ca58d22de438e834d212e97b73d03a4248d98 /video/out/vulkan/context_win.c
parent9f7dcc0726ab635fb34fb7310e54b1aec9467f14 (diff)
downloadmpv-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 'video/out/vulkan/context_win.c')
-rw-r--r--video/out/vulkan/context_win.c105
1 files changed, 0 insertions, 105 deletions
diff --git a/video/out/vulkan/context_win.c b/video/out/vulkan/context_win.c
deleted file mode 100644
index cf31586d00..0000000000
--- a/video/out/vulkan/context_win.c
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * This file is part of mpv.
- *
- * mpv is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * mpv is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with mpv. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "video/out/gpu/context.h"
-#include "video/out/w32_common.h"
-
-#include "common.h"
-#include "context.h"
-#include "utils.h"
-
-EXTERN_C IMAGE_DOS_HEADER __ImageBase;
-#define HINST_THISCOMPONENT ((HINSTANCE)&__ImageBase)
-
-struct priv {
- struct mpvk_ctx vk;
-};
-
-static void win_uninit(struct ra_ctx *ctx)
-{
- struct priv *p = ctx->priv;
-
- ra_vk_ctx_uninit(ctx);
- mpvk_uninit(&p->vk);
- vo_w32_uninit(ctx->vo);
-}
-
-static bool win_init(struct ra_ctx *ctx)
-{
- struct priv *p = ctx->priv = talloc_zero(ctx, struct priv);
- struct mpvk_ctx *vk = &p->vk;
- int msgl = ctx->opts.probing ? MSGL_V : MSGL_ERR;
-
- if (!mpvk_instance_init(vk, ctx->log, VK_KHR_WIN32_SURFACE_EXTENSION_NAME,
- ctx->opts.debug))
- goto error;
-
- if (!vo_w32_init(ctx->vo))
- goto error;
-
- VkWin32SurfaceCreateInfoKHR wininfo = {
- .sType = VK_STRUCTURE_TYPE_WIN32_SURFACE_CREATE_INFO_KHR,
- .hinstance = HINST_THISCOMPONENT,
- .hwnd = vo_w32_hwnd(ctx->vo),
- };
-
- VkResult res = vkCreateWin32SurfaceKHR(vk->inst, &wininfo, MPVK_ALLOCATOR,
- &vk->surf);
- if (res != VK_SUCCESS) {
- MP_MSG(ctx, msgl, "Failed creating Windows surface: %s\n", vk_err(res));
- goto error;
- }
-
- if (!ra_vk_ctx_init(ctx, vk, VK_PRESENT_MODE_FIFO_KHR))
- goto error;
-
- return true;
-
-error:
- win_uninit(ctx);
- return false;
-}
-
-static bool resize(struct ra_ctx *ctx)
-{
- return ra_vk_ctx_resize(ctx->swapchain, ctx->vo->dwidth, ctx->vo->dheight);
-}
-
-static bool win_reconfig(struct ra_ctx *ctx)
-{
- vo_w32_config(ctx->vo);
- return resize(ctx);
-}
-
-static int win_control(struct ra_ctx *ctx, int *events, int request, void *arg)
-{
- int ret = vo_w32_control(ctx->vo, events, request, arg);
- if (*events & VO_EVENT_RESIZE) {
- if (!resize(ctx))
- return VO_ERROR;
- }
- return ret;
-}
-
-const struct ra_ctx_fns ra_ctx_vulkan_win = {
- .type = "vulkan",
- .name = "winvk",
- .reconfig = win_reconfig,
- .control = win_control,
- .init = win_init,
- .uninit = win_uninit,
-};