Fix shaders broken in merge

...newview/app_settings/shaders/class1/deferred/avatarV.glsl

...pp_settings/shaders/class1/deferred/fullbrightShinyV.glsl

...iew/app_settings/shaders/class1/deferred/genbrdflutV.glsl

...wview/app_settings/shaders/class1/deferred/materialV.glsl

...wview/app_settings/shaders/class1/deferred/pbralphaF.glsl

...settings/shaders/class1/deferred/screenSpaceReflUtil.glsl

...view/app_settings/shaders/class1/deferred/shadowUtil.glsl

...ewview/app_settings/shaders/class1/deferred/terrainF.glsl

...ewview/app_settings/shaders/class1/deferred/terrainV.glsl

...iew/app_settings/shaders/class1/effects/glowExtractF.glsl

indra/newview/app_settings/shaders/class1/effects/glowF.glsl

.../app_settings/shaders/class1/environment/encodeNormF.glsl

...ewview/app_settings/shaders/class1/environment/srgbF.glsl

...view/app_settings/shaders/class1/interface/gaussianF.glsl

...w/app_settings/shaders/class1/interface/radianceGenV.glsl

...settings/shaders/class1/interface/twotexturecompareF.glsl

...app_settings/shaders/class1/lighting/lightAlphaMaskF.glsl

...gs/shaders/class1/lighting/lightAlphaMaskNonIndexedF.glsl

...p_settings/shaders/class2/interface/reflectionprobeF.glsl

...p_settings/shaders/class2/interface/reflectionprobeV.glsl