diff options
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/app_settings/shaders/class1/deferred/fullbrightF.glsl | 5 | ||||
| -rw-r--r-- | indra/newview/app_settings/shaders/class1/deferred/fullbrightV.glsl | 6 | 
2 files changed, 6 insertions, 5 deletions
| diff --git a/indra/newview/app_settings/shaders/class1/deferred/fullbrightF.glsl b/indra/newview/app_settings/shaders/class1/deferred/fullbrightF.glsl index bb28f02aab..cb050c800f 100644 --- a/indra/newview/app_settings/shaders/class1/deferred/fullbrightF.glsl +++ b/indra/newview/app_settings/shaders/class1/deferred/fullbrightF.glsl @@ -42,9 +42,12 @@ void main()  {  	float shadow = 1.0; -	vec4 color = diffuseLookup(vary_texcoord0.xy)* vertex_color; +	vec4 color = diffuseLookup(vary_texcoord0.xy) * pow(vertex_color.rgb,vec3(2.2f)); +	  	color.rgb = fullbrightAtmosTransport(color.rgb); +  	color.rgb = fullbrightScaleSoftClip(color.rgb); +  	frag_color = color;  } diff --git a/indra/newview/app_settings/shaders/class1/deferred/fullbrightV.glsl b/indra/newview/app_settings/shaders/class1/deferred/fullbrightV.glsl index dd56a8c2b0..3f09a15375 100644 --- a/indra/newview/app_settings/shaders/class1/deferred/fullbrightV.glsl +++ b/indra/newview/app_settings/shaders/class1/deferred/fullbrightV.glsl @@ -57,8 +57,6 @@ void main()  	vary_texcoord0 = (texture_matrix0 * vec4(texcoord0,0,1)).xy;  	calcAtmospherics(pos.xyz); -	 -	vertex_color.rgb = pow(diffuse_color, vec3(2.2f,2.2f,2.2f)); -	vertex_color.a   = diffuse_color.a; -	 + +	vertex_color = diffuse_color;  } | 
