diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-08-19 15:28:29 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-08-19 15:28:29 -0500 |
| commit | 1f6ad8bb697ef4bbd50b8338e1bc73944958266e (patch) | |
| tree | 5f55b159a8cfb6dad08f14567053796561db74a5 /indra/llrender/llglslshader.h | |
| parent | f40d2c5afb78f4a17b4753c42f6756dbd76a18c8 (diff) | |
| parent | 610764fbfce75f54c95d4b10c2a8f9482a7a7b80 (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); |