diff options
Diffstat (limited to 'video/out/gpu/context.c')
| -rw-r--r-- | video/out/gpu/context.c | 211 |
1 files changed, 153 insertions, 58 deletions
diff --git a/video/out/gpu/context.c b/video/out/gpu/context.c index 39696fbd83..3202729741 100644 --- a/video/out/gpu/context.c +++ b/video/out/gpu/context.c @@ -37,12 +37,10 @@ extern const struct ra_ctx_fns ra_ctx_glx; extern const struct ra_ctx_fns ra_ctx_x11_egl; extern const struct ra_ctx_fns ra_ctx_drm_egl; -extern const struct ra_ctx_fns ra_ctx_cocoa; extern const struct ra_ctx_fns ra_ctx_wayland_egl; extern const struct ra_ctx_fns ra_ctx_wgl; extern const struct ra_ctx_fns ra_ctx_angle; extern const struct ra_ctx_fns ra_ctx_dxgl; -extern const struct ra_ctx_fns ra_ctx_rpi; extern const struct ra_ctx_fns ra_ctx_android; /* Vulkan */ @@ -50,11 +48,36 @@ extern const struct ra_ctx_fns ra_ctx_vulkan_wayland; extern const struct ra_ctx_fns ra_ctx_vulkan_win; extern const struct ra_ctx_fns ra_ctx_vulkan_xlib; extern const struct ra_ctx_fns ra_ctx_vulkan_android; +extern const struct ra_ctx_fns ra_ctx_vulkan_display; +extern const struct ra_ctx_fns ra_ctx_vulkan_mac; /* Direct3D 11 */ extern const struct ra_ctx_fns ra_ctx_d3d11; +/* No API */ +extern const struct ra_ctx_fns ra_ctx_wldmabuf; + +/* Autoprobe dummy. Always fails to create. */ +static bool dummy_init(struct ra_ctx *ctx) +{ + return false; +} + +static void dummy_uninit(struct ra_ctx *ctx) +{ +} + +static const struct ra_ctx_fns ra_ctx_dummy = { + .type = "auto", + .name = "auto", + .description = "Auto detect", + .init = dummy_init, + .uninit = dummy_uninit, +}; + static const struct ra_ctx_fns *contexts[] = { + &ra_ctx_dummy, +// Direct3D contexts: #if HAVE_D3D11 &ra_ctx_d3d11, #endif @@ -63,12 +86,6 @@ static const struct ra_ctx_fns *contexts[] = { #if HAVE_EGL_ANDROID &ra_ctx_android, #endif -#if HAVE_RPI - &ra_ctx_rpi, -#endif -#if HAVE_GL_COCOA - &ra_ctx_cocoa, -#endif #if HAVE_EGL_ANGLE_WIN32 &ra_ctx_angle, #endif @@ -78,7 +95,7 @@ static const struct ra_ctx_fns *contexts[] = { #if HAVE_GL_DXINTEROP &ra_ctx_dxgl, #endif -#if HAVE_GL_WAYLAND +#if HAVE_EGL_WAYLAND &ra_ctx_wayland_egl, #endif #if HAVE_EGL_X11 @@ -106,55 +123,134 @@ static const struct ra_ctx_fns *contexts[] = { #if HAVE_X11 &ra_ctx_vulkan_xlib, #endif +#if HAVE_VK_KHR_DISPLAY + &ra_ctx_vulkan_display, +#endif +#if HAVE_COCOA && HAVE_SWIFT + &ra_ctx_vulkan_mac, +#endif +#endif +}; +static const struct ra_ctx_fns *no_api_contexts[] = { + &ra_ctx_dummy, +/* No API contexts: */ +#if HAVE_DMABUF_WAYLAND + &ra_ctx_wldmabuf, #endif }; -int ra_ctx_validate_api(struct mp_log *log, const struct m_option *opt, - struct bstr name, struct bstr param) +static bool get_desc(struct m_obj_desc *dst, int index) { - if (bstr_equals0(param, "help")) { - mp_info(log, "GPU APIs (contexts):\n"); - mp_info(log, " auto (autodetect)\n"); - for (int n = 0; n < MP_ARRAY_SIZE(contexts); n++) - mp_info(log, " %s (%s)\n", contexts[n]->type, contexts[n]->name); - return M_OPT_EXIT; - } - if (bstr_equals0(param, "auto")) - return 1; + if (index >= MP_ARRAY_SIZE(contexts)) + return false; + const struct ra_ctx_fns *ctx = contexts[index]; + *dst = (struct m_obj_desc) { + .name = ctx->name, + .description = ctx->description, + }; + return true; +} + +static bool check_unknown_entry(const char *name) +{ + struct bstr param = bstr0(name); for (int i = 0; i < MP_ARRAY_SIZE(contexts); i++) { - if (bstr_equals0(param, contexts[i]->type)) - return 1; + if (bstr_equals0(param, contexts[i]->name)) + return true; } - return M_OPT_INVALID; + return false; } -int ra_ctx_validate_context(struct mp_log *log, const struct m_option *opt, - struct bstr name, struct bstr param) +const struct m_obj_list ra_ctx_obj_list = { + .get_desc = get_desc, + .check_unknown_entry = check_unknown_entry, + .description = "GPU contexts", + .allow_trailer = true, + .disallow_positional_parameters = true, + .use_global_options = true, +}; + +static int ra_ctx_api_help(struct mp_log *log, const struct m_option *opt, + struct bstr name) { - if (bstr_equals0(param, "help")) { - mp_info(log, "GPU contexts (APIs):\n"); - mp_info(log, " auto (autodetect)\n"); - for (int n = 0; n < MP_ARRAY_SIZE(contexts); n++) - mp_info(log, " %s (%s)\n", contexts[n]->name, contexts[n]->type); - return M_OPT_EXIT; + mp_info(log, "GPU APIs (contexts):\n"); + for (int n = 0; n < MP_ARRAY_SIZE(contexts); n++) { + mp_info(log, " %s (%s)\n", contexts[n]->type, contexts[n]->name); } - if (bstr_equals0(param, "auto")) - return 1; + return M_OPT_EXIT; +} + +static inline OPT_STRING_VALIDATE_FUNC(ra_ctx_validate_api) +{ + struct bstr param = bstr0(*value); for (int i = 0; i < MP_ARRAY_SIZE(contexts); i++) { - if (bstr_equals0(param, contexts[i]->name)) + if (bstr_equals0(param, contexts[i]->type)) return 1; } return M_OPT_INVALID; } +#define OPT_BASE_STRUCT struct ra_ctx_opts +const struct m_sub_options ra_ctx_conf = { + .opts = (const m_option_t[]) { + {"gpu-context", + OPT_SETTINGSLIST(context_list, &ra_ctx_obj_list)}, + {"gpu-api", + OPT_STRING_VALIDATE(context_type, ra_ctx_validate_api), + .help = ra_ctx_api_help}, + {"gpu-debug", OPT_BOOL(debug)}, + {"gpu-sw", OPT_BOOL(allow_sw)}, + {0} + }, + .size = sizeof(struct ra_ctx_opts), +}; + +static struct ra_ctx *create_in_contexts(struct vo *vo, const char *name, bool api_auto, + const struct ra_ctx_fns *ctxs[], + size_t size, struct ra_ctx_opts opts) +{ + for (int i = 0; i < size; i++) { + if (strcmp(name, ctxs[i]->name) != 0) + continue; + if (!api_auto && strcmp(ctxs[i]->type, opts.context_type) != 0) + continue; + struct ra_ctx *ctx = talloc_ptrtype(NULL, ctx); + *ctx = (struct ra_ctx) { + .vo = vo, + .global = vo->global, + .log = mp_log_new(ctx, vo->log, ctxs[i]->type), + .opts = opts, + .fns = ctxs[i], + }; + + MP_VERBOSE(ctx, "Initializing GPU context '%s'\n", ctx->fns->name); + if (ctxs[i]->init(ctx)) + return ctx; + talloc_free(ctx); + } + return NULL; +} + +struct ra_ctx *ra_ctx_create_by_name(struct vo *vo, const char *name) +{ + struct ra_ctx_opts dummy = {0}; + struct ra_ctx *ctx = create_in_contexts(vo, name, true, contexts, + MP_ARRAY_SIZE(contexts), dummy); + if (ctx) + return ctx; + return create_in_contexts(vo, name, true, no_api_contexts, + MP_ARRAY_SIZE(no_api_contexts), dummy); +} + // Create a VO window and create a RA context on it. // vo_flags: passed to the backend's create window function -struct ra_ctx *ra_ctx_create(struct vo *vo, const char *context_type, - const char *context_name, struct ra_ctx_opts opts) +struct ra_ctx *ra_ctx_create(struct vo *vo, struct ra_ctx_opts opts) { - bool api_auto = !context_type || strcmp(context_type, "auto") == 0; - bool ctx_auto = !context_name || strcmp(context_name, "auto") == 0; + bool api_auto = !opts.context_type || strcmp(opts.context_type, "auto") == 0; + bool ctx_auto = !opts.context_list || + (opts.context_list[0].name && + strcmp(opts.context_list[0].name, "auto") == 0); if (ctx_auto) { MP_VERBOSE(vo, "Probing for best GPU context.\n"); @@ -166,28 +262,27 @@ struct ra_ctx *ra_ctx_create(struct vo *vo, const char *context_type, bool old_probing = vo->probing; vo->probing = opts.probing; - for (int i = 0; i < MP_ARRAY_SIZE(contexts); i++) { - if (!opts.probing && strcmp(contexts[i]->name, context_name) != 0) - continue; - if (!api_auto && strcmp(contexts[i]->type, context_type) != 0) - continue; - - struct ra_ctx *ctx = talloc_ptrtype(NULL, ctx); - *ctx = (struct ra_ctx) { - .vo = vo, - .global = vo->global, - .log = mp_log_new(ctx, vo->log, contexts[i]->type), - .opts = opts, - .fns = contexts[i], - }; - - MP_VERBOSE(ctx, "Initializing GPU context '%s'\n", ctx->fns->name); - if (contexts[i]->init(ctx)) { - vo->probing = old_probing; - return ctx; + struct ra_ctx *ctx = NULL; + if (opts.probing) { + for (int i = 0; i < MP_ARRAY_SIZE(contexts); i++) { + ctx = create_in_contexts(vo, contexts[i]->name, api_auto, + contexts, MP_ARRAY_SIZE(contexts), opts); + if (ctx) + goto done; } + } + for (int i = 0; opts.context_list && opts.context_list[i].name; i++) { + ctx = create_in_contexts(vo, opts.context_list[i].name, api_auto, + contexts, MP_ARRAY_SIZE(contexts), opts); + if (ctx) + goto done; + } - talloc_free(ctx); +done: + if (ctx) { + vo->probing = old_probing; + vo->context_name = ctx->fns->name; + return ctx; } vo->probing = old_probing; |