diff options
| author | callum_linden <none@none> | 2013-06-28 13:36:41 -0700 |
|---|---|---|
| committer | callum_linden <none@none> | 2013-06-28 13:36:41 -0700 |
| commit | bd41392b7ec1dd90cd0039d87bbbef8beda1796a (patch) | |
| tree | aa01ba89c055c5ed427c25227f894fd41b55a220 /indra/llrender/llglslshader.h | |
| parent | 4696eeeb30ce4d01c3bcbe74c9024f05d848968a (diff) | |
| parent | b6b4b5913827ca864dac94c72a127f520288ef8e (diff) | |
Merge with viewer-bear which was just merged with viewer-release
Diffstat (limited to 'indra/llrender/llglslshader.h')
| -rwxr-xr-x | indra/llrender/llglslshader.h | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/indra/llrender/llglslshader.h b/indra/llrender/llglslshader.h index 22f91cd6a2..be2782dfda 100755 --- a/indra/llrender/llglslshader.h +++ b/indra/llrender/llglslshader.h @@ -111,6 +111,19 @@ public: void uniform2fv(U32 index, U32 count, const GLfloat* v); void uniform3fv(U32 index, U32 count, const GLfloat* v); void uniform4fv(U32 index, U32 count, const GLfloat* v); + + void uniform1i(const std::string& uniform, GLint i); + void uniform2i(const std::string& uniform, GLint i, GLint j); + void uniform1f(const std::string& uniform, GLfloat v); + void uniform2f(const std::string& uniform, GLfloat x, GLfloat y); + void uniform3f(const std::string& uniform, GLfloat x, GLfloat y, GLfloat z); + void uniform4f(const std::string& uniform, GLfloat x, GLfloat y, GLfloat z, GLfloat w); + void uniform1iv(const std::string& uniform, U32 count, const GLint* i); + void uniform1fv(const std::string& uniform, U32 count, const GLfloat* v); + void uniform2fv(const std::string& uniform, U32 count, const GLfloat* v); + void uniform3fv(const std::string& uniform, U32 count, const GLfloat* v); + void uniform4fv(const std::string& uniform, U32 count, const GLfloat* v); + void uniformMatrix2fv(U32 index, U32 count, GLboolean transpose, const GLfloat *v); void uniformMatrix3fv(U32 index, U32 count, GLboolean transpose, const GLfloat *v); void uniformMatrix4fv(U32 index, U32 count, GLboolean transpose, const GLfloat *v); @@ -190,6 +203,11 @@ public: static U64 sTotalSamplesDrawn; U32 mDrawCalls; static U32 sTotalDrawCalls; + + bool mTextureStateFetched; + std::vector<U32> mTextureMagFilter; + std::vector<U32> mTextureMinFilter; + }; //UI shader (declared here so llui_libtest will link properly) |