[vlc-commits] opengl: update libplacebo to v0.2.0

[Niklas Haas]

vlc/vlc-3.0 | branch: master | Niklas Haas <vlc at haasn.xyz> | Thu Dec 28 04:47:53 2017 +0100| [053b15ecfa1c7b95049658bd2bb8c7caf83c17da] | committer: Thomas Guillem

opengl: update libplacebo to v0.2.0

Some calls got an extra parameter which we don't care about.

Also bump up the minimum libplacebo version to v0.2.0. Note: This
commit doesn't update the contrib/ entry for libplacebo.

Signed-off-by: Thomas Guillem <thomas at gllm.fr>
(cherry picked from commit 9e78bfb791b1ad595e24023c37c228ab32a1d9a4)
Signed-off-by: Thomas Guillem <thomas at gllm.fr>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=053b15ecfa1c7b95049658bd2bb8c7caf83c17da
---

 configure.ac                                   | 2 +-
 modules/video_output/opengl/fragment_shaders.c | 2 +-
 modules/video_output/opengl/vout_helper.c      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index 9aae94221f..e27c08957f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4134,7 +4134,7 @@ AC_ARG_ENABLE(libplacebo,
       [disable libplacebo support (default auto)])])
 
 AS_IF([test "$enable_libplacebo" != "no"], [
-  PKG_CHECK_MODULES([LIBPLACEBO], [libplacebo >= 0.1], [
+  PKG_CHECK_MODULES([LIBPLACEBO], [libplacebo >= 0.2], [
     AC_DEFINE([HAVE_LIBPLACEBO], [1], [Define to 1 if libplacebo is enabled.])
   ], [
     AS_IF([test -n "${enable_libplacebo}"], [
diff --git a/modules/video_output/opengl/fragment_shaders.c b/modules/video_output/opengl/fragment_shaders.c
index 3cc9222284..cbd0a52858 100644
--- a/modules/video_output/opengl/fragment_shaders.c
+++ b/modules/video_output/opengl/fragment_shaders.c
@@ -607,7 +607,7 @@ opengl_fragment_shader_init_impl(opengl_tex_converter_t *tc, GLenum tex_target,
         struct pl_shader *sh = tc->pl_sh;
         pl_shader_color_map(sh, &pl_color_map_default_params,
                 pl_color_space_from_video_format(&tc->fmt),
-                pl_color_space_unknown, false);
+                pl_color_space_unknown, NULL, false);
 
         const struct pl_shader_res *res = tc->pl_sh_res = pl_shader_finalize(sh);
 
diff --git a/modules/video_output/opengl/vout_helper.c b/modules/video_output/opengl/vout_helper.c
index 87e53a3a0f..ed99996155 100644
--- a/modules/video_output/opengl/vout_helper.c
+++ b/modules/video_output/opengl/vout_helper.c
@@ -627,7 +627,7 @@ opengl_init_program(vout_display_opengl_t *vgl, struct prgm *prgm,
             .log_level = PL_LOG_INFO,
         });
         if (tc->pl_ctx)
-            tc->pl_sh = pl_shader_alloc(tc->pl_ctx, NULL, 0);
+            tc->pl_sh = pl_shader_alloc(tc->pl_ctx, NULL, 0, 0);
     }
 #endif