Merge branch 'DRTVWR-559' into DRTVWR-583-glossy-ssr

4 files changed, 5 insertions, 38 deletions

diff --git a/indra/llrender/llgltexture.cpp b/indra/llrender/llgltexture.cpp
index e012eb9a62..7fdef4a3b7 100644
--- a/indra/llrender/llgltexture.cpp
+++ b/indra/llrender/llgltexture.cpp
@@ -27,25 +27,6 @@
 #include "llgltexture.h"
 
 
-// static
-S32 LLGLTexture::getTotalNumOfCategories() 
-{
-	return MAX_GL_IMAGE_CATEGORY - (BOOST_HIGH - BOOST_SCULPTED) + 2 ;
-}
-
-// static
-//index starts from zero.
-S32 LLGLTexture::getIndexFromCategory(S32 category) 
-{
-	return (category < BOOST_HIGH) ? category : category - (BOOST_HIGH - BOOST_SCULPTED) + 1 ;
-}
-
-//static 
-S32 LLGLTexture::getCategoryFromIndex(S32 index)
-{
-	return (index < BOOST_HIGH) ? index : index + (BOOST_HIGH - BOOST_SCULPTED) - 1 ;
-}
-
 LLGLTexture::LLGLTexture(BOOL usemipmaps)
 {
 	init();
diff --git a/indra/llrender/llgltexture.h b/indra/llrender/llgltexture.h
index 3732333f8f..5c693fc93c 100644
--- a/indra/llrender/llgltexture.h
+++ b/indra/llrender/llgltexture.h
@@ -49,8 +49,8 @@ public:
 	enum EBoostLevel
 	{
 		BOOST_NONE 			= 0,
-		BOOST_AVATAR_BAKED	,
 		BOOST_AVATAR		,
+        BOOST_AVATAR_BAKED  ,
 		BOOST_SCULPTED      ,
 		
 		BOOST_HIGH 			= 10,
@@ -87,10 +87,6 @@ public:
 		NO_DELETE = 99       //stay in memory, can not be removed.
 	} LLGLTextureState;
 
-	static S32 getTotalNumOfCategories() ;
-	static S32 getIndexFromCategory(S32 category) ;
-	static S32 getCategoryFromIndex(S32 index) ;
-
 protected:
 	virtual ~LLGLTexture();
 	LOG_CLASS(LLGLTexture);
diff --git a/indra/llrender/llshadermgr.cpp b/indra/llrender/llshadermgr.cpp
index 1458b98bf5..75d6ef6c46 100644
--- a/indra/llrender/llshadermgr.cpp
+++ b/indra/llrender/llshadermgr.cpp
@@ -1266,13 +1266,11 @@ void LLShaderMgr::initAttribsAndUniforms()
 	mReservedUniforms.push_back("lightnorm");
 	mReservedUniforms.push_back("sunlight_color");
 	mReservedUniforms.push_back("ambient_color");
+    mReservedUniforms.push_back("sky_hdr_scale");
 	mReservedUniforms.push_back("blue_horizon");
-    mReservedUniforms.push_back("blue_horizon_linear");
-	mReservedUniforms.push_back("blue_density");
-    mReservedUniforms.push_back("blue_density_linear");
-	mReservedUniforms.push_back("haze_horizon");
+    mReservedUniforms.push_back("blue_density");
+    mReservedUniforms.push_back("haze_horizon");
 	mReservedUniforms.push_back("haze_density");
-    mReservedUniforms.push_back("haze_density_linear");
 	mReservedUniforms.push_back("cloud_shadow");
 	mReservedUniforms.push_back("density_multiplier");
 	mReservedUniforms.push_back("distance_multiplier");
@@ -1461,9 +1459,6 @@ void LLShaderMgr::initAttribsAndUniforms()
     mReservedUniforms.push_back("water_edge");
     mReservedUniforms.push_back("sun_up_factor");
     mReservedUniforms.push_back("moonlight_color");
-    mReservedUniforms.push_back("moonlight_linear");
-    mReservedUniforms.push_back("sunlight_linear");
-    mReservedUniforms.push_back("ambient_linear");
 
 	llassert(mReservedUniforms.size() == END_RESERVED_UNIFORMS);
 
diff --git a/indra/llrender/llshadermgr.h b/indra/llrender/llshadermgr.h
index 2ab3ba71db..46f352aa58 100644
--- a/indra/llrender/llshadermgr.h
+++ b/indra/llrender/llshadermgr.h
@@ -102,13 +102,11 @@ public:
         LIGHTNORM,                          //  "lightnorm"
         SUNLIGHT_COLOR,                     //  "sunlight_color"
         AMBIENT,                            //  "ambient_color"
+        SKY_HDR_SCALE,                      //  "sky_hdr_scale"
         BLUE_HORIZON,                       //  "blue_horizon"
-        BLUE_HORIZON_LINEAR,                //  "blue_horizon_linear"
         BLUE_DENSITY,                       //  "blue_density"
-        BLUE_DENSITY_LINEAR,                //  "blue_density_linear"
         HAZE_HORIZON,                       //  "haze_horizon"
         HAZE_DENSITY,                       //  "haze_density"
-        HAZE_DENSITY_LINEAR,                //  "haze_density_linear"
         CLOUD_SHADOW,                       //  "cloud_shadow"
         DENSITY_MULTIPLIER,                 //  "density_multiplier"
         DISTANCE_MULTIPLIER,                //  "distance_multiplier"
@@ -286,9 +284,6 @@ public:
         WATER_EDGE_FACTOR,                  //  "water_edge"
         SUN_UP_FACTOR,                      //  "sun_up_factor"
         MOONLIGHT_COLOR,                    //  "moonlight_color"
-        MOONLIGHT_LINEAR,                    //  "moonlight_LINEAR"
-        SUNLIGHT_LINEAR,                     //  "sunlight_linear"
-        AMBIENT_LINEAR,                     //  "ambient_linear"
         END_RESERVED_UNIFORMS
     } eGLSLReservedUniforms;
     // clang-format on