livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'materials_featurette/mirrors' into geenz/mirror-masking

meow-7.2.2
Jonathan "Geenz" Goodman 2024-02-07 00:17:10 -08:00
parent 739ff27c06 b0c7dc653d
commit 4ddad4cd43
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
indra/newview/llviewershadermgr.cpp
View File

@ -240,6 +240,9 @@ static bool make_rigged_variant(LLGLSLShader& shader, LLGLSLShader& riggedShader
return riggedShader.createShader(NULL, NULL);
}
#ifdef SHOW_ASSERT
// return true if there are no redundant shaders in the given vector
// also checks for redundant variants
static bool no_redundant_shaders(const std::vector<LLGLSLShader*>& shaders)
{
std::set<std::string> names;
@ -264,6 +267,7 @@ static bool no_redundant_shaders(const std::vector<LLGLSLShader*>& shaders)
}
return true;
}
#endif
LLViewerShaderMgr::LLViewerShaderMgr() :