[vlc-commits] opengl: iterate on previous commit

Felix Paul Kühne git at videolan.org
Sun Feb 24 23:03:16 CET 2013


vlc | branch: master | Felix Paul Kühne <fkuehne at videolan.org> | Sun Feb 24 14:00:54 2013 -0800| [17869161ba93da07a7390e8d0f0093dc573fffae] | committer: Felix Paul Kühne

opengl: iterate on previous commit

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

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

diff --git a/modules/video_output/opengl.c b/modules/video_output/opengl.c
index 76cfb8f..a655494 100644
--- a/modules/video_output/opengl.c
+++ b/modules/video_output/opengl.c
@@ -284,6 +284,7 @@ static void BuildYUVFragmentShader(vout_display_opengl_t *vgl,
     free(code);
 }
 
+#if 0
 static void BuildRGBFragmentShader(vout_display_opengl_t *vgl,
                                    GLint *shader)
 {
@@ -301,6 +302,7 @@ static void BuildRGBFragmentShader(vout_display_opengl_t *vgl,
     vgl->ShaderSource(*shader, 1, &code, NULL);
     vgl->CompileShader(*shader);
 }
+#endif
 
 static void BuildRGBAFragmentShader(vout_display_opengl_t *vgl,
                                    GLint *shader)
@@ -465,11 +467,9 @@ vout_display_opengl_t *vout_display_opengl_New(video_format_t *fmt,
     vgl->shader[1] =
     vgl->shader[2] = -1;
     vgl->local_count = 0;
-    if (supports_shaders && vlc_fourcc_IsYUV(fmt->i_chroma)) {
-        BuildYUVFragmentShader(vgl, &vgl->shader[0],
-                                   &vgl->local_count,
-                                   vgl->local_value,
-                                   fmt, yuv_range_correction);
+    if (supports_shaders && need_fs_yuv) {
+        BuildYUVFragmentShader(vgl, &vgl->shader[0], &vgl->local_count,
+                               vgl->local_value, fmt, yuv_range_correction);
         BuildRGBAFragmentShader(vgl, &vgl->shader[1]);
         BuildVertexShader(vgl, &vgl->shader[2]);
 



More information about the vlc-commits mailing list