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

vo_gpu/vo_gpu_next: fix transparency in glx 

It seems that GLX requires us to explicitly set opts.want alpha before
ra_ctx_create is called. b7fd232524
rearranged the function calls in a way made this not work. Fix this by
rearranging it again so the value is set before ra_ctx is created.
This commit is contained in:
Dudemanguy 2024-03-11 08:57:37 -05:00
parent fbf3ae5a84
commit 38b5dcb441
4 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
video/out/gpu_next/context.c
View File

@ -107,12 +107,10 @@ err_out:
} }
#endif // HAVE_D3D11 #endif // HAVE_D3D11
struct gpu_ctx *gpu_ctx_create(struct vo *vo, struct gl_video_opts *gl_opts) struct gpu_ctx *gpu_ctx_create(struct vo *vo, struct ra_ctx_opts *ctx_opts)
{ {
struct gpu_ctx *ctx = talloc_zero(NULL, struct gpu_ctx); struct gpu_ctx *ctx = talloc_zero(NULL, struct gpu_ctx);
ctx->log = vo->log; ctx->log = vo->log;
struct ra_ctx_opts *ctx_opts = mp_get_config_group(ctx, vo->global, &ra_ctx_conf);
ctx->ra_ctx = ra_ctx_create(vo, *ctx_opts); ctx->ra_ctx = ra_ctx_create(vo, *ctx_opts);
if (!ctx->ra_ctx) if (!ctx->ra_ctx)
goto err_out; goto err_out;

4
video/out/gpu_next/context.h
View File

@ -21,8 +21,8 @@
struct mp_log; struct mp_log;
struct ra_ctx; struct ra_ctx;
struct ra_ctx_opts;
struct vo; struct vo;
struct gl_video_opts;
struct gpu_ctx { struct gpu_ctx {
struct mp_log *log; struct mp_log *log;
@ -35,6 +35,6 @@ struct gpu_ctx {
void *priv; void *priv;
}; };
struct gpu_ctx *gpu_ctx_create(struct vo *vo, struct gl_video_opts *gl_opts); struct gpu_ctx *gpu_ctx_create(struct vo *vo, struct ra_ctx_opts *ctx_opts);
bool gpu_ctx_resize(struct gpu_ctx *ctx, int w, int h); bool gpu_ctx_resize(struct gpu_ctx *ctx, int w, int h);
void gpu_ctx_destroy(struct gpu_ctx **ctxp); void gpu_ctx_destroy(struct gpu_ctx **ctxp);

17
video/out/vo_gpu.c
View File

@ -169,13 +169,13 @@ static void get_and_update_ambient_lighting(struct gpu_priv *p)
} }
} }
static void update_ra_ctx_options(struct vo *vo) static void update_ra_ctx_options(struct vo *vo, struct ra_ctx_opts *ctx_opts)
{ {
struct gpu_priv *p = vo->priv; struct gpu_priv *p = vo->priv;
struct gl_video_opts *gl_opts = mp_get_config_group(p->ctx, vo->global, &gl_video_conf); struct gl_video_opts *gl_opts = mp_get_config_group(p->ctx, vo->global, &gl_video_conf);
p->ctx->opts.want_alpha = (gl_opts->background == BACKGROUND_COLOR && ctx_opts->want_alpha = (gl_opts->background == BACKGROUND_COLOR &&
gl_opts->background_color.a != 255) || gl_opts->background_color.a != 255) ||
gl_opts->background == BACKGROUND_NONE; gl_opts->background == BACKGROUND_NONE;
talloc_free(gl_opts); talloc_free(gl_opts);
} }
@ -198,12 +198,14 @@ static int control(struct vo *vo, uint32_t request, void *data)
request_hwdec_api(vo, data); request_hwdec_api(vo, data);
return true; return true;
case VOCTRL_UPDATE_RENDER_OPTS: { case VOCTRL_UPDATE_RENDER_OPTS: {
update_ra_ctx_options(vo); struct ra_ctx_opts *ctx_opts = mp_get_config_group(vo, vo->global, &ra_ctx_conf);
update_ra_ctx_options(vo, ctx_opts);
gl_video_configure_queue(p->renderer, vo); gl_video_configure_queue(p->renderer, vo);
get_and_update_icc_profile(p); get_and_update_icc_profile(p);
if (p->ctx->fns->update_render_opts) if (p->ctx->fns->update_render_opts)
p->ctx->fns->update_render_opts(p->ctx); p->ctx->fns->update_render_opts(p->ctx);
vo->want_redraw = true; vo->want_redraw = true;
talloc_free(ctx_opts);
return true; return true;
} }
case VOCTRL_RESET: case VOCTRL_RESET:
@ -286,14 +288,13 @@ static int preinit(struct vo *vo)
p->log = vo->log; p->log = vo->log;
struct ra_ctx_opts *ctx_opts = mp_get_config_group(vo, vo->global, &ra_ctx_conf); struct ra_ctx_opts *ctx_opts = mp_get_config_group(vo, vo->global, &ra_ctx_conf);
struct ra_ctx_opts opts = *ctx_opts; update_ra_ctx_options(vo, ctx_opts);
p->ctx = ra_ctx_create(vo, opts); p->ctx = ra_ctx_create(vo, *ctx_opts);
talloc_free(ctx_opts); talloc_free(ctx_opts);
if (!p->ctx) if (!p->ctx)
goto err_out; goto err_out;
assert(p->ctx->ra); assert(p->ctx->ra);
assert(p->ctx->swapchain); assert(p->ctx->swapchain);
update_ra_ctx_options(vo);
p->renderer = gl_video_init(p->ctx->ra, vo->log, vo->global); p->renderer = gl_video_init(p->ctx->ra, vo->log, vo->global);
gl_video_set_osd_source(p->renderer, vo->osd); gl_video_set_osd_source(p->renderer, vo->osd);

18
video/out/vo_gpu_next.c
View File

@ -1477,17 +1477,17 @@ static inline void copy_frame_info_to_mp(struct frame_info *pl,
} }
} }
static void update_ra_ctx_options(struct vo *vo) static void update_ra_ctx_options(struct vo *vo, struct ra_ctx_opts *ctx_opts)
{ {
struct priv *p = vo->priv; struct priv *p = vo->priv;
struct gl_video_opts *gl_opts = p->opts_cache->opts; struct gl_video_opts *gl_opts = p->opts_cache->opts;
bool border_alpha = (p->next_opts->border_background == BACKGROUND_COLOR && bool border_alpha = (p->next_opts->border_background == BACKGROUND_COLOR &&
gl_opts->background_color.a != 255) || gl_opts->background_color.a != 255) ||
p->next_opts->border_background == BACKGROUND_NONE; p->next_opts->border_background == BACKGROUND_NONE;
p->ra_ctx->opts.want_alpha = (gl_opts->background == BACKGROUND_COLOR && ctx_opts->want_alpha = (gl_opts->background == BACKGROUND_COLOR &&
gl_opts->background_color.a != 255) || gl_opts->background_color.a != 255) ||
gl_opts->background == BACKGROUND_NONE || gl_opts->background == BACKGROUND_NONE ||
border_alpha; border_alpha;
} }
static int control(struct vo *vo, uint32_t request, void *data) static int control(struct vo *vo, uint32_t request, void *data)
@ -1505,7 +1505,7 @@ static int control(struct vo *vo, uint32_t request, void *data)
case VOCTRL_UPDATE_RENDER_OPTS: { case VOCTRL_UPDATE_RENDER_OPTS: {
m_config_cache_update(p->opts_cache); m_config_cache_update(p->opts_cache);
update_ra_ctx_options(vo); update_ra_ctx_options(vo, &p->ra_ctx->opts);
if (p->ra_ctx->fns->update_render_opts) if (p->ra_ctx->fns->update_render_opts)
p->ra_ctx->fns->update_render_opts(p->ra_ctx); p->ra_ctx->fns->update_render_opts(p->ra_ctx);
update_render_options(vo); update_render_options(vo);
@ -1825,7 +1825,10 @@ static int preinit(struct vo *vo)
p->log = vo->log; p->log = vo->log;
struct gl_video_opts *gl_opts = p->opts_cache->opts; struct gl_video_opts *gl_opts = p->opts_cache->opts;
p->context = gpu_ctx_create(vo, gl_opts); struct ra_ctx_opts *ctx_opts = mp_get_config_group(vo, vo->global, &ra_ctx_conf);
update_ra_ctx_options(vo, ctx_opts);
p->context = gpu_ctx_create(vo, ctx_opts);
talloc_free(ctx_opts);
if (!p->context) if (!p->context)
goto err_out; goto err_out;
// For the time being // For the time being
@ -1838,7 +1841,6 @@ static int preinit(struct vo *vo)
.global = p->global, .global = p->global,
.ra_ctx = p->ra_ctx, .ra_ctx = p->ra_ctx,
}; };
update_ra_ctx_options(vo);
vo->hwdec_devs = hwdec_devices_create(); vo->hwdec_devs = hwdec_devices_create();
hwdec_devices_set_loader(vo->hwdec_devs, load_hwdec_api, vo); hwdec_devices_set_loader(vo->hwdec_devs, load_hwdec_api, vo);