diff options
author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2018-06-02 02:18:57 +0300 |
---|---|---|
committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2018-06-02 02:18:57 +0300 |
commit | 1fe32c16fb299c1eb6a47e6860198f07b0c806c4 (patch) | |
tree | 04a3c93faa058e547140c9d43d15fb9b1467f2a6 /indra/llrender/llglslshader.h | |
parent | 18bb3f6b86b32c4ca22f0466ee175d68969a03fd (diff) | |
parent | 9437d1511e2c4b73a58abc823b1ca2a29a8a4d04 (diff) |
Merged in lindenlab/viewer-bear
Diffstat (limited to 'indra/llrender/llglslshader.h')
-rw-r--r-- | indra/llrender/llglslshader.h | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/indra/llrender/llglslshader.h b/indra/llrender/llglslshader.h index 6f10d122cb..b56b914013 100644 --- a/indra/llrender/llglslshader.h +++ b/indra/llrender/llglslshader.h @@ -167,7 +167,18 @@ public: U32 mLightHash; GLhandleARB mProgramObject; +#if LL_RELEASE_WITH_DEBUG_INFO + struct attr_name + { + GLint loc; + const char *name; + void operator = (GLint _loc) { loc = _loc; } + operator GLint () { return loc; } + }; + std::vector<attr_name> mAttribute; //lookup table of attribute enum to attribute channel +#else 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()) std::vector<GLint> mUniform; //lookup table of uniform enum to uniform location LLStaticStringTable<GLint> mUniformMap; //lookup map of uniform name to uniform location |