[vlc-commits] opengl: rename "texture" to "textures"

[Romain Vimont]

vlc | branch: master | Romain Vimont <rom1v at videolabs.io> | Fri Jan 24 11:24:30 2020 +0100| [f5a0f3e1ceca3c2e170b76fc07bbb636d8f613a5] | committer: Jean-Baptiste Kempf

opengl: rename "texture" to "textures"

The field is an array of textures.

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

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

 modules/video_output/opengl/renderer.h    |  2 +-
 modules/video_output/opengl/vout_helper.c | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/modules/video_output/opengl/renderer.h b/modules/video_output/opengl/renderer.h
index 930360c437..80de46c031 100644
--- a/modules/video_output/opengl/renderer.h
+++ b/modules/video_output/opengl/renderer.h
@@ -96,7 +96,7 @@ struct vlc_gl_renderer
     GLsizei tex_width[PICTURE_PLANE_MAX];
     GLsizei tex_height[PICTURE_PLANE_MAX];
 
-    GLuint texture[PICTURE_PLANE_MAX];
+    GLuint textures[PICTURE_PLANE_MAX];
 
     unsigned nb_indices;
     GLuint vertex_buffer_object;
diff --git a/modules/video_output/opengl/vout_helper.c b/modules/video_output/opengl/vout_helper.c
index 1992e8196f..60917b4072 100644
--- a/modules/video_output/opengl/vout_helper.c
+++ b/modules/video_output/opengl/vout_helper.c
@@ -662,7 +662,7 @@ vout_display_opengl_t *vout_display_opengl_New(video_format_t *fmt,
     {
         ret = vlc_gl_interop_GenerateTextures(interop, renderer->tex_width,
                                               renderer->tex_height,
-                                              renderer->texture);
+                                              renderer->textures);
         if (ret != VLC_SUCCESS)
         {
             vout_display_opengl_Delete(vgl);
@@ -720,7 +720,7 @@ void vout_display_opengl_Delete(vout_display_opengl_t *vgl)
     vgl->vt.DeleteBuffers(main_tex_count, renderer->texture_buffer_object);
 
     if (main_del_texs)
-        vgl->vt.DeleteTextures(main_tex_count, renderer->texture);
+        vgl->vt.DeleteTextures(main_tex_count, renderer->textures);
 
     GL_ASSERT_NOERROR();
 
@@ -813,7 +813,7 @@ int vout_display_opengl_Prepare(vout_display_opengl_t *vgl,
     const struct vlc_gl_interop *interop = renderer->interop;
 
     /* Update the texture */
-    int ret = interop->ops->update_textures(interop, renderer->texture,
+    int ret = interop->ops->update_textures(interop, renderer->textures,
                                             renderer->tex_width,
                                             renderer->tex_height, picture,
                                             NULL);
@@ -1167,9 +1167,9 @@ static void DrawWithShaders(vout_display_opengl_t *vgl)
                                 renderer->tex_height, 1.0f);
 
     for (unsigned j = 0; j < interop->tex_count; j++) {
-        assert(renderer->texture[j] != 0);
+        assert(renderer->textures[j] != 0);
         vgl->vt.ActiveTexture(GL_TEXTURE0+j);
-        vgl->vt.BindTexture(interop->tex_target, renderer->texture[j]);
+        vgl->vt.BindTexture(interop->tex_target, renderer->textures[j]);
 
         vgl->vt.BindBuffer(GL_ARRAY_BUFFER, renderer->texture_buffer_object[j]);