[vlc-commits] vout_opengl: update for libplacebo 0.6 API

[Niklas Haas]

vlc/vlc-3.0 | branch: master | Niklas Haas <git at haasn.xyz> | Fri Sep 28 19:18:44 2018 +0200| [cbc1a02c032945b8b86f08c6cf203ebcd1e8667e] | committer: Thomas Guillem

vout_opengl: update for libplacebo 0.6 API

This removed a superfluous field from the pl_shader_alloc signature.

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

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

 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 4ff70adce9..919560e603 100644
--- a/modules/video_output/opengl/vout_helper.c
+++ b/modules/video_output/opengl/vout_helper.c
@@ -627,8 +627,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