diff options
| author | Jonathan "Geenz" Goodman <geenz@geenzo.com> | 2024-02-07 00:17:10 -0800 |
|---|---|---|
| committer | Jonathan "Geenz" Goodman <geenz@geenzo.com> | 2024-02-07 00:17:10 -0800 |
| commit | 4ddad4cd4365259d9ac90104c8fe946edabe025b (patch) | |
| tree | 0299ea6076cc510169accebc52dd13ba7ebf093e /indra | |
| parent | 739ff27c0649af9c74e00f31934d89405ff14373 (diff) | |
| parent | b0c7dc653dc730f1f95aa95fc6df876dfe7b04a0 (diff) | |
Merge branch 'materials_featurette/mirrors' into geenz/mirror-masking
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llviewershadermgr.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/llviewershadermgr.cpp b/indra/newview/llviewershadermgr.cpp index 164b36af65..91983f6603 100644 --- a/indra/newview/llviewershadermgr.cpp +++ b/indra/newview/llviewershadermgr.cpp @@ -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() : |