RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-03-30 15:29:56 +00:00
Code Issues Releases Wiki Activity

vo_gpu: placebo: update for upstream API changes

Browse Source 
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.
This commit is contained in:
Niklas Haas 2020-12-03 08:25:23 +01:00
parent 84d0930fa1
commit 7c4465cefb
1 changed files with 29 additions and 2 deletions

31
video/out/placebo/ra_pl.c
View File

@ -144,8 +144,14 @@ bool mppl_wrap_tex(struct ra *ra, const struct pl_tex *pltex,
.blit_dst = pltex->params.blit_dst, .blit_dst = pltex->params.blit_dst,
.host_mutable = pltex->params.host_writable, .host_mutable = pltex->params.host_writable,
.downloadable = pltex->params.host_readable, .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_linear = pltex->params.sample_mode == PL_TEX_SAMPLE_LINEAR,
.src_repeat = pltex->params.address_mode == PL_TEX_ADDRESS_REPEAT, .src_repeat = pltex->params.address_mode == PL_TEX_ADDRESS_REPEAT,
#endif
}, },
.priv = (void *) pltex, .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, .blit_dst = params->blit_dst || params->render_dst,
.host_writable = params->host_mutable, .host_writable = params->host_mutable,
.host_readable = params->downloadable, .host_readable = params->downloadable,
#if PL_API_VER < 103
.sample_mode = params->src_linear ? PL_TEX_SAMPLE_LINEAR .sample_mode = params->src_linear ? PL_TEX_SAMPLE_LINEAR
: PL_TEX_SAMPLE_NEAREST, : PL_TEX_SAMPLE_NEAREST,
.address_mode = params->src_repeat ? PL_TEX_ADDRESS_REPEAT .address_mode = params->src_repeat ? PL_TEX_ADDRESS_REPEAT
: PL_TEX_ADDRESS_CLAMP, : PL_TEX_ADDRESS_CLAMP,
#endif
.initial_data = params->initial_data, .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); 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); pl_tex_blit(get_gpu(ra), dst->priv, src->priv, pldst, plsrc);
#endif
} }
static const enum pl_var_type var_type[RA_VARTYPE_COUNT] = { 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; struct pl_desc_binding bind;
switch (inp->type) { switch (inp->type) {
case RA_VARTYPE_TEX: case RA_VARTYPE_TEX:
case RA_VARTYPE_IMG_W: case RA_VARTYPE_IMG_W: {
bind.object = (* (struct ra_tex **) val->data)->priv; 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; break;
}
case RA_VARTYPE_BUF_RO: case RA_VARTYPE_BUF_RO:
case RA_VARTYPE_BUF_RW: case RA_VARTYPE_BUF_RW:
bind.object = (* (struct ra_buf **) val->data)->priv; bind.object = (* (struct ra_buf **) val->data)->priv;