fly/fgdata
1
0
Fork 0
Code Activity

Fix warning on some GPUs.

Browse source
This commit is contained in:
Stuart Buchanan 2013-05-10 20:20:08 +01:00
parent 5689d76dca
commit 613db9668f
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Shaders/deferred-tree.vert
View file

@ -13,7 +13,7 @@ void main() {
float numVarieties = gl_Normal.z; float numVarieties = gl_Normal.z;
float texFract = floor(fract(gl_MultiTexCoord0.x) * numVarieties) / (numVarieties * 4.0); float texFract = floor(fract(gl_MultiTexCoord0.x) * numVarieties) / (numVarieties * 4.0);
texFract += floor(gl_MultiTexCoord0.x) / (numVarieties * 4.0); texFract += floor(gl_MultiTexCoord0.x) / (numVarieties * 4.0);
gl_TexCoord[0] = vec4(texFract + 0.5 * season, gl_MultiTexCoord0.y, 0.0, 0.0); gl_TexCoord[0] = vec4(texFract + 0.5 * float(season), gl_MultiTexCoord0.y, 0.0, 0.0);
// Position and scaling // Position and scaling
vec3 position = gl_Vertex.xyz * gl_Normal.xxy; vec3 position = gl_Vertex.xyz * gl_Normal.xxy;

4
Shaders/tree-haze.vert
View file

@ -38,7 +38,7 @@ uniform float overcast;
//uniform float scattering; //uniform float scattering;
uniform float ground_scattering; uniform float ground_scattering;
uniform float snow_level; uniform float snow_level;
uniform int season; uniform int season;
float earthShade; float earthShade;
float mie_angle; float mie_angle;
@ -85,7 +85,7 @@ void main()
float cr = cos(gl_FogCoord + gl_Color.x); float cr = cos(gl_FogCoord + gl_Color.x);
// Shift texture to account for snow level and seasons // Shift texture to account for snow level and seasons
gl_TexCoord[0] = vec4(texFract + 0.25 * int(gl_Color.z > snow_level) + 0.5 * season, gl_MultiTexCoord0.y, 0.0, 0.0); gl_TexCoord[0] = vec4(texFract + 0.25 * float(gl_Color.z > snow_level) + 0.5 * float(season), gl_MultiTexCoord0.y, 0.0, 0.0);
// scaling // scaling
vec3 position = gl_Vertex.xyz * gl_Normal.xxy; vec3 position = gl_Vertex.xyz * gl_Normal.xxy;

2
Shaders/tree.vert
View file

@ -25,7 +25,7 @@ void main(void)
// so that trees aren't all oriented N/S // so that trees aren't all oriented N/S
float sr = sin(gl_FogCoord + gl_Color.x); float sr = sin(gl_FogCoord + gl_Color.x);
float cr = cos(gl_FogCoord + gl_Color.x); float cr = cos(gl_FogCoord + gl_Color.x);
gl_TexCoord[0] = vec4(texFract + 0.5 * season, gl_MultiTexCoord0.y, 0.0, 0.0); gl_TexCoord[0] = vec4(texFract + 0.5 * float(season), gl_MultiTexCoord0.y, 0.0, 0.0);
// scaling // scaling
vec3 position = gl_Vertex.xyz * gl_Normal.xxy; vec3 position = gl_Vertex.xyz * gl_Normal.xxy;