Merge branch 'master' into fmt

indra/llrender/llglslshader.cpp

@@ -491,12 +491,13 @@ void dumpAttachObject( const char *func_name, GLhandleARB program_object, const
 }
 #endif // DEBUG_SHADER_INCLUDES
 
-BOOL LLGLSLShader::attachVertexObject(std::string object_path)
+BOOL LLGLSLShader::attachVertexObject(std::string_view object_path)
 {
-    if (LLShaderMgr::instance()->mVertexShaderObjects.count(object_path) > 0)
+    auto it = LLShaderMgr::instance()->mVertexShaderObjects.find(object_path);
+    if (it != LLShaderMgr::instance()->mVertexShaderObjects.end())
     {
         stop_glerror();
-        glAttachShader(mProgramObject, LLShaderMgr::instance()->mVertexShaderObjects[object_path]);
+        glAttachShader(mProgramObject, it->second);
 #if DEBUG_SHADER_INCLUDES
         dumpAttachObject("attachVertexObject", mProgramObject, object_path);
 #endif // DEBUG_SHADER_INCLUDES
@@ -510,12 +511,13 @@ BOOL LLGLSLShader::attachVertexObject(std::string object_path)
     }
 }
 
-BOOL LLGLSLShader::attachFragmentObject(std::string object_path)
+BOOL LLGLSLShader::attachFragmentObject(std::string_view object_path)
 {
-    if (LLShaderMgr::instance()->mFragmentShaderObjects.count(object_path) > 0)
+    auto it = LLShaderMgr::instance()->mFragmentShaderObjects.find(object_path);
+    if (it != LLShaderMgr::instance()->mFragmentShaderObjects.end())
     {
         stop_glerror();
-        glAttachShader(mProgramObject, LLShaderMgr::instance()->mFragmentShaderObjects[object_path]);
+        glAttachShader(mProgramObject, it->second);
 #if DEBUG_SHADER_INCLUDES
         dumpAttachObject("attachFragmentObject", mProgramObject, object_path);
 #endif // DEBUG_SHADER_INCLUDES

indra/llrender/llglslshader.h

@@ -111,8 +111,8 @@ class LLGLSLShader
 						std::vector<LLStaticHashedString> * uniforms,
 						U32 varying_count = 0,
 						const char** varyings = NULL);
-    BOOL attachFragmentObject(std::string object);
-    BOOL attachVertexObject(std::string object);
+    BOOL attachFragmentObject(std::string_view object);
+    BOOL attachVertexObject(std::string_view object);
 	void attachObject(GLuint object);
 	void attachObjects(GLuint* objects = NULL, S32 count = 0);
 	BOOL mapAttributes(const std::vector<LLStaticHashedString> * attributes);

indra/llrender/llshadermgr.h

@@ -281,8 +281,8 @@ class LLShaderMgr
 
 public:
 	// Map of shader names to compiled
-    std::map<std::string, GLuint> mVertexShaderObjects;
-    std::map<std::string, GLuint> mFragmentShaderObjects;
+    std::map<std::string, GLuint, std::less<>> mVertexShaderObjects;
+    std::map<std::string, GLuint, std::less<>> mFragmentShaderObjects;
 
 	//global (reserved slot) shader parameters
 	std::vector<std::string> mReservedAttribs;