Code cleanup and move to using typedefs of S64Seconds/F64Seconds for ease in sync w/ sim side which has not llunits types.

1 files changed, 4 insertions, 29 deletions

diff --git a/indra/llrender/llglslshader.h b/indra/llrender/llglslshader.h
index 59edd7b36f..0934ceba30 100644
--- a/indra/llrender/llglslshader.h
+++ b/indra/llrender/llglslshader.h
@@ -169,11 +169,6 @@ public:
 	U32 mMatHash[LLRender::NUM_MATRIX_MODES];
 	U32 mLightHash;
 
-    typedef std::map<S32, GLint> uniforms_index_t;
-    typedef std::pair<U32, U32>  magmin_values_t;
-
-    typedef std::map < S32, magmin_values_t> magmin_filter_t;
-
 	GLhandleARB mProgramObject;
 #if LL_RELEASE_WITH_DEBUG_INFO
 	struct attr_name
@@ -188,12 +183,11 @@ public:
 	std::vector<GLint> mAttribute; //lookup table of attribute enum to attribute channel
 #endif
 	U32 mAttributeMask;  //mask of which reserved attributes are set (lines up with LLVertexBuffer::getTypeMask())
-    uniforms_index_t mUniform;
-    uniforms_index_t mTexture;
-
+	std::vector<GLint> mUniform;   //lookup table of uniform enum to uniform location
 	LLStaticStringTable<GLint> mUniformMap; //lookup map of uniform name to uniform location
 	std::map<GLint, std::string> mUniformNameMap; //lookup map of uniform location to uniform name
 	std::map<GLint, LLVector4> mValue; //lookup map of uniform location to last known value
+	std::vector<GLint> mTexture;
 	S32 mTotalUniformSize;
 	S32 mActiveTextureChannels;
 	S32 mShaderLevel;
@@ -217,32 +211,13 @@ public:
 	static U32 sTotalDrawCalls;
 
 	bool mTextureStateFetched;
-    magmin_filter_t mTextureMagMinFilter;
+	std::vector<U32> mTextureMagFilter;
+	std::vector<U32> mTextureMinFilter;
 
     GLhandleARB mExtraLinkObject = 0;
 
 private:
 	void unloadInternal();
-
-    inline GLint getLocationForIndex(S32 index)
-    {
-        if (!mProgramObject)
-            return -1;
-        uniforms_index_t::iterator it = mUniform.find(index);
-        if (it == mUniform.end())
-            return -1;
-        return (*it).second;
-    }
-
-    inline GLint getTexChannelForIndex(S32 index)
-    {
-        if (!mProgramObject)
-            return -1;
-        uniforms_index_t::iterator it = mTexture.find(index);
-        if (it == mTexture.end())
-            return -1;
-        return (*it).second;
-    }
 };
 
 //UI shader (declared here so llui_libtest will link properly)