mirror of https://github.com/mpv-player/mpv
vo_gpu: vulkan: add Android context
This commit is contained in:
parent
508e35881e
commit
e350ceef4c
|
@ -49,6 +49,7 @@ extern const struct ra_ctx_fns ra_ctx_android;
|
||||||
extern const struct ra_ctx_fns ra_ctx_vulkan_wayland;
|
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_win;
|
||||||
extern const struct ra_ctx_fns ra_ctx_vulkan_xlib;
|
extern const struct ra_ctx_fns ra_ctx_vulkan_xlib;
|
||||||
|
extern const struct ra_ctx_fnd ra_ctx_vulkan_android;
|
||||||
|
|
||||||
/* Direct3D 11 */
|
/* Direct3D 11 */
|
||||||
extern const struct ra_ctx_fns ra_ctx_d3d11;
|
extern const struct ra_ctx_fns ra_ctx_d3d11;
|
||||||
|
@ -93,6 +94,9 @@ static const struct ra_ctx_fns *contexts[] = {
|
||||||
// Vulkan contexts:
|
// Vulkan contexts:
|
||||||
#if HAVE_VULKAN
|
#if HAVE_VULKAN
|
||||||
|
|
||||||
|
#if HAVE_ANDROID
|
||||||
|
&ra_ctx_vulkan_android,
|
||||||
|
#endif
|
||||||
#if HAVE_WIN32_DESKTOP
|
#if HAVE_WIN32_DESKTOP
|
||||||
&ra_ctx_vulkan_win,
|
&ra_ctx_vulkan_win,
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -0,0 +1,94 @@
|
||||||
|
/*
|
||||||
|
* 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 <vulkan/vulkan.h>
|
||||||
|
#include <vulkan/vulkan_android.h>
|
||||||
|
|
||||||
|
#include "video/out/android_common.h"
|
||||||
|
#include "common.h"
|
||||||
|
#include "context.h"
|
||||||
|
#include "utils.h"
|
||||||
|
|
||||||
|
struct priv {
|
||||||
|
struct mpvk_ctx vk;
|
||||||
|
};
|
||||||
|
|
||||||
|
static void android_uninit(struct ra_ctx *ctx)
|
||||||
|
{
|
||||||
|
struct priv *p = ctx->priv;
|
||||||
|
ra_vk_ctx_uninit(ctx);
|
||||||
|
mpvk_uninit(&p->vk);
|
||||||
|
|
||||||
|
vo_android_uninit(ctx->vo);
|
||||||
|
}
|
||||||
|
|
||||||
|
static bool android_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 (!vo_android_init(ctx->vo))
|
||||||
|
goto fail;
|
||||||
|
|
||||||
|
if (!mpvk_init(vk, ctx, VK_KHR_ANDROID_SURFACE_EXTENSION_NAME))
|
||||||
|
goto fail;
|
||||||
|
|
||||||
|
VkAndroidSurfaceCreateInfoKHR info = {
|
||||||
|
.sType = VK_STRUCTURE_TYPE_ANDROID_SURFACE_CREATE_INFO_KHR,
|
||||||
|
.window = vo_android_native_window(ctx->vo)
|
||||||
|
};
|
||||||
|
|
||||||
|
VkInstance inst = vk->vkinst->instance;
|
||||||
|
VkResult res = vkCreateAndroidSurfaceKHR(inst, &info, NULL, &vk->surface);
|
||||||
|
if (res != VK_SUCCESS) {
|
||||||
|
MP_MSG(ctx, msgl, "Failed creating Android surface\n");
|
||||||
|
goto fail;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!ra_vk_ctx_init(ctx, vk, VK_PRESENT_MODE_FIFO_KHR))
|
||||||
|
goto fail;
|
||||||
|
|
||||||
|
return true;
|
||||||
|
fail:
|
||||||
|
android_uninit(ctx);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
static bool android_reconfig(struct ra_ctx *ctx)
|
||||||
|
{
|
||||||
|
int w, h;
|
||||||
|
if (!vo_android_surface_size(ctx->vo, &w, &h))
|
||||||
|
return false;
|
||||||
|
|
||||||
|
ra_vk_ctx_resize(ctx, w, h);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
static int android_control(struct ra_ctx *ctx, int *events, int request, void *arg)
|
||||||
|
{
|
||||||
|
return VO_NOTIMPL;
|
||||||
|
}
|
||||||
|
|
||||||
|
const struct ra_ctx_fns ra_ctx_vulkan_android = {
|
||||||
|
.type = "vulkan",
|
||||||
|
.name = "androidvk",
|
||||||
|
.reconfig = android_reconfig,
|
||||||
|
.control = android_control,
|
||||||
|
.init = android_init,
|
||||||
|
.uninit = android_uninit,
|
||||||
|
};
|
|
@ -488,6 +488,7 @@ def build(ctx):
|
||||||
( "video/out/vo_x11.c" , "x11" ),
|
( "video/out/vo_x11.c" , "x11" ),
|
||||||
( "video/out/vo_xv.c", "xv" ),
|
( "video/out/vo_xv.c", "xv" ),
|
||||||
( "video/out/vulkan/context.c", "vulkan" ),
|
( "video/out/vulkan/context.c", "vulkan" ),
|
||||||
|
( "video/out/vulkan/context_android.c", "vulkan && android" ),
|
||||||
( "video/out/vulkan/context_wayland.c", "vulkan && wayland" ),
|
( "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/context_xlib.c", "vulkan && x11" ),
|
||||||
|
|
Loading…
Reference in New Issue