[vlc-commits] OpenGL: fix subpicture rendering

Adrien Maglo git at videolan.org
Sun Aug 21 18:08:17 CEST 2016


vlc | branch: master | Adrien Maglo <magsoft at videolan.org> | Sun Aug 21 08:52:55 2016 +0200| [d92cf74db61e2f93ef5f1b054dad2c8bf5ae2d26] | committer: Jean-Baptiste Kempf

OpenGL: fix subpicture rendering

Define the missing matrices of the vertex shader.

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

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

 modules/video_output/opengl.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/modules/video_output/opengl.c b/modules/video_output/opengl.c
index fb53679..6017fdc 100644
--- a/modules/video_output/opengl.c
+++ b/modules/video_output/opengl.c
@@ -1714,6 +1714,11 @@ int vout_display_opengl_Display(vout_display_opengl_t *vgl,
 
             // Subpictures have the correct orientation:
             vgl->UniformMatrix4fv(vgl->GetUniformLocation(vgl->program[1], "OrientationMatrix"), 1, GL_FALSE, identity);
+            vgl->UniformMatrix4fv(vgl->GetUniformLocation(vgl->program[1], "ProjectionMatrix"), 1, GL_FALSE, identity);
+            vgl->UniformMatrix4fv(vgl->GetUniformLocation(vgl->program[1], "ViewMatrix"), 1, GL_FALSE, identity);
+            vgl->UniformMatrix4fv(vgl->GetUniformLocation(vgl->program[1], "YRotMatrix"), 1, GL_FALSE, identity);
+            vgl->UniformMatrix4fv(vgl->GetUniformLocation(vgl->program[1], "XRotMatrix"), 1, GL_FALSE, identity);
+            vgl->UniformMatrix4fv(vgl->GetUniformLocation(vgl->program[1], "ZoomMatrix"), 1, GL_FALSE, identity);
 #endif
         } else {
 #ifdef SUPPORTS_FIXED_PIPELINE



More information about the vlc-commits mailing list