diff options
| author | Graham Madarasz <graham@lindenlab.com> | 2013-04-16 18:07:25 -0700 | 
|---|---|---|
| committer | Graham Madarasz <graham@lindenlab.com> | 2013-04-16 18:07:25 -0700 | 
| commit | 119c0a35f15d0f82ebf99507300357609769520b (patch) | |
| tree | fcc6a9ee715e0787412a137142c8ecc579558c0d /indra/newview/app_settings/shaders | |
| parent | 70dbb7a59c69c6482c451b4c75aba85f0f0a647a (diff) | |
NORSPEC-59 fix? for mac crasher
Diffstat (limited to 'indra/newview/app_settings/shaders')
| -rw-r--r-- | indra/newview/app_settings/shaders/class1/deferred/alphaF.glsl | 6 | ||||
| -rw-r--r-- | indra/newview/app_settings/shaders/class2/deferred/alphaF.glsl | 6 | 
2 files changed, 6 insertions, 6 deletions
| diff --git a/indra/newview/app_settings/shaders/class1/deferred/alphaF.glsl b/indra/newview/app_settings/shaders/class1/deferred/alphaF.glsl index fc628e60cf..8c9fe95590 100644 --- a/indra/newview/app_settings/shaders/class1/deferred/alphaF.glsl +++ b/indra/newview/app_settings/shaders/class1/deferred/alphaF.glsl @@ -152,10 +152,10 @@ void main()  	color.rgb = atmosLighting(color.rgb);  	color.rgb = scaleSoftClip(color.rgb); -	vec3 light_col = vec3(0,0,0); +	col = vec3(0,0,0);     #define LIGHT_LOOP(i) \ -	light_col += light_diffuse[i].rgb * calcPointLightOrSpotLight(pos.xyz, vary_norm, light_position[i], light_direction[i], light_attenuation[i].x, light_attenuation[i].y, light_attenuation[i].z); +	col += light_diffuse[i].rgb * calcPointLightOrSpotLight(pos.xyz, vary_norm, light_position[i], light_direction[i], light_attenuation[i].x, light_attenuation[i].y, light_attenuation[i].z);  	LIGHT_LOOP(1)  	LIGHT_LOOP(2) @@ -165,7 +165,7 @@ void main()  	LIGHT_LOOP(6)  	LIGHT_LOOP(7) -	color.rgb += diff.rgb * vary_pointlight_col * light_col; +	color.rgb += diff.rgb * vary_pointlight_col * col;  	frag_color = color;  } diff --git a/indra/newview/app_settings/shaders/class2/deferred/alphaF.glsl b/indra/newview/app_settings/shaders/class2/deferred/alphaF.glsl index 42467a1b60..e55023c384 100644 --- a/indra/newview/app_settings/shaders/class2/deferred/alphaF.glsl +++ b/indra/newview/app_settings/shaders/class2/deferred/alphaF.glsl @@ -240,10 +240,10 @@ void main()  	color.rgb = atmosLighting(color.rgb);  	color.rgb = scaleSoftClip(color.rgb); -	vec3 light_col = vec3(0,0,0); +	col = vec3(0,0,0);    #define LIGHT_LOOP(i) \ -		light_col += light_diffuse[i].rgb * calcPointLightOrSpotLight(pos.xyz, vary_norm, light_position[i], light_direction[i], light_attenuation[i].x, light_attenuation[i].y, light_attenuation[i].z); +		col += light_diffuse[i].rgb * calcPointLightOrSpotLight(pos.xyz, vary_norm, light_position[i], light_direction[i], light_attenuation[i].x, light_attenuation[i].y, light_attenuation[i].z);  	LIGHT_LOOP(1)  	LIGHT_LOOP(2) @@ -253,7 +253,7 @@ void main()  	LIGHT_LOOP(6)  	LIGHT_LOOP(7) -	color.rgb += diff.rgb * vary_pointlight_col * light_col; +	color.rgb += diff.rgb * vary_pointlight_col * col;  	frag_color = color;  } | 
