From d5d62c6a6459412c86bd8d09be248810364a2405 Mon Sep 17 00:00:00 2001 From: sfan5 Date: Sat, 20 Nov 2021 20:59:37 +0100 Subject: [PATCH] vo_gpu_next: factor out context-specific code to gpu_next/context.c This is done to avoid cluttering vo_gpu_next.c with more ifdeffery and context-specific code when additional backends are added in the near future. Eventually gpu_ctx is intended to take the place of ra_ctx to further separate gpu and gpu_next. --- meson.build | 3 +- video/out/gpu_next/context.c | 80 ++++++++++++++++++++++++++++++++++++ video/out/gpu_next/context.h | 41 ++++++++++++++++++ video/out/vo_gpu_next.c | 44 ++++++++------------ wscript_build.py | 1 + 5 files changed, 141 insertions(+), 28 deletions(-) create mode 100644 video/out/gpu_next/context.c create mode 100644 video/out/gpu_next/context.h diff --git a/meson.build b/meson.build index c49700f463..c3a7ca89f1 100644 --- a/meson.build +++ b/meson.build @@ -979,7 +979,8 @@ if libplacebo.found() features += 'libplacebo-v4' libplacebo_v4 = true message('libplacebo v4.170+ found! Enabling vo_gpu_next.') - sources += files('video/out/vo_gpu_next.c') + sources += files('video/out/vo_gpu_next.c', + 'video/out/gpu_next/context.c') else message('libplacebo v4.170+ not found! Disabling vo_gpu_next.') endif diff --git a/video/out/gpu_next/context.c b/video/out/gpu_next/context.c new file mode 100644 index 0000000000..fdf308d7ef --- /dev/null +++ b/video/out/gpu_next/context.c @@ -0,0 +1,80 @@ +/* + * 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 . + */ + +#include + +#include "context.h" +#include "config.h" +#include "common/common.h" +#include "options/m_config.h" +#include "video/out/placebo/utils.h" +#include "video/out/gpu/video.h" + +#if HAVE_VULKAN +#include "video/out/vulkan/context.h" +#endif + +struct priv { + char dummy; +}; + +struct gpu_ctx *gpu_ctx_create(struct vo *vo, struct gl_video_opts *gl_opts) +{ + struct gpu_ctx *ctx = talloc_zero(NULL, struct gpu_ctx); + ctx->log = vo->log; + ctx->priv = talloc_zero(ctx, struct priv); + + struct ra_ctx_opts *ctx_opts = mp_get_config_group(ctx, vo->global, &ra_ctx_conf); + ctx_opts->want_alpha = gl_opts->alpha_mode == ALPHA_YES; + ctx->ra_ctx = ra_ctx_create(vo, *ctx_opts); + if (!ctx->ra_ctx) + goto err_out; + +#if HAVE_VULKAN + struct mpvk_ctx *vkctx = ra_vk_ctx_get(ctx->ra_ctx); + if (vkctx) { + ctx->pllog = vkctx->ctx; + ctx->gpu = vkctx->gpu; + ctx->swapchain = vkctx->swapchain; + return ctx; + } +#endif + + // TODO: wrap GL contexts + +err_out: + gpu_ctx_destroy(&ctx); + return NULL; +} + +bool gpu_ctx_resize(struct gpu_ctx *ctx, int w, int h) +{ + // Not (yet) used + return true; +} + +void gpu_ctx_destroy(struct gpu_ctx **ctxp) +{ + struct gpu_ctx *ctx = *ctxp; + if (!ctx) + return; + + ra_ctx_destroy(&ctx->ra_ctx); + + talloc_free(ctx); + *ctxp = NULL; +} diff --git a/video/out/gpu_next/context.h b/video/out/gpu_next/context.h new file mode 100644 index 0000000000..2e2bc3cd29 --- /dev/null +++ b/video/out/gpu_next/context.h @@ -0,0 +1,41 @@ +/* + * 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 . + */ + +#pragma once + +#include + +struct mp_log; +struct ra_ctx; +struct vo; +struct gl_video_opts; + +struct gpu_ctx { + struct mp_log *log; + + struct ra_ctx *ra_ctx; + + pl_log pllog; + pl_gpu gpu; + pl_swapchain swapchain; + + void *priv; +}; + +struct gpu_ctx *gpu_ctx_create(struct vo *vo, struct gl_video_opts *gl_opts); +bool gpu_ctx_resize(struct gpu_ctx *ctx, int w, int h); +void gpu_ctx_destroy(struct gpu_ctx **ctxp); diff --git a/video/out/vo_gpu_next.c b/video/out/vo_gpu_next.c index e5b1f5b6a7..b1fd5a2a7f 100644 --- a/video/out/vo_gpu_next.c +++ b/video/out/vo_gpu_next.c @@ -39,10 +39,7 @@ #include "gpu/video.h" #include "gpu/video_shaders.h" #include "sub/osd.h" - -#if HAVE_VULKAN -#include "vulkan/context.h" -#endif +#include "gpu_next/context.h" struct osd_entry { pl_tex tex; @@ -77,6 +74,7 @@ struct priv { struct mp_log *log; struct mpv_global *global; struct ra_ctx *ra_ctx; + struct gpu_ctx *context; pl_log pllog; pl_gpu gpu; @@ -809,6 +807,7 @@ static void resize(struct vo *vo) { struct priv *p = vo->priv; vo_get_src_dst_rects(vo, &p->src, &p->dst, &p->osd_res); + gpu_ctx_resize(p->context, vo->dwidth, vo->dheight); vo->want_redraw = true; } @@ -966,7 +965,12 @@ static void uninit(struct vo *vo) } pl_renderer_destroy(&p->rr); - ra_ctx_destroy(&p->ra_ctx); + + p->ra_ctx = NULL; + p->pllog = NULL; + p->gpu = NULL; + p->sw = NULL; + gpu_ctx_destroy(&p->context); } static int preinit(struct vo *vo) @@ -978,30 +982,16 @@ static int preinit(struct vo *vo) p->log = vo->log; struct gl_video_opts *gl_opts = p->opts_cache->opts; - struct ra_ctx_opts *ctx_opts = mp_get_config_group(p, vo->global, &ra_ctx_conf); - struct ra_ctx_opts opts = *ctx_opts; - opts.context_type = "vulkan"; - opts.context_name = NULL; - opts.want_alpha = gl_opts->alpha_mode == ALPHA_YES; - p->ra_ctx = ra_ctx_create(vo, opts); - if (!p->ra_ctx) + + p->context = gpu_ctx_create(vo, gl_opts); + if (!p->context) goto err_out; + // For the time being + p->ra_ctx = p->context->ra_ctx; + p->pllog = p->context->pllog; + p->gpu = p->context->gpu; + p->sw = p->context->swapchain; -#if HAVE_VULKAN - struct mpvk_ctx *vkctx = ra_vk_ctx_get(p->ra_ctx); - if (vkctx) { - p->pllog = vkctx->ctx; - p->gpu = vkctx->gpu; - p->sw = vkctx->swapchain; - goto done; - } -#endif - - // TODO: wrap GL contexts - - goto err_out; - -done: p->rr = pl_renderer_create(p->pllog, p->gpu); p->queue = pl_queue_create(p->gpu); p->osd_fmt[SUBBITMAP_LIBASS] = pl_find_named_fmt(p->gpu, "r8"); diff --git a/wscript_build.py b/wscript_build.py index c0dd23bb1c..9fc0d25a51 100644 --- a/wscript_build.py +++ b/wscript_build.py @@ -451,6 +451,7 @@ def build(ctx): ( "video/out/gpu/utils.c" ), ( "video/out/gpu/video.c" ), ( "video/out/gpu/video_shaders.c" ), + ( "video/out/gpu_next/context.c", "libplacebo-v4" ), ( "video/out/hwdec/hwdec_cuda.c", "cuda-interop" ), ( "video/out/hwdec/hwdec_cuda_gl.c", "cuda-interop && gl" ), ( "video/out/hwdec/hwdec_cuda_vk.c", "cuda-interop && vulkan" ),