[vlc-commits] opengl: remove textures argument from get_pool

[Thomas Guillem]

vlc | branch: master | Thomas Guillem <thomas at gllm.fr> | Wed Feb 15 10:28:55 2017 +0100| [5baae92d530a301196bb20cb4979462db7c61429] | committer: Thomas Guillem

opengl: remove textures argument from get_pool

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

 modules/video_output/opengl/converter_android.c | 2 +-
 modules/video_output/opengl/converter_cvpx.c    | 4 ++--
 modules/video_output/opengl/converters.c        | 3 +--
 modules/video_output/opengl/internal.h          | 4 +---
 modules/video_output/opengl/vout_helper.c       | 3 +--
 5 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/modules/video_output/opengl/converter_android.c b/modules/video_output/opengl/converter_android.c
index 4898457..db55cf0 100644
--- a/modules/video_output/opengl/converter_android.c
+++ b/modules/video_output/opengl/converter_android.c
@@ -79,7 +79,7 @@ tc_anop_allocate_textures(const opengl_tex_converter_t *tc, GLuint *textures,
 
 static picture_pool_t *
 tc_anop_get_pool(const opengl_tex_converter_t *tc, const video_format_t *fmt,
-                 unsigned requested_count, GLuint *textures)
+                 unsigned requested_count)
 {
     struct priv *priv = tc->priv;
 #define FORCED_COUNT 31
diff --git a/modules/video_output/opengl/converter_cvpx.c b/modules/video_output/opengl/converter_cvpx.c
index c4ece0a..22e9493 100644
--- a/modules/video_output/opengl/converter_cvpx.c
+++ b/modules/video_output/opengl/converter_cvpx.c
@@ -53,9 +53,9 @@ pic_destroy_cb(picture_t *pic)
 
 static picture_pool_t *
 tc_cvpx_get_pool(const opengl_tex_converter_t *tc, const video_format_t *fmt,
-                 unsigned requested_count, GLuint *textures)
+                 unsigned requested_count)
 {
-    (void) tc; (void) textures;
+    (void) tc;
     picture_t *picture[VLCGL_PICTURE_MAX] = {NULL, };
     unsigned count;
 
diff --git a/modules/video_output/opengl/converters.c b/modules/video_output/opengl/converters.c
index 97df079..51b1cf2 100644
--- a/modules/video_output/opengl/converters.c
+++ b/modules/video_output/opengl/converters.c
@@ -623,12 +623,11 @@ picture_destroy_cb(picture_t *pic)
 
 static picture_pool_t *
 tc_common_get_pool(const opengl_tex_converter_t *tc, const video_format_t *fmt,
-                   unsigned requested_count, GLuint *textures)
+                   unsigned requested_count)
 {
     struct priv *priv = tc->priv;
     picture_t *pictures[VLCGL_PICTURE_MAX];
     unsigned count;
-    (void) textures;
 
     priv->ongpu.list = 0;
 
diff --git a/modules/video_output/opengl/internal.h b/modules/video_output/opengl/internal.h
index f2d5d04..6c711b5 100644
--- a/modules/video_output/opengl/internal.h
+++ b/modules/video_output/opengl/internal.h
@@ -236,13 +236,11 @@ struct opengl_tex_converter_t
      * \param fc OpenGL tex converter
      * \param fmt video format
      * \param requested_count number of pictures to allocate
-     * \param textures textures generated (and allocated by pf_allocate_texture)
      * \return the picture pool or NULL in case of error
      */
     picture_pool_t *(*pf_get_pool)(const opengl_tex_converter_t *fc,
                                    const video_format_t *fmt,
-                                   unsigned requested_count,
-                                   GLuint *textures);
+                                   unsigned requested_count);
 
     /*
      * Callback to update a picture
diff --git a/modules/video_output/opengl/vout_helper.c b/modules/video_output/opengl/vout_helper.c
index c05b672..b94d31a 100644
--- a/modules/video_output/opengl/vout_helper.c
+++ b/modules/video_output/opengl/vout_helper.c
@@ -901,8 +901,7 @@ picture_pool_t *vout_display_opengl_GetPool(vout_display_opengl_t *vgl, unsigned
     /* Allocate with tex converter pool callback if it exists */
     if (tc->pf_get_pool != NULL)
     {
-        vgl->pool = tc->pf_get_pool(tc, &vgl->fmt, requested_count,
-                                    vgl->texture);
+        vgl->pool = tc->pf_get_pool(tc, &vgl->fmt, requested_count);
         if (!vgl->pool)
             goto error;
         return vgl->pool;