diff options
| author | Graham Linden <graham@lindenlab.com> | 2018-11-09 21:21:03 +0000 | 
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2018-11-09 21:21:03 +0000 | 
| commit | a8c2bc25dd8daeebbcd1c0727a33df904dc42f76 (patch) | |
| tree | 6ee914688fa67b8cef137ca6c901d7ca85bc0927 /indra/newview/app_settings | |
| parent | d614bf11357d9ff1fef59c7ff11eff73b211dcac (diff) | |
More incremental revive of 39561 contents to determine cuplrit.
Diffstat (limited to 'indra/newview/app_settings')
| -rw-r--r-- | indra/newview/app_settings/shaders/class1/deferred/srgb.glsl | 3 | ||||
| -rw-r--r-- | indra/newview/app_settings/shaders/class1/deferred/waterF.glsl | 9 | 
2 files changed, 0 insertions, 12 deletions
| diff --git a/indra/newview/app_settings/shaders/class1/deferred/srgb.glsl b/indra/newview/app_settings/shaders/class1/deferred/srgb.glsl index 00ba0e8fad..bc3324f543 100644 --- a/indra/newview/app_settings/shaders/class1/deferred/srgb.glsl +++ b/indra/newview/app_settings/shaders/class1/deferred/srgb.glsl @@ -48,7 +48,6 @@ vec3 srgb_to_linear(vec3 cs)  	bvec3 lte = lessThanEqual(cs,vec3(0.04045));  	return mix(high_range, low_range, lte); -  }  vec3 linear_to_srgb(vec3 cl) @@ -59,6 +58,4 @@ vec3 linear_to_srgb(vec3 cl)  	bvec3 lt = lessThan(cl,vec3(0.0031308));  	return mix(high_range, low_range, lt); -  } - diff --git a/indra/newview/app_settings/shaders/class1/deferred/waterF.glsl b/indra/newview/app_settings/shaders/class1/deferred/waterF.glsl index 73f6d9fec3..69543b93ea 100644 --- a/indra/newview/app_settings/shaders/class1/deferred/waterF.glsl +++ b/indra/newview/app_settings/shaders/class1/deferred/waterF.glsl @@ -41,15 +41,6 @@ uniform sampler2D bumpMap2;  uniform float blend_factor;  uniform sampler2D screenTex;  uniform sampler2D refTex; -uniform sampler2DRectShadow shadowMap0; -uniform sampler2DRectShadow shadowMap1; -uniform sampler2DRectShadow shadowMap2; -uniform sampler2DRectShadow shadowMap3; -uniform sampler2D noiseMap; - -uniform mat4 shadow_matrix[6]; -uniform vec4 shadow_clip; -  uniform float sunAngle;  uniform float sunAngle2;  uniform vec3 lightDir; | 
