[vlc-commits] opengl: simplify libplacebo initialization

[Romain Vimont]

vlc | branch: master | Romain Vimont <rom1v at videolabs.io> | Tue May 19 18:20:55 2020 +0200| [2fdbd23f2806cdad15ca03e0b83de46e543f6b6c] | committer: Alexandre Janniaux

opengl: simplify libplacebo initialization

Initialize GLSL version statically, so that it does not depend on
renderer->glsl_version.

This will simplify further refactors.

Signed-off-by: Alexandre Janniaux <ajanni at videolabs.io>

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

 modules/video_output/opengl/renderer.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/modules/video_output/opengl/renderer.c b/modules/video_output/opengl/renderer.c
index 57a8d3ce0e..4008dce381 100644
--- a/modules/video_output/opengl/renderer.c
+++ b/modules/video_output/opengl/renderer.c
@@ -466,9 +466,11 @@ vlc_gl_renderer_New(vlc_gl_t *gl, const struct vlc_gl_api *api,
 #   if PL_API_VER >= 20
         renderer->pl_sh = pl_shader_alloc(renderer->pl_ctx, &(struct pl_shader_params) {
             .glsl = {
-                .version = renderer->glsl_version,
 #       ifdef USE_OPENGL_ES2
+                .version = 100,
                 .gles = true,
+#       else
+                .version = 120,
 #       endif
             },
         });