summaryrefslogtreecommitdiff
path: root/indra/llrender/llglslshader.h
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2010-04-06 16:24:08 -0500
committerDave Parks <davep@lindenlab.com>2010-04-06 16:24:08 -0500
commit47ffcdb93d6e2ac1f9d497e43e0213c98d129254 (patch)
tree1d3c1d159bca20cdca21a4e3eac23b1515372615 /indra/llrender/llglslshader.h
parent807d835c2bfc5d794a74f9690d1fafbe55ff88cc (diff)
Rigged attachments (almost works).
Diffstat (limited to 'indra/llrender/llglslshader.h')
-rw-r--r--indra/llrender/llglslshader.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llrender/llglslshader.h b/indra/llrender/llglslshader.h
index 166d4af04c..dc493ba162 100644
--- a/indra/llrender/llglslshader.h
+++ b/indra/llrender/llglslshader.h
@@ -48,6 +48,7 @@ public:
bool hasWaterFog; // implies no gamma
bool hasTransport; // implies no lighting (it's possible to have neither though)
bool hasSkinning;
+ bool hasObjectSkinning;
bool hasAtmospherics;
bool hasGamma;
@@ -109,7 +110,7 @@ public:
void vertexAttrib4fv(U32 index, GLfloat* v);
GLint getUniformLocation(const std::string& uniform);
-
+ GLint getAttribLocation(U32 attrib);
GLint mapUniformTextureChannel(GLint location, GLenum type);