Fix color equations in the standard shaders

The generated shader code assigned a scalar to a vec3 if lighting was
enabled without texture or material.  An unnecessary multiplication in
the alpha equation with texture but no material was removed.

Also fix texturing in the shader demo (Mesa does funny things with
uniforms).

diff --git a/demos/shaders.cpp b/demos/shaders.cpp
index 27538e4eb2e6a2c35e1bf5aa9e7fa4465a5b8bd8..1b9c64724f78bd394ab9051458bfcfe496136d63 100644 (file)
--- a/demos/shaders.cpp
+++ b/demos/shaders.cpp
@@ -83,6 +83,7 @@ int main()
        }
 
        GL::ProgramData progdata;
+       progdata.uniform("texture", 0);
        progdata.uniform("normalmap", 1);
 
        GL::Lighting lighting;

diff --git a/source/program.cpp b/source/program.cpp
index f11206677b94890ebe7d89dfdeefbc5af425e7f4..729018a1a4b1edc69438d426c32426e82b19b09b 100644 (file)
--- a/source/program.cpp
+++ b/source/program.cpp
@@ -79,9 +79,10 @@ const char *standard_fragment_src[] =
        "e",   "\tvec4 reflection = textureCube(environment, n_normal*(dot(n_normal, v_eye_dir)*2.0)-v_eye_dir);\n",
        "t",   "\tvec4 tex_sample = texture2D(texture, v_texcoord);\n",
         0,    "\tgl_FragColor.rgb = ",
-       "!t!l!m", "vec3(1.0)",
+       "!t!m",  "vec3(1.0)",
        "t",     "tex_sample.rgb",
        "l|mt",  "*",
+       "l!m!t",  "*",
        "!lm",   "v_color.rgb",
        "l",     "((l_diffuse",
        "lm",    "*gl_FrontLightProduct[0].diffuse.rgb",
@@ -94,10 +95,11 @@ const char *standard_fragment_src[] =
        "e",     "+reflection.rgb*reflectivity",
         0,      ";\n",
         0,    "\tgl_FragColor.a = ",
-       "!m",    "1.0",
+       "!t!m",  "1.0",
+       "t",     "tex_sample.a",
+       "tm",    "*",
        "!lm",   "v_color.a",
        "lm",    "gl_FrontMaterial.diffuse.a",
-       "t",     "*tex_sample.a",
         0,      ";\n",
         0,    "}\n",
        0, 0