From 9b162485df066a962b70d7c9944ff8c9e8b7a435 Mon Sep 17 00:00:00 2001
From: secretfoxtail <remmy@megapahit.net>
Date: Sat, 12 Oct 2024 06:18:09 -0600
Subject: Revert "Rename uniform vec4 color to color4"
This reverts commit a42a77f0aacf5878f29edafc42b8b230dc290bb6.
---
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 0c6655e7f4..5c09950712 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 color4;
+uniform vec4 color;
uniform sampler2D diffuseMap;
in vec2 vary_texcoord0;
void main()
{
- frag_data[0] = color4*texture(diffuseMap, vary_texcoord0.xy);
+ frag_data[0] = color*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 29ab8265aa..f863d1ad20 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 color4;
+uniform vec4 color;
void main()
{
- frag_color = max(color4, vec4(0));
+ frag_color = max(color, 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 d2e160277d..c70acf4cde 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 color4;
+uniform vec4 color;
uniform sampler2D diffuseMap;
in vec2 vary_texcoord0;
void main()
{
- frag_color = max(color4*texture(diffuseMap, vary_texcoord0.xy), vec4(0));
+ frag_color = max(color*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 8b14e60cd7..b7b2306412 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 color4;
+uniform vec4 color;
in vec2 vary_texcoord0;
void main()
{
- float alpha = texture(tex0, vary_texcoord0.xy).a * color4.a;
+ float alpha = texture(tex0, vary_texcoord0.xy).a * color.a;
- frag_color = vec4(color4.rgb, alpha);
+ frag_color = vec4(color.rgb, alpha);
}
--
cgit v1.2.3