From 14a480ef333da737d3b2d12c5148157ece48c36d Mon Sep 17 00:00:00 2001 From: Ansariel Date: Wed, 6 Jan 2021 21:18:26 +0100 Subject: [PATCH] More hammering on shaders --- .../app_settings/shaders/class1/deferred/pointLightF.glsl | 6 +++--- .../app_settings/shaders/class1/deferred/softenLightF.glsl | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/indra/newview/app_settings/shaders/class1/deferred/pointLightF.glsl b/indra/newview/app_settings/shaders/class1/deferred/pointLightF.glsl index 98db09b468..f062bf8fcd 100644 --- a/indra/newview/app_settings/shaders/class1/deferred/pointLightF.glsl +++ b/indra/newview/app_settings/shaders/class1/deferred/pointLightF.glsl @@ -36,12 +36,12 @@ out vec4 frag_color; uniform sampler2DRect diffuseRect; uniform sampler2DRect specularRect; // Colour space and shader fixes for BUG-228586 (Rye) -uniform sampler2DRect normalMap; -uniform samplerCube environmentMap; +//uniform sampler2DRect normalMap; +//uniform samplerCube environmentMap; // uniform sampler2D noiseMap; uniform sampler2D lightFunc; -uniform sampler2DRect depthMap;// Colour space and shader fixes for BUG-228586 (Rye) +//uniform sampler2DRect depthMap;// Colour space and shader fixes for BUG-228586 (Rye) uniform vec3 env_mat[3]; uniform float sun_wash; diff --git a/indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl b/indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl index 68071a8995..f24fca77d5 100644 --- a/indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl +++ b/indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl @@ -40,7 +40,6 @@ uniform sampler2DRect normalMap; // Colour space and shader fixes for BUG-228586 (Rye) // uniform sampler2DRect lightMap; uniform sampler2DRect depthMap; -// uniform samplerCube environmentMap; uniform sampler2D lightFunc;