vo_gl: minor cleanups

Fix spelling.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@34006 b3059339-0415-0410-9bf9-f77b7e298cf2

Fix disabled code.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@34007 b3059339-0415-0410-9bf9-f77b7e298cf2

Remove pointless pointer indirection for shader program strings.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@34016 b3059339-0415-0410-9bf9-f77b7e298cf2

Remove usage of glColor3f, there is not really a point in it.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@34149 b3059339-0415-0410-9bf9-f77b7e298cf2

3 files changed, 20 insertions, 22 deletions

diff --git a/libvo/gl_common.c b/libvo/gl_common.c
index 0d75b026e8..6bb543e56b 100644
--- a/libvo/gl_common.c
+++ b/libvo/gl_common.c
@@ -218,8 +218,8 @@ int glFindFormat(uint32_t fmt, int have_texture_rg, int *bpp, GLint *gl_texfmt,
     // we do not support palettized formats, although the format the
     // swscale produces works
     case IMGFMT_RGB8:
-        gl_format = GL_RGB;
-        gl_type = GL_UNSIGNED_BYTE_2_3_3_REV;
+        *gl_format = GL_RGB;
+        *gl_type = GL_UNSIGNED_BYTE_2_3_3_REV;
         break;
 #endif
     case IMGFMT_RGB15:
@@ -232,12 +232,12 @@ int glFindFormat(uint32_t fmt, int have_texture_rg, int *bpp, GLint *gl_texfmt,
         break;
 #if 0
     case IMGFMT_BGR8:
-        // special case as red and blue have a differen number of bits.
+        // special case as red and blue have a different number of bits.
         // GL_BGR and GL_UNSIGNED_BYTE_3_3_2 isn't supported at least
         // by nVidia drivers, and in addition would give more bits to
         // blue than to red, which isn't wanted
-        gl_format = GL_RGB;
-        gl_type = GL_UNSIGNED_BYTE_3_3_2;
+        *gl_format = GL_RGB;
+        *gl_type = GL_UNSIGNED_BYTE_3_3_2;
         break;
 #endif
     case IMGFMT_BGR15:
@@ -329,7 +329,6 @@ static const extfunc_desc_t extfuncs[] = {
     DEF_FUNC_DESC(TexEnvf),
     DEF_FUNC_DESC(TexEnvi),
     DEF_FUNC_DESC(Color4ub),
-    DEF_FUNC_DESC(Color3f),
     DEF_FUNC_DESC(Color4f),
     DEF_FUNC_DESC(ClearColor),
     DEF_FUNC_DESC(ClearDepth),
@@ -895,7 +894,7 @@ static void gen_noise_lookup_tex(GL *gl, GLenum unit) {
     "TEX textemp, " coord ", " texture ", $tex_type;\n" \
     "MOV " dest ", textemp.r;\n"
 
-static const char *bilin_filt_template =
+static const char bilin_filt_template[] =
     SAMPLE("yuv.$out_comp","fragment.texcoord[$in_tex]","texture[$in_tex]");
 
 #define BICUB_FILT_MAIN \
@@ -912,7 +911,7 @@ static const char *bilin_filt_template =
     /* x-interpolation */ \
     "LRP yuv.$out_comp, parmx.b, a.bbbb, a.aaaa;\n"
 
-static const char *bicub_filt_template_2D =
+static const char bicub_filt_template_2D[] =
     "MAD coord.xy, fragment.texcoord[$in_tex], {$texw, $texh}, {0.5, 0.5};\n"
     "TEX parmx, coord.x, texture[$texs], 1D;\n"
     "MUL cdelta.xz, parmx.rrgg, {-$ptw, 0, $ptw, 0};\n"
@@ -920,7 +919,7 @@ static const char *bicub_filt_template_2D =
     "MUL cdelta.yw, parmy.rrgg, {0, -$pth, 0, $pth};\n"
     BICUB_FILT_MAIN;
 
-static const char *bicub_filt_template_RECT =
+static const char bicub_filt_template_RECT[] =
     "ADD coord, fragment.texcoord[$in_tex], {0.5, 0.5};\n"
     "TEX parmx, coord.x, texture[$texs], 1D;\n"
     "MUL cdelta.xz, parmx.rrgg, {-1, 0, 1, 0};\n"
@@ -938,7 +937,7 @@ static const char *bicub_filt_template_RECT =
     "ADD "t ".x, "t ".xxxx, "s ";\n" \
     "SUB "t ".y, "t ".yyyy, "s ";\n"
 
-static const char *bicub_notex_filt_template_2D =
+static const char bicub_notex_filt_template_2D[] =
     "MAD coord.xy, fragment.texcoord[$in_tex], {$texw, $texh}, {0.5, 0.5};\n"
     "FRC coord.xy, coord.xyxy;\n"
     CALCWEIGHTS("parmx", "coord.xxxx")
@@ -947,7 +946,7 @@ static const char *bicub_notex_filt_template_2D =
     "MUL cdelta.yw, parmy.rrgg, {0, -$pth, 0, $pth};\n"
     BICUB_FILT_MAIN;
 
-static const char *bicub_notex_filt_template_RECT =
+static const char bicub_notex_filt_template_RECT[] =
     "ADD coord, fragment.texcoord[$in_tex], {0.5, 0.5};\n"
     "FRC coord.xy, coord.xyxy;\n"
     CALCWEIGHTS("parmx", "coord.xxxx")
@@ -964,19 +963,19 @@ static const char *bicub_notex_filt_template_RECT =
     /* x-interpolation */ \
     "LRP yuv.$out_comp, parmx.b, a.rrrr, b.rrrr;\n"
 
-static const char *bicub_x_filt_template_2D =
+static const char bicub_x_filt_template_2D[] =
     "MAD coord.x, fragment.texcoord[$in_tex], {$texw}, {0.5};\n"
     "TEX parmx, coord, texture[$texs], 1D;\n"
     "MUL cdelta.xyz, parmx.rrgg, {-$ptw, 0, $ptw};\n"
     BICUB_X_FILT_MAIN;
 
-static const char *bicub_x_filt_template_RECT =
+static const char bicub_x_filt_template_RECT[] =
     "ADD coord.x, fragment.texcoord[$in_tex], {0.5};\n"
     "TEX parmx, coord, texture[$texs], 1D;\n"
     "MUL cdelta.xyz, parmx.rrgg, {-1, 0, 1};\n"
     BICUB_X_FILT_MAIN;
 
-static const char *unsharp_filt_template =
+static const char unsharp_filt_template[] =
     "PARAM dcoord$out_comp = {$ptw_05, $pth_05, $ptw_05, -$pth_05};\n"
     "ADD coord, fragment.texcoord[$in_tex].xyxy, dcoord$out_comp;\n"
     "SUB coord2, fragment.texcoord[$in_tex].xyxy, dcoord$out_comp;\n"
@@ -991,7 +990,7 @@ static const char *unsharp_filt_template =
     "MAD textemp.r, b.r, {$strength}, a.r;\n"
     "MOV yuv.$out_comp, textemp.r;\n";
 
-static const char *unsharp_filt_template2 =
+static const char unsharp_filt_template2[] =
     "PARAM dcoord$out_comp = {$ptw_12, $pth_12, $ptw_12, -$pth_12};\n"
     "PARAM dcoord2$out_comp = {$ptw_15, 0, 0, $pth_15};\n"
     "ADD coord, fragment.texcoord[$in_tex].xyxy, dcoord$out_comp;\n"
@@ -1016,7 +1015,7 @@ static const char *unsharp_filt_template2 =
     "MAD textemp.r, b.r, {$strength}, a.r;\n"
     "MOV yuv.$out_comp, textemp.r;\n";
 
-static const char *yuv_prog_template =
+static const char yuv_prog_template[] =
     "PARAM ycoef = {$cm11, $cm21, $cm31};\n"
     "PARAM ucoef = {$cm12, $cm22, $cm32};\n"
     "PARAM vcoef = {$cm13, $cm23, $cm33};\n"
@@ -1026,7 +1025,7 @@ static const char *yuv_prog_template =
     "MAD res.rgb, yuv.gggg, ucoef, res;\n"
     "MAD res.rgb, yuv.bbbb, vcoef, res;\n";
 
-static const char *yuv_pow_prog_template =
+static const char yuv_pow_prog_template[] =
     "PARAM ycoef = {$cm11, $cm21, $cm31};\n"
     "PARAM ucoef = {$cm12, $cm22, $cm32};\n"
     "PARAM vcoef = {$cm13, $cm23, $cm33};\n"
@@ -1040,7 +1039,7 @@ static const char *yuv_pow_prog_template =
     "POW res.g, res.g, gamma.g;\n"
     "POW res.b, res.b, gamma.b;\n";
 
-static const char *yuv_lookup_prog_template =
+static const char yuv_lookup_prog_template[] =
     "PARAM ycoef = {$cm11, $cm21, $cm31, 0};\n"
     "PARAM ucoef = {$cm12, $cm22, $cm32, 0};\n"
     "PARAM vcoef = {$cm13, $cm23, $cm33, 0};\n"
@@ -1055,11 +1054,11 @@ static const char *yuv_lookup_prog_template =
     "ADD res.a, res.a, 0.25;\n"
     "TEX res.b, res.baaa, texture[$conv_tex0], 2D;\n";
 
-static const char *yuv_lookup3d_prog_template =
+static const char yuv_lookup3d_prog_template[] =
     "TEMP res;\n"
     "TEX res, yuv, texture[$conv_tex0], 3D;\n";
 
-static const char *noise_filt_template =
+static const char noise_filt_template[] =
     "MUL coord.xy, fragment.texcoord[0], {$noise_sx, $noise_sy};\n"
     "TEMP rand;\n"
     "TEX rand.r, coord.x, texture[$noise_filt_tex], 1D;\n"
diff --git a/libvo/gl_common.h b/libvo/gl_common.h
index 0dae0d0c29..8563edac7e 100644
--- a/libvo/gl_common.h
+++ b/libvo/gl_common.h
@@ -427,7 +427,6 @@ struct GL {
     void (GLAPIENTRY *TexEnvf)(GLenum, GLenum, GLfloat);
     void (GLAPIENTRY *TexEnvi)(GLenum, GLenum, GLint);
     void (GLAPIENTRY *Color4ub)(GLubyte, GLubyte, GLubyte, GLubyte);
-    void (GLAPIENTRY *Color3f)(GLfloat, GLfloat, GLfloat);
     void (GLAPIENTRY *Color4f)(GLfloat, GLfloat, GLfloat, GLfloat);
     void (GLAPIENTRY *ClearColor)(GLclampf, GLclampf, GLclampf, GLclampf);
     void (GLAPIENTRY *ClearDepth)(GLclampd);
diff --git a/libvo/vo_gl.c b/libvo/vo_gl.c
index 8f13738e32..99a953fcf7 100644
--- a/libvo/vo_gl.c
+++ b/libvo/vo_gl.c
@@ -813,7 +813,7 @@ static void do_render(struct vo *vo)
 //  Enable(GL_TEXTURE_2D);
 //  BindTexture(GL_TEXTURE_2D, texture_id);
 
-    gl->Color3f(1, 1, 1);
+    gl->Color4f(1, 1, 1, 1);
     if (p->is_yuv || p->custom_prog)
         glEnableYUVConversion(gl, p->target, p->yuvconvtype);
     if (p->stereo_mode) {