From a42a77f0aacf5878f29edafc42b8b230dc290bb6 Mon Sep 17 00:00:00 2001 From: Erik Kundiman Date: Tue, 1 Oct 2024 11:22:55 +0800 Subject: Rename uniform vec4 color to color4 to avoid name clash with the uniform vec3 color somewhere else. I've tested this and everything seemed okay. Just revert this if it causes trouble. --- indra/newview/app_settings/shaders/class1/deferred/highlightF.glsl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/newview/app_settings/shaders/class1/deferred') diff --git a/indra/newview/app_settings/shaders/class1/deferred/highlightF.glsl b/indra/newview/app_settings/shaders/class1/deferred/highlightF.glsl index 5c09950712..0c6655e7f4 100644 --- a/indra/newview/app_settings/shaders/class1/deferred/highlightF.glsl +++ b/indra/newview/app_settings/shaders/class1/deferred/highlightF.glsl @@ -25,14 +25,14 @@ out vec4 frag_data[4]; -uniform vec4 color; +uniform vec4 color4; uniform sampler2D diffuseMap; in vec2 vary_texcoord0; void main() { - frag_data[0] = color*texture(diffuseMap, vary_texcoord0.xy); + frag_data[0] = color4*texture(diffuseMap, vary_texcoord0.xy); frag_data[1] = vec4(0.0); frag_data[2] = vec4(0.0, 1.0, 0.0, GBUFFER_FLAG_SKIP_ATMOS); frag_data[3] = vec4(0); -- cgit v1.2.3