diff options
Diffstat (limited to 'video/out/gpu')
| -rw-r--r-- | video/out/gpu/context.c | 8 | ||||
| -rw-r--r-- | video/out/gpu/ra.h | 9 |
2 files changed, 13 insertions, 4 deletions
diff --git a/video/out/gpu/context.c b/video/out/gpu/context.c index c5721c73b4..25e2a754bf 100644 --- a/video/out/gpu/context.c +++ b/video/out/gpu/context.c @@ -44,6 +44,7 @@ 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_mali; extern const struct ra_ctx_fns ra_ctx_vdpauglx; +extern const struct ra_ctx_fns ra_ctx_vulkan_xlib; static const struct ra_ctx_fns *contexts[] = { // OpenGL contexts: @@ -83,6 +84,13 @@ static const struct ra_ctx_fns *contexts[] = { #if HAVE_VDPAU_GL_X11 &ra_ctx_vdpauglx, #endif + +// Vulkan contexts: +#if HAVE_VULKAN +#if HAVE_X11 + &ra_ctx_vulkan_xlib, +#endif +#endif }; static bool get_help(struct mp_log *log, struct bstr param) diff --git a/video/out/gpu/ra.h b/video/out/gpu/ra.h index 10245b250e..7a2fa0e11c 100644 --- a/video/out/gpu/ra.h +++ b/video/out/gpu/ra.h @@ -146,6 +146,7 @@ enum ra_buf_type { RA_BUF_TYPE_TEX_UPLOAD, // texture upload buffer (pixel buffer object) RA_BUF_TYPE_SHADER_STORAGE, // shader buffer (SSBO), for RA_VARTYPE_BUF_RW RA_BUF_TYPE_UNIFORM, // uniform buffer (UBO), for RA_VARTYPE_BUF_RO + RA_BUF_TYPE_VERTEX, // not publicly usable (RA-internal usage) }; struct ra_buf_params { @@ -369,10 +370,10 @@ struct ra_fns { void (*buf_destroy)(struct ra *ra, struct ra_buf *buf); - // Update the contents of a buffer, starting at a given offset and up to a - // given size, with the contents of *data. This is an extremely common - // operation. Calling this while the buffer is considered "in use" is an - // error. (See: buf_poll) + // Update the contents of a buffer, starting at a given offset (*must* be a + // multiple of 4) and up to a given size, with the contents of *data. This + // is an extremely common operation. Calling this while the buffer is + // considered "in use" is an error. (See: buf_poll) void (*buf_update)(struct ra *ra, struct ra_buf *buf, ptrdiff_t offset, const void *data, size_t size); |