From a42a77f0aacf5878f29edafc42b8b230dc290bb6 Mon Sep 17 00:00:00 2001
From: Erik Kundiman <erik@megapahit.org>
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 ++--
 indra/newview/app_settings/shaders/class1/interface/debugF.glsl     | 4 ++--
 indra/newview/app_settings/shaders/class1/interface/highlightF.glsl | 4 ++--
 .../newview/app_settings/shaders/class1/interface/solidcolorF.glsl  | 6 +++---
 4 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'indra/newview')

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);
diff --git a/indra/newview/app_settings/shaders/class1/interface/debugF.glsl b/indra/newview/app_settings/shaders/class1/interface/debugF.glsl
index f863d1ad20..29ab8265aa 100644
--- a/indra/newview/app_settings/shaders/class1/interface/debugF.glsl
+++ b/indra/newview/app_settings/shaders/class1/interface/debugF.glsl
@@ -25,9 +25,9 @@
 
 out vec4 frag_color;
 
-uniform vec4 color;
+uniform vec4 color4;
 
 void main()
 {
-    frag_color = max(color, vec4(0));
+    frag_color = max(color4, vec4(0));
 }
diff --git a/indra/newview/app_settings/shaders/class1/interface/highlightF.glsl b/indra/newview/app_settings/shaders/class1/interface/highlightF.glsl
index c70acf4cde..d2e160277d 100644
--- a/indra/newview/app_settings/shaders/class1/interface/highlightF.glsl
+++ b/indra/newview/app_settings/shaders/class1/interface/highlightF.glsl
@@ -25,12 +25,12 @@
 
 out vec4 frag_color;
 
-uniform vec4 color;
+uniform vec4 color4;
 uniform sampler2D diffuseMap;
 
 in vec2 vary_texcoord0;
 
 void main()
 {
-    frag_color = max(color*texture(diffuseMap, vary_texcoord0.xy), vec4(0));
+    frag_color = max(color4*texture(diffuseMap, vary_texcoord0.xy), vec4(0));
 }
diff --git a/indra/newview/app_settings/shaders/class1/interface/solidcolorF.glsl b/indra/newview/app_settings/shaders/class1/interface/solidcolorF.glsl
index b7b2306412..8b14e60cd7 100644
--- a/indra/newview/app_settings/shaders/class1/interface/solidcolorF.glsl
+++ b/indra/newview/app_settings/shaders/class1/interface/solidcolorF.glsl
@@ -27,13 +27,13 @@ out vec4 frag_color;
 
 uniform sampler2D tex0;
 
-uniform vec4 color;
+uniform vec4 color4;
 
 in vec2 vary_texcoord0;
 
 void main()
 {
-    float alpha = texture(tex0, vary_texcoord0.xy).a * color.a;
+    float alpha = texture(tex0, vary_texcoord0.xy).a * color4.a;
 
-    frag_color = vec4(color.rgb, alpha);
+    frag_color = vec4(color4.rgb, alpha);
 }
-- 
cgit v1.2.3