[vlc-devel] [PATCH] vout_opengl: update for libplacebo 0.6 API

Thomas Guillem thomas at gllm.fr
Mon Oct 1 11:54:55 CEST 2018


merged, thanks.

On Fri, Sep 28, 2018, at 19:18, Niklas Haas wrote:
> From: Niklas Haas <git at haasn.xyz>
> 
> This removed a superfluous field from the pl_shader_alloc signature.
> ---
>  modules/video_output/opengl/vout_helper.c | 7 ++++++-
>  1 file changed, 6 insertions(+), 1 deletion(-)
> 
> diff --git a/modules/video_output/opengl/vout_helper.c b/modules/
> video_output/opengl/vout_helper.c
> index 33f738f579..89fc1ae9c7 100644
> --- a/modules/video_output/opengl/vout_helper.c
> +++ b/modules/video_output/opengl/vout_helper.c
> @@ -629,8 +629,13 @@ opengl_init_program(vout_display_opengl_t *vgl, 
> struct prgm *prgm,
>              .log_priv  = tc,
>              .log_level = PL_LOG_INFO,
>          });
> -        if (tc->pl_ctx)
> +        if (tc->pl_ctx) {
> +#   if PL_API_VER >= 6
> +            tc->pl_sh = pl_shader_alloc(tc->pl_ctx, NULL, 0);
> +#   else
>              tc->pl_sh = pl_shader_alloc(tc->pl_ctx, NULL, 0, 0);
> +#   endif
> +        }
>      }
>  #endif
>  
> -- 
> 2.19.0
> 
> _______________________________________________
> vlc-devel mailing list
> To unsubscribe or modify your subscription options:
> https://mailman.videolan.org/listinfo/vlc-devel


More information about the vlc-devel mailing list