diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2022-05-26 03:07:14 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2022-05-26 03:07:14 +0300 |
| commit | 58a500bee8dc06acb35acb5c2e5c65d2df99a0d8 (patch) | |
| tree | 9ce445b7171e208842baaa0da5a76a57516b33d5 /indra/llrender/llshadermgr.h | |
| parent | 2242f089e4da03b361255a8a5175c788a99cbf8e (diff) | |
| parent | cdbd06e8ed6e3f4285a61f5c0b607a65dfdf8dfd (diff) | |
Merge branch 'master' into DRTVWR-561-maint-O
Diffstat (limited to 'indra/llrender/llshadermgr.h')
| -rw-r--r-- | indra/llrender/llshadermgr.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llrender/llshadermgr.h b/indra/llrender/llshadermgr.h index 3908efd4ec..67c0d6ab10 100644 --- a/indra/llrender/llshadermgr.h +++ b/indra/llrender/llshadermgr.h @@ -264,7 +264,7 @@ public: void dumpShaderSource(U32 shader_code_count, GLcharARB** shader_code_text); BOOL linkProgramObject(GLhandleARB obj, BOOL suppress_errors = FALSE); BOOL validateProgramObject(GLhandleARB obj); - GLhandleARB loadShaderFile(const std::string& filename, S32 & shader_level, GLenum type, boost::unordered_map<std::string, std::string>* defines = NULL, S32 texture_index_channels = -1); + GLhandleARB loadShaderFile(const std::string& filename, S32 & shader_level, GLenum type, std::unordered_map<std::string, std::string>* defines = NULL, S32 texture_index_channels = -1); // Implemented in the application to actually point to the shader directory. virtual std::string getShaderDirPrefix(void) = 0; // Pure Virtual |