1
0
forked from 0ad/0ad

Explicitly clamp gl_FrontColor, for llvmpipe compatibility

This was SVN commit r9075.
This commit is contained in:
Ykkrosh 2011-03-18 16:55:51 +00:00
parent 5b91e2d7ab
commit d49994a0b4
4 changed files with 4 additions and 4 deletions

View File

@ -8,7 +8,7 @@ void main()
vec3 normal = InstancingNormal(gl_Normal);
vec4 worldPos = InstancingPosition(gl_Vertex);
gl_FrontColor = vec4(lighting(normal),1.0) * gl_Color;
gl_FrontColor = clamp(vec4(lighting(normal), 1.0) * gl_Color, 0.0, 1.0);
gl_TexCoord[0] = gl_MultiTexCoord0;
gl_Position = gl_ModelViewProjectionMatrix * worldPos;
}

View File

@ -10,7 +10,7 @@ void main()
vec3 normal = InstancingNormal(gl_Normal);
vec4 worldPos = InstancingPosition(gl_Vertex);
gl_FrontColor = vec4(lighting(normal),1.0) * gl_Color;
gl_FrontColor = clamp(vec4(lighting(normal), 1.0) * gl_Color, 0.0, 1.0);
gl_TexCoord[0] = gl_MultiTexCoord0;
gl_TexCoord[1] = postouv1(worldPos);
gl_Position = gl_ModelViewProjectionMatrix * worldPos;

View File

@ -2,7 +2,7 @@ vec3 lighting(vec3 normal);
void main()
{
gl_FrontColor = vec4(lighting(gl_Normal),1.0) * gl_Color;
gl_FrontColor = clamp(vec4(lighting(gl_Normal), 1.0) * gl_Color, 0.0, 1.0);
gl_TexCoord[0] = gl_MultiTexCoord0;
gl_Position = ftransform();
}

View File

@ -3,7 +3,7 @@ vec4 postouv1(vec4 pos);
void main()
{
gl_FrontColor = vec4(lighting(gl_Normal),1.0) * gl_Color;
gl_FrontColor = clamp(vec4(lighting(gl_Normal), 1.0) * gl_Color, 0.0, 1.0);
gl_TexCoord[0] = gl_MultiTexCoord0;
gl_TexCoord[1] = postouv1(gl_Vertex);
gl_Position = ftransform();