Vitaly Zaitsev
3 years ago
parent
570dd938c4
commit
1e06772dfd
@ -1,84 +0,0 @@
|
|||||||
From 7c4465cefb27d4e0d07535d368febdf77b579566 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Niklas Haas <git@haasn.xyz>
|
|
||||||
Date: Thu, 3 Dec 2020 08:25:23 +0100
|
|
||||||
Subject: [PATCH] vo_gpu: placebo: update for upstream API changes
|
|
||||||
|
|
||||||
The concept of sample/address modes was moved from `pl_tex` to
|
|
||||||
`pl_desc_binding`.
|
|
||||||
|
|
||||||
The `pl_tex_blit()` function also underwent an API change.
|
|
||||||
---
|
|
||||||
video/out/placebo/ra_pl.c | 31 +++++++++++++++++++++++++++++--
|
|
||||||
1 file changed, 29 insertions(+), 2 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/video/out/placebo/ra_pl.c b/video/out/placebo/ra_pl.c
|
|
||||||
index f8df590511..8244acff26 100644
|
|
||||||
--- a/video/out/placebo/ra_pl.c
|
|
||||||
+++ b/video/out/placebo/ra_pl.c
|
|
||||||
@@ -144,8 +144,14 @@ bool mppl_wrap_tex(struct ra *ra, const struct pl_tex *pltex,
|
|
||||||
.blit_dst = pltex->params.blit_dst,
|
|
||||||
.host_mutable = pltex->params.host_writable,
|
|
||||||
.downloadable = pltex->params.host_readable,
|
|
||||||
+#if PL_API_VER >= 103
|
|
||||||
+ // These don't exist upstream, so just pick something reasonable
|
|
||||||
+ .src_linear = pltex->params.format->caps & PL_FMT_CAP_LINEAR,
|
|
||||||
+ .src_repeat = false,
|
|
||||||
+#else
|
|
||||||
.src_linear = pltex->params.sample_mode == PL_TEX_SAMPLE_LINEAR,
|
|
||||||
.src_repeat = pltex->params.address_mode == PL_TEX_ADDRESS_REPEAT,
|
|
||||||
+#endif
|
|
||||||
},
|
|
||||||
.priv = (void *) pltex,
|
|
||||||
};
|
|
||||||
@@ -195,10 +201,12 @@ static struct ra_tex *tex_create_pl(struct ra *ra,
|
|
||||||
.blit_dst = params->blit_dst || params->render_dst,
|
|
||||||
.host_writable = params->host_mutable,
|
|
||||||
.host_readable = params->downloadable,
|
|
||||||
+#if PL_API_VER < 103
|
|
||||||
.sample_mode = params->src_linear ? PL_TEX_SAMPLE_LINEAR
|
|
||||||
: PL_TEX_SAMPLE_NEAREST,
|
|
||||||
.address_mode = params->src_repeat ? PL_TEX_ADDRESS_REPEAT
|
|
||||||
: PL_TEX_ADDRESS_CLAMP,
|
|
||||||
+#endif
|
|
||||||
.initial_data = params->initial_data,
|
|
||||||
});
|
|
||||||
|
|
||||||
@@ -399,7 +407,18 @@ static void blit_pl(struct ra *ra, struct ra_tex *dst, struct ra_tex *src,
|
|
||||||
pldst.y1 = MPMIN(MPMAX(dst_rc->y1, 0), dst->params.h);
|
|
||||||
}
|
|
||||||
|
|
||||||
+#if PL_API_VER >= 103
|
|
||||||
+ pl_tex_blit(get_gpu(ra), &(struct pl_tex_blit_params) {
|
|
||||||
+ .src = src->priv,
|
|
||||||
+ .dst = dst->priv,
|
|
||||||
+ .src_rc = plsrc,
|
|
||||||
+ .dst_rc = pldst,
|
|
||||||
+ .sample_mode = src->params.src_linear ? PL_TEX_SAMPLE_LINEAR
|
|
||||||
+ : PL_TEX_SAMPLE_NEAREST,
|
|
||||||
+ });
|
|
||||||
+#else
|
|
||||||
pl_tex_blit(get_gpu(ra), dst->priv, src->priv, pldst, plsrc);
|
|
||||||
+#endif
|
|
||||||
}
|
|
||||||
|
|
||||||
static const enum pl_var_type var_type[RA_VARTYPE_COUNT] = {
|
|
||||||
@@ -627,9 +646,17 @@ static void renderpass_run_pl(struct ra *ra,
|
|
||||||
struct pl_desc_binding bind;
|
|
||||||
switch (inp->type) {
|
|
||||||
case RA_VARTYPE_TEX:
|
|
||||||
- case RA_VARTYPE_IMG_W:
|
|
||||||
- bind.object = (* (struct ra_tex **) val->data)->priv;
|
|
||||||
+ case RA_VARTYPE_IMG_W: {
|
|
||||||
+ struct ra_tex *tex = *((struct ra_tex **) val->data);
|
|
||||||
+ bind.object = tex->priv;
|
|
||||||
+#if PL_API_VER >= 103
|
|
||||||
+ bind.sample_mode = tex->params.src_linear ? PL_TEX_SAMPLE_LINEAR
|
|
||||||
+ : PL_TEX_SAMPLE_NEAREST;
|
|
||||||
+ bind.address_mode = tex->params.src_repeat ? PL_TEX_ADDRESS_REPEAT
|
|
||||||
+ : PL_TEX_ADDRESS_CLAMP;
|
|
||||||
+#endif
|
|
||||||
break;
|
|
||||||
+ }
|
|
||||||
case RA_VARTYPE_BUF_RO:
|
|
||||||
case RA_VARTYPE_BUF_RW:
|
|
||||||
bind.object = (* (struct ra_buf **) val->data)->priv;
|
|
||||||
@ -1,12 +0,0 @@
|
|||||||
--- a/etc/mpv.conf
|
|
||||||
+++ b/etc/mpv.conf
|
|
||||||
@@ -8,7 +8,7 @@
|
|
||||||
# no builtin or example mpv.conf with all the defaults.
|
|
||||||
#
|
|
||||||
#
|
|
||||||
-# Configuration files are read system-wide from /usr/local/etc/mpv.conf
|
|
||||||
+# Configuration files are read system-wide from /etc/mpv/mpv.conf
|
|
||||||
# and per-user from ~/.config/mpv/mpv.conf, where per-user settings override
|
|
||||||
# system-wide settings, all of which are overridden by the command line.
|
|
||||||
#
|
|
||||||
|
|
||||||
@ -1 +1 @@
|
|||||||
SHA512 (mpv-0.33.1.tar.gz) = 99d6c40d18c5cf83814b44ec6d8eade229800c5b51a734c9bbe831c3aeb95f8931124c94f6ae2360ffff62053c163bc3c55b254df021e005b350ebc3df7e952b
|
SHA512 (mpv-0.34.0.tar.gz) = 9935a20730dbb8fbf4cd11fe2fc38b1981882fc85c93046837a9b99cae089b3f710e6af7d7ea977c177de5479aa24e413f76cab9b995e8b7e66d6b77c524fdf0
|
||||||
|
|||||||
Loading…
Reference in new issue