TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-12 15:14:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

opengl crashfix: cannot self-multiply a uniform. use a temp-variable.

Browse source
This commit is contained in:
Azaezel 2015-05-01 13:47:04 -05:00 • committed by Daniel Buckmaster
parent d4e5b47195
commit 462aeefb36
4 changed files with 12 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Templates/Full/game/shaders/common/lighting/advanced/gl/pointLightP.glsl
View file

@ -187,13 +187,14 @@ void main()
#endif // !NO_SHADOW #endif // !NO_SHADOW
vec3 lightcol = lightColor.rgb;
#ifdef USE_COOKIE_TEX #ifdef USE_COOKIE_TEX
// Lookup the cookie sample. // Lookup the cookie sample.
vec4 cookie = texture( cookieMap, tMul( viewToLightProj, -lightVec ) ); vec4 cookie = texture( cookieMap, tMul( viewToLightProj, -lightVec ) );
// Multiply the light with the cookie tex. // Multiply the light with the cookie tex.
lightColor.rgb *= cookie.rgb; lightcol *= cookie.rgb;
// Use a maximum channel luminance to attenuate // Use a maximum channel luminance to attenuate
// the lighting else we get specular in the dark // the lighting else we get specular in the dark
@ -211,7 +212,7 @@ void main()
normalize( -eyeRay ) ) * lightBrightness * atten * shadowed; normalize( -eyeRay ) ) * lightBrightness * atten * shadowed;
float Sat_NL_Att = saturate( nDotL * atten * shadowed ) * lightBrightness; float Sat_NL_Att = saturate( nDotL * atten * shadowed ) * lightBrightness;
vec3 lightColorOut = lightMapParams.rgb * lightColor.rgb; vec3 lightColorOut = lightMapParams.rgb * lightcol;
vec4 addToResult = vec4(0.0); vec4 addToResult = vec4(0.0);
// TODO: This needs to be removed when lightmapping is disabled // TODO: This needs to be removed when lightmapping is disabled

5
Templates/Full/game/shaders/common/lighting/advanced/gl/spotLightP.glsl
View file

@ -121,13 +121,14 @@ void main()
#endif // !NO_SHADOW #endif // !NO_SHADOW
vec3 lightcol = lightColor.rgb;
#ifdef USE_COOKIE_TEX #ifdef USE_COOKIE_TEX
// Lookup the cookie sample. // Lookup the cookie sample.
vec4 cookie = texture( cookieMap, shadowCoord ); vec4 cookie = texture( cookieMap, shadowCoord );
// Multiply the light with the cookie tex. // Multiply the light with the cookie tex.
lightColor.rgb *= cookie.rgb; lightcol *= cookie.rgb;
// Use a maximum channel luminance to attenuate // Use a maximum channel luminance to attenuate
// the lighting else we get specular in the dark // the lighting else we get specular in the dark
@ -145,7 +146,7 @@ void main()
normalize( -eyeRay ) ) * lightBrightness * atten * shadowed; normalize( -eyeRay ) ) * lightBrightness * atten * shadowed;
float Sat_NL_Att = saturate( nDotL * atten * shadowed ) * lightBrightness; float Sat_NL_Att = saturate( nDotL * atten * shadowed ) * lightBrightness;
vec3 lightColorOut = lightMapParams.rgb * lightColor.rgb; vec3 lightColorOut = lightMapParams.rgb * lightcol;
vec4 addToResult = vec4(0.0); vec4 addToResult = vec4(0.0);
// TODO: This needs to be removed when lightmapping is disabled // TODO: This needs to be removed when lightmapping is disabled

5
Templates/Full/game/shaders/common/lighting/advanced/pointLightP.hlsl
View file

@ -192,13 +192,14 @@ float4 main( ConvexConnectP IN,
#endif // !NO_SHADOW #endif // !NO_SHADOW
float3 lightcol = lightColor.rgb;
#ifdef USE_COOKIE_TEX #ifdef USE_COOKIE_TEX
// Lookup the cookie sample. // Lookup the cookie sample.
float4 cookie = texCUBE( cookieMap, mul( viewToLightProj, -lightVec ) ); float4 cookie = texCUBE( cookieMap, mul( viewToLightProj, -lightVec ) );
// Multiply the light with the cookie tex. // Multiply the light with the cookie tex.
lightColor.rgb *= cookie.rgb; lightcol *= cookie.rgb;
// Use a maximum channel luminance to attenuate // Use a maximum channel luminance to attenuate
// the lighting else we get specular in the dark // the lighting else we get specular in the dark
@ -216,7 +217,7 @@ float4 main( ConvexConnectP IN,
normalize( -eyeRay ) ) * lightBrightness * atten * shadowed; normalize( -eyeRay ) ) * lightBrightness * atten * shadowed;
float Sat_NL_Att = saturate( nDotL * atten * shadowed ) * lightBrightness; float Sat_NL_Att = saturate( nDotL * atten * shadowed ) * lightBrightness;
float3 lightColorOut = lightMapParams.rgb * lightColor.rgb; float3 lightColorOut = lightMapParams.rgb * lightcol;
float4 addToResult = 0.0; float4 addToResult = 0.0;
// TODO: This needs to be removed when lightmapping is disabled // TODO: This needs to be removed when lightmapping is disabled

5
Templates/Full/game/shaders/common/lighting/advanced/spotLightP.hlsl
View file

@ -120,13 +120,14 @@ float4 main( ConvexConnectP IN,
#endif // !NO_SHADOW #endif // !NO_SHADOW
float3 lightcol = lightColor.rgb;
#ifdef USE_COOKIE_TEX #ifdef USE_COOKIE_TEX
// Lookup the cookie sample. // Lookup the cookie sample.
float4 cookie = tex2D( cookieMap, shadowCoord ); float4 cookie = tex2D( cookieMap, shadowCoord );
// Multiply the light with the cookie tex. // Multiply the light with the cookie tex.
lightColor.rgb *= cookie.rgb; lightcol *= cookie.rgb;
// Use a maximum channel luminance to attenuate // Use a maximum channel luminance to attenuate
// the lighting else we get specular in the dark // the lighting else we get specular in the dark
@ -144,7 +145,7 @@ float4 main( ConvexConnectP IN,
normalize( -eyeRay ) ) * lightBrightness * atten * shadowed; normalize( -eyeRay ) ) * lightBrightness * atten * shadowed;
float Sat_NL_Att = saturate( nDotL * atten * shadowed ) * lightBrightness; float Sat_NL_Att = saturate( nDotL * atten * shadowed ) * lightBrightness;
float3 lightColorOut = lightMapParams.rgb * lightColor.rgb; float3 lightColorOut = lightMapParams.rgb * lightcol;
float4 addToResult = 0.0; float4 addToResult = 0.0;
// TODO: This needs to be removed when lightmapping is disabled // TODO: This needs to be removed when lightmapping is disabled