From e62a4dc8b4cdac5038c1fb8e5428248a3e195509 Mon Sep 17 00:00:00 2001
From: Henri Beauchamp <sldev@free.fr>
Date: Tue, 12 Dec 2023 01:41:42 +0100
Subject: Fix for semi-transparent HUDs rendering opaque

This commit fixes a bug introduced with commit 6472b75bcd70470fe5775d1cf6eb70a75b3d76e5
where the fullbrightF.glsl shader fails to set color.a to final_alpha for HUDs.
---
 indra/newview/app_settings/shaders/class1/deferred/fullbrightF.glsl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indra/newview/app_settings/shaders/class1/deferred/fullbrightF.glsl b/indra/newview/app_settings/shaders/class1/deferred/fullbrightF.glsl
index 8b2a69b924..a6fab10791 100644
--- a/indra/newview/app_settings/shaders/class1/deferred/fullbrightF.glsl
+++ b/indra/newview/app_settings/shaders/class1/deferred/fullbrightF.glsl
@@ -76,9 +76,9 @@ void main()
 
     vec3 pos = vary_position;
 
+    color.a = final_alpha;
 #ifndef IS_HUD
     color.rgb = srgb_to_linear(color.rgb);
-    color.a = final_alpha;
 #ifdef IS_ALPHA
 
     vec3 sunlit;
-- 
cgit v1.2.3


From 88b228a94defd1d1cc88ef814290369cf870dca1 Mon Sep 17 00:00:00 2001
From: Cosmic Linden <cosmic@lindenlab.com>
Date: Wed, 13 Dec 2023 13:39:12 -0800
Subject: Credit Henri for HUD fix

---
 doc/contributions.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/contributions.txt b/doc/contributions.txt
index af8b259c74..2fbe8ab7cc 100755
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -596,6 +596,7 @@ Henri Beauchamp
 	SL-15175
 	SL-19110
 	SL-19159
+	[NO JIRA] (fullbright HUD alpha fix)
 herina Bode
 Hikkoshi Sakai
 	VWR-429
-- 
cgit v1.2.3


From feece92f2bb7525a7b2a99170ed60a40fac7777e Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Thu, 14 Dec 2023 14:58:20 +0200
Subject: SL-20717 Add PBR to Advanced > Rendering Types

---
 indra/newview/llviewermenu.cpp                     |  4 ++++
 indra/newview/skins/default/xui/en/menu_viewer.xml | 10 ++++++++++
 2 files changed, 14 insertions(+)

diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index 553eaaf9b2..9db9d97ddc 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -787,6 +787,10 @@ U32 render_type_from_string(std::string render_type)
 	{
 		return LLPipeline::RENDER_TYPE_BUMP;
 	}
+    else if ("pbr" == render_type) 
+    {
+        return LLPipeline::RENDER_TYPE_GLTF_PBR;
+    }
 	else
 	{
 		return 0;
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 2c4b03251a..660f4b62c7 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -2162,6 +2162,16 @@ function="World.EnvPreset"
                  function="Advanced.ToggleRenderType"
                  parameter="bump" />
             </menu_item_check>
+            <menu_item_check
+             label="PBR"
+             name="Rendering Type PBR">
+                <menu_item_check.on_check
+                 function="Advanced.CheckRenderType"
+                 parameter="pbr" />
+                <menu_item_check.on_click
+                 function="Advanced.ToggleRenderType"
+                 parameter="pbr" />
+            </menu_item_check>
         </menu>
         <menu
          create_jump_keys="true"
-- 
cgit v1.2.3