summaryrefslogtreecommitdiff
path: root/indra/llrender/llglslshader.h
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2018-06-14 18:20:55 -0400
committerNat Goodspeed <nat@lindenlab.com>2018-06-14 18:20:55 -0400
commit4dba69b04ab9825f1cd4b8dbf855494a3897ffd7 (patch)
tree2f3a5324daf25ccea323ce5caa8dc238b6e37bbe /indra/llrender/llglslshader.h
parent9b7640d70ae820a954634ecf0dae43dfb33c0d3a (diff)
parent67f6625c56406604197507c842496f031eb0986f (diff)
Automated merge with file:///Users/nat/linden/viewer-no-vstool
Diffstat (limited to 'indra/llrender/llglslshader.h')
-rw-r--r--indra/llrender/llglslshader.h11
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