]> git.tdb.fi Git - libs/gl.git/commit
Fix color equations in the standard shaders
authorMikko Rasa <tdb@tdb.fi>
Tue, 28 Aug 2012 08:30:30 +0000 (11:30 +0300)
committerMikko Rasa <tdb@tdb.fi>
Tue, 28 Aug 2012 08:30:30 +0000 (11:30 +0300)
commit01d2500733766710f4a11f49216a5b3dcc75a4a3
treebcf296ed654d3586541337b0dfa85b53e45c745a
parenta6c45f5cc50ea2ee2aecf8d4f3b69934e69c8f3f
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).
demos/shaders.cpp
source/program.cpp