[vlc-commits] Simplified and fixed RGB fragment shader (opengl).

Laurent Aimar git at videolan.org
Thu Dec 20 22:49:55 CET 2012


vlc | branch: master | Laurent Aimar <fenrir at videolan.org> | Thu Dec 20 21:22:54 2012 +0100| [af01175143d276456e9dde12ee5db9363b7eb202] | committer: Laurent Aimar

Simplified and fixed RGB fragment shader (opengl).

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

 modules/video_output/opengl.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/modules/video_output/opengl.c b/modules/video_output/opengl.c
index 0c9eb69..6e67bb5 100644
--- a/modules/video_output/opengl.c
+++ b/modules/video_output/opengl.c
@@ -302,11 +302,10 @@ static void BuildRGBFragmentShader(vout_display_opengl_t *vgl,
     const char *code =
         "#version 120\n"
         "uniform sampler2D Texture[3];"
-        "uniform vec4 FillColor;"
         "varying vec4 TexCoord0,TexCoord1,TexCoord2;"
         "void main()"
         "{ "
-        "  gl_FragColor = texture2D(Texture[0], TexCoord0.st)*FillColor;"
+        "  gl_FragColor = texture2D(Texture[0], TexCoord0.st);"
         "}";
     *shader = vgl->CreateShader(GL_FRAGMENT_SHADER);
     vgl->ShaderSource(*shader, 1, &code, NULL);



More information about the vlc-commits mailing list