[MPlayer-cvslog] r34014 - trunk/libvo/gl_common.c

[Alexander Strasser]

Hi

reimar wrote:
> Author: reimar
> Date: Fri Aug 26 20:51:51 2011
> New Revision: 34014
> 
> Log:
> Add disabled feature: noise filter for vo_gl.
> 
> Modified:
>    trunk/libvo/gl_common.c
> 
> Modified: trunk/libvo/gl_common.c
> ==============================================================================
> --- trunk/libvo/gl_common.c	Fri Aug 26 11:46:42 2011	(r34013)
> +++ trunk/libvo/gl_common.c	Fri Aug 26 20:51:51 2011	(r34014)
[...]
> @@ -1024,8 +1054,7 @@ static const char *yuv_prog_template =
>    "TEMP res;\n"
>    "MAD res.rgb, yuv.rrrr, ycoef, offsets;\n"
>    "MAD res.rgb, yuv.gggg, ucoef, res;\n"
> -  "MAD result.color.rgb, yuv.bbbb, vcoef, res;\n"
> -  "END";
> +  "MAD res.rgb, yuv.bbbb, vcoef, res;\n";
>  
>  static const char *yuv_pow_prog_template =
>    "PARAM ycoef = {%e, %e, %e};\n"
> @@ -1037,10 +1066,9 @@ static const char *yuv_pow_prog_template
>    "MAD res.rgb, yuv.rrrr, ycoef, offsets;\n"
>    "MAD res.rgb, yuv.gggg, ucoef, res;\n"
>    "MAD_SAT res.rgb, yuv.bbbb, vcoef, res;\n"
> -  "POW result.color.r, res.r, gamma.r;\n"
> -  "POW result.color.g, res.g, gamma.g;\n"
> -  "POW result.color.b, res.b, gamma.b;\n"
> -  "END";
> +  "POW res.r, res.r, gamma.r;\n"
> +  "POW res.g, res.g, gamma.g;\n"
> +  "POW res.b, res.b, gamma.b;\n";
>  
>  static const char *yuv_lookup_prog_template =
>    "PARAM ycoef = {%e, %e, %e, 0};\n"
> @@ -1051,16 +1079,23 @@ static const char *yuv_lookup_prog_templ
>    "MAD res, yuv.rrrr, ycoef, offsets;\n"
>    "MAD res.rgb, yuv.gggg, ucoef, res;\n"
>    "MAD res.rgb, yuv.bbbb, vcoef, res;\n"
> -  "TEX result.color.r, res.raaa, texture[%c], 2D;\n"
> +  "TEX res.r, res.raaa, texture[%c], 2D;\n"
>    "ADD res.a, res.a, 0.25;\n"
> -  "TEX result.color.g, res.gaaa, texture[%c], 2D;\n"
> +  "TEX res.g, res.gaaa, texture[%c], 2D;\n"
>    "ADD res.a, res.a, 0.25;\n"
> -  "TEX result.color.b, res.baaa, texture[%c], 2D;\n"
> -  "END";
> +  "TEX res.b, res.baaa, texture[%c], 2D;\n";
>  
>  static const char *yuv_lookup3d_prog_template =
> -  "TEX result.color, yuv, texture[%c], 3D;\n"
> -  "END";
> +  "TEMP res;\n"
> +  "TEX res, yuv, texture[%c], 3D;\n";

  Were these ENDs wrong or optional? Or did I miss the compensation
for the change in the snipped parts of the patch?

  Yet I never wrote fragment programs...

[...]

Sorry for asking dumb questions,
  Alexander