[vlc-commits] opengl: pass vlc_video_context

[Thomas Guillem]

vlc | branch: master | Thomas Guillem <thomas at gllm.fr> | Sun Feb 24 15:11:50 2019 +0100| [8f25505eb12876334cc1423fae7cbb049c2649ad] | committer: Thomas Guillem

opengl: pass vlc_video_context

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

 modules/video_output/caopengllayer.m      | 2 +-
 modules/video_output/ios.m                | 3 ++-
 modules/video_output/macosx.m             | 3 +--
 modules/video_output/opengl/display.c     | 3 +--
 modules/video_output/opengl/vout_helper.c | 3 ++-
 modules/video_output/opengl/vout_helper.h | 3 ++-
 modules/video_output/win32/glwin32.c      | 2 +-
 7 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/modules/video_output/caopengllayer.m b/modules/video_output/caopengllayer.m
index 37ac46ef33..571af8370f 100644
--- a/modules/video_output/caopengllayer.m
+++ b/modules/video_output/caopengllayer.m
@@ -186,7 +186,7 @@ static int Open (vout_display_t *vd, const vout_display_cfg_t *cfg,
         const vlc_fourcc_t *subpicture_chromas;
         if (!OpenglLock(sys->gl)) {
             sys->vgl = vout_display_opengl_New(fmt, &subpicture_chromas,
-                                               sys->gl, &cfg->viewpoint);
+                                               sys->gl, &cfg->viewpoint, context);
             OpenglUnlock(sys->gl);
         } else
             sys->vgl = NULL;
diff --git a/modules/video_output/ios.m b/modules/video_output/ios.m
index 1a04cfabb0..06f319c5f1 100644
--- a/modules/video_output/ios.m
+++ b/modules/video_output/ios.m
@@ -200,7 +200,8 @@ static int Open(vout_display_t *vd, const vout_display_cfg_t *cfg,
             goto bailout;
 
         vout_display_opengl_t *vgl = vout_display_opengl_New(fmt, &subpicture_chromas,
-                                                             sys->gl, &cfg->viewpoint);
+                                                             sys->gl, &cfg->viewpoint,
+                                                             context);
         vlc_gl_ReleaseCurrent(sys->gl);
         if (!vgl)
             goto bailout;
diff --git a/modules/video_output/macosx.m b/modules/video_output/macosx.m
index 528aff44d7..ccdd969c16 100644
--- a/modules/video_output/macosx.m
+++ b/modules/video_output/macosx.m
@@ -230,7 +230,7 @@ static int Open (vout_display_t *vd, const vout_display_cfg_t *cfg,
             goto error;
         }
         sys->vgl = vout_display_opengl_New (fmt, &subpicture_chromas, sys->gl,
-                                            &cfg->viewpoint);
+                                            &cfg->viewpoint, context);
         vlc_gl_ReleaseCurrent(sys->gl);
         if (!sys->vgl) {
             msg_Err(vd, "Error while initializing opengl display.");
@@ -248,7 +248,6 @@ static int Open (vout_display_t *vd, const vout_display_cfg_t *cfg,
         /* */
         vout_window_ReportSize(sys->embed, fmt->i_visible_width, fmt->i_visible_height);
 
-        (void) context;
         return VLC_SUCCESS;
 
     error:
diff --git a/modules/video_output/opengl/display.c b/modules/video_output/opengl/display.c
index cb4b9a4468..fabd43df94 100644
--- a/modules/video_output/opengl/display.c
+++ b/modules/video_output/opengl/display.c
@@ -137,7 +137,7 @@ static int Open(vout_display_t *vd, const vout_display_cfg_t *cfg,
         goto error;
 
     sys->vgl = vout_display_opengl_New (fmt, &spu_chromas, sys->gl,
-                                        &cfg->viewpoint);
+                                        &cfg->viewpoint, context);
     vlc_gl_ReleaseCurrent (sys->gl);
 
     if (sys->vgl == NULL)
@@ -156,7 +156,6 @@ error:
         vlc_gl_Release (sys->gl);
     free (sys);
     return VLC_EGENERIC;
-    (void) context;
 }
 
 /**
diff --git a/modules/video_output/opengl/vout_helper.c b/modules/video_output/opengl/vout_helper.c
index adcc019d45..21e9a57cfe 100644
--- a/modules/video_output/opengl/vout_helper.c
+++ b/modules/video_output/opengl/vout_helper.c
@@ -717,7 +717,8 @@ ResizeFormatToGLMaxTexSize(video_format_t *fmt, unsigned int max_tex_size)
 vout_display_opengl_t *vout_display_opengl_New(video_format_t *fmt,
                                                const vlc_fourcc_t **subpicture_chromas,
                                                vlc_gl_t *gl,
-                                               const vlc_viewpoint_t *viewpoint)
+                                               const vlc_viewpoint_t *viewpoint,
+                                               vlc_video_context *context)
 {
     vout_display_opengl_t *vgl = calloc(1, sizeof(*vgl));
     if (!vgl)
diff --git a/modules/video_output/opengl/vout_helper.h b/modules/video_output/opengl/vout_helper.h
index 8b413de7e0..a13f66c1cc 100644
--- a/modules/video_output/opengl/vout_helper.h
+++ b/modules/video_output/opengl/vout_helper.h
@@ -74,7 +74,8 @@ typedef struct vout_display_opengl_t vout_display_opengl_t;
 vout_display_opengl_t *vout_display_opengl_New(video_format_t *fmt,
                                                const vlc_fourcc_t **subpicture_chromas,
                                                vlc_gl_t *gl,
-                                               const vlc_viewpoint_t *viewpoint);
+                                               const vlc_viewpoint_t *viewpoint,
+                                               vlc_video_context *context);
 void vout_display_opengl_Delete(vout_display_opengl_t *vgl);
 
 picture_pool_t *vout_display_opengl_GetPool(vout_display_opengl_t *vgl, unsigned);
diff --git a/modules/video_output/win32/glwin32.c b/modules/video_output/win32/glwin32.c
index c7db2cd759..e654455633 100644
--- a/modules/video_output/win32/glwin32.c
+++ b/modules/video_output/win32/glwin32.c
@@ -147,7 +147,7 @@ static int Open(vout_display_t *vd, const vout_display_cfg_t *cfg,
     if (vlc_gl_MakeCurrent (sys->gl))
         goto error;
     sys->vgl = vout_display_opengl_New(&fmt, &subpicture_chromas, sys->gl,
-                                       &cfg->viewpoint);
+                                       &cfg->viewpoint, context);
     vlc_gl_ReleaseCurrent (sys->gl);
     if (!sys->vgl)
         goto error;