[vlc-commits] opengl: reference interop from sampler

[Romain Vimont]

vlc | branch: master | Romain Vimont <rom1v at videolabs.io> | Mon Feb  3 15:48:04 2020 +0100| [e99adea965251ff9705aed0b1969c7994cd7ba19] | committer: Alexandre Janniaux

opengl: reference interop from sampler

This allows to use an interop instance without a renderer.

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

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

 modules/video_output/opengl/renderer.c | 2 ++
 modules/video_output/opengl/sampler.h  | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/modules/video_output/opengl/renderer.c b/modules/video_output/opengl/renderer.c
index 59f1a67cd7..df8d4fec29 100644
--- a/modules/video_output/opengl/renderer.c
+++ b/modules/video_output/opengl/renderer.c
@@ -446,6 +446,8 @@ vlc_gl_renderer_New(vlc_gl_t *gl, const struct vlc_gl_api *api,
     sampler->pl_sh = NULL;
     sampler->pl_sh_res = NULL;
 
+    sampler->interop = interop;
+
     struct vlc_gl_renderer *renderer = calloc(1, sizeof(*renderer));
     if (!renderer)
     {
diff --git a/modules/video_output/opengl/sampler.h b/modules/video_output/opengl/sampler.h
index e4286a2011..88cf7b4b2f 100644
--- a/modules/video_output/opengl/sampler.h
+++ b/modules/video_output/opengl/sampler.h
@@ -85,6 +85,8 @@ struct vlc_gl_sampler {
         unsigned int i_visible_width;
         unsigned int i_visible_height;
     } last_source;
+
+    struct vlc_gl_interop *interop;
 };
 
 #endif