]> git.sesse.net Git - vlc/commitdiff
opengl: iterate on previous commit
authorFelix Paul Kühne <fkuehne@videolan.org>
Sun, 24 Feb 2013 22:00:54 +0000 (14:00 -0800)
committerFelix Paul Kühne <fkuehne@videolan.org>
Sun, 24 Feb 2013 22:02:44 +0000 (14:02 -0800)
modules/video_output/opengl.c

index 76cfb8f1da6ef13939796ed04a6b312960c8ea22..a6554943c8db2144782862c905fa65a273ccd53c 100644 (file)
@@ -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]);