[vlc-devel] [PATCH 14/16] opengl: move down vlc_gl_renderer_Prepare()

Romain Vimont rom1v at videolabs.io
Tue Mar 17 17:26:47 CET 2020


It will be modified to depend on static functions. Move it below them.

This will make the diff more readable.
---
 modules/video_output/opengl/renderer.c | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/modules/video_output/opengl/renderer.c b/modules/video_output/opengl/renderer.c
index 9f06c370b0..88e0e3e3f8 100644
--- a/modules/video_output/opengl/renderer.c
+++ b/modules/video_output/opengl/renderer.c
@@ -570,17 +570,6 @@ vlc_gl_renderer_SetWindowAspectRatio(struct vlc_gl_renderer *renderer,
     getViewpointMatrixes(renderer, renderer->fmt.projection_mode);
 }
 
-int
-vlc_gl_renderer_Prepare(struct vlc_gl_renderer *renderer, picture_t *picture)
-{
-    const struct vlc_gl_interop *interop = renderer->interop;
-    /* Update the texture */
-    return interop->ops->update_textures(interop, renderer->textures,
-                                         renderer->tex_width,
-                                         renderer->tex_height, picture,
-                                         NULL);
-}
-
 static int BuildSphere(GLfloat **vertexCoord, GLfloat **textureCoord, unsigned *nbVertices,
                        GLushort **indices, unsigned *nbIndices)
 {
@@ -920,6 +909,17 @@ static void DrawWithShaders(struct vlc_gl_renderer *renderer)
     vt->DrawElements(GL_TRIANGLES, renderer->nb_indices, GL_UNSIGNED_SHORT, 0);
 }
 
+int
+vlc_gl_renderer_Prepare(struct vlc_gl_renderer *renderer, picture_t *picture)
+{
+    const struct vlc_gl_interop *interop = renderer->interop;
+    /* Update the texture */
+    return interop->ops->update_textures(interop, renderer->textures,
+                                         renderer->tex_width,
+                                         renderer->tex_height, picture,
+                                         NULL);
+}
+
 int
 vlc_gl_renderer_Draw(struct vlc_gl_renderer *renderer,
                      const video_format_t *source)
-- 
2.25.1



More information about the vlc-devel mailing list