diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-09-15 00:54:25 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-09-15 00:54:25 -0500 |
| commit | 530981a2149a74e1dc003cea1bbc9dc392fcae60 (patch) | |
| tree | f629a2dbc004d23e0f9f056366290e397ec51caf /indra/llrender/llglslshader.h | |
| parent | 7c95af74f195c9ec4ebc0fc0264d98cd4a85be49 (diff) | |
SH-2243 work in progress -- no more deprecated built-in matrix state when using shaders.
Diffstat (limited to 'indra/llrender/llglslshader.h')
| -rw-r--r-- | indra/llrender/llglslshader.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llrender/llglslshader.h b/indra/llrender/llglslshader.h index 558ea66b50..c1765e2701 100644 --- a/indra/llrender/llglslshader.h +++ b/indra/llrender/llglslshader.h @@ -117,7 +117,6 @@ public: GLint getAttribLocation(U32 attrib); GLint mapUniformTextureChannel(GLint location, GLenum type); - //enable/disable texture channel for specified uniform //if given texture uniform is active in the shader, //the corresponding channel will be active upon return @@ -132,6 +131,8 @@ public: // Unbinds any previously bound shader by explicitly binding no shader. static void bindNoShader(void); + U32 mMatHash[LLRender::NUM_MATRIX_MODES]; + GLhandleARB mProgramObject; std::vector<GLint> mAttribute; //lookup table of attribute enum to attribute channel std::vector<GLint> mUniform; //lookup table of uniform enum to uniform location |