RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

vo_gpu_next: update render_info for upstream API change 

This fixes an issue where blend stages with multiple passes got
overwritten by later passes, with only the final pass (typically the
overlayp pass) actually being shown.
This commit is contained in:
Niklas Haas 2022-09-26 21:14:34 +02:00
parent 2b0736ed83
commit 6b9b032d51
1 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
video/out/vo_gpu_next.c
View File

@ -731,23 +731,26 @@ static void info_callback(void *priv, const struct pl_render_info *info)
{
struct vo *vo = priv;
struct priv *p = vo->priv;
int index;
struct mp_frame_perf *frame;
switch (info->stage) {
case PL_RENDER_STAGE_FRAME:
if (info->index > VO_PASS_PERF_MAX)
return; // silently ignore clipped passes, whatever
frame = &p->perf.fresh;
index = info->index;
break;
case PL_RENDER_STAGE_BLEND:
frame = &p->perf.redraw;
index = 0; // ignore blended frame count
break;
struct mp_frame_perf *frame;
switch (info->stage) {
case PL_RENDER_STAGE_FRAME: frame = &p->perf.fresh; break;
case PL_RENDER_STAGE_BLEND: frame = &p->perf.redraw; break;
default: abort();
}
int index = info->index;
#if PL_API_VER < 227
// Versions of libplacebo older than this used `index` to communicate the
// blended frame count, and implicitly clipped all subsequent passes. This
// functionaliy was removed in API ver 227, which makes `index` behave the
// same for frame and blend stages.
if (info->stage == PL_RENDER_STAGE_BLEND)
index = 0;
#endif
struct mp_pass_perf *perf = &frame->perf[index];
const struct pl_dispatch_info *pass = info->pass;
assert(VO_PERF_SAMPLE_COUNT >= MP_ARRAY_SIZE(pass->samples));