diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-08-08 15:33:55 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-08-08 15:33:55 -0500 |
| commit | f302e119627090c22325df59c40e1762402a08c6 (patch) | |
| tree | 5e9ffd96604352ff92c41574a6c1940ab534850d /indra/llrender/llglslshader.h | |
| parent | 4ab5831b3eed23c06d2ccd3cf55f6c018613c788 (diff) | |
| parent | 5e22062b68d2392d465503b3954cf06001eda608 (diff) | |
merge
Diffstat (limited to 'indra/llrender/llglslshader.h')
| -rw-r--r-- | indra/llrender/llglslshader.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/llrender/llglslshader.h b/indra/llrender/llglslshader.h index 621e0b82ee..558ea66b50 100644 --- a/indra/llrender/llglslshader.h +++ b/indra/llrender/llglslshader.h @@ -47,6 +47,7 @@ public: bool hasGamma; S32 mIndexedTextureChannels; bool disableTextureIndex; + bool hasAlphaMask; // char numLights; @@ -67,6 +68,8 @@ public: LLGLSLShader(); static GLhandleARB sCurBoundShader; + static LLGLSLShader* sCurBoundShaderPtr; + static bool sNoFixedFunction; void unload(); @@ -105,6 +108,8 @@ public: void uniformMatrix3fv(const std::string& uniform, U32 count, GLboolean transpose, const GLfloat *v); void uniformMatrix4fv(const std::string& uniform, U32 count, GLboolean transpose, const GLfloat *v); + void setAlphaRange(F32 minimum, F32 maximum); + void vertexAttrib4f(U32 index, GLfloat x, GLfloat y, GLfloat z, GLfloat w); void vertexAttrib4fv(U32 index, GLfloat* v); |