diff options
| author | Jacek Antonelli | 2008-08-15 23:45:50 -0500 |
|---|---|---|
| committer | Jacek Antonelli | 2008-08-15 23:45:50 -0500 |
| commit | 2a4dea528f670b9bb1f77ef27a8a1dd16603d114 (patch) | |
| tree | 95c68e362703c9099d571ecbdc6142b1cda1e005 /linden/indra/newview/llglslshader.h | |
| parent | Second Life viewer sources 1.20.6 (diff) | |
| download | meta-impy-2a4dea528f670b9bb1f77ef27a8a1dd16603d114.zip meta-impy-2a4dea528f670b9bb1f77ef27a8a1dd16603d114.tar.gz meta-impy-2a4dea528f670b9bb1f77ef27a8a1dd16603d114.tar.bz2 meta-impy-2a4dea528f670b9bb1f77ef27a8a1dd16603d114.tar.xz | |
Second Life viewer sources 1.20.7
Diffstat (limited to '')
| -rw-r--r-- | linden/indra/newview/llglslshader.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/linden/indra/newview/llglslshader.h b/linden/indra/newview/llglslshader.h index f3f83da..e517b94 100644 --- a/linden/indra/newview/llglslshader.h +++ b/linden/indra/newview/llglslshader.h | |||
| @@ -118,6 +118,9 @@ public: | |||
| 118 | void bind(); | 118 | void bind(); |
| 119 | void unbind(); | 119 | void unbind(); |
| 120 | 120 | ||
| 121 | // Unbinds any previously bound shader by explicitly binding no shader. | ||
| 122 | static void bindNoShader(void); | ||
| 123 | |||
| 121 | GLhandleARB mProgramObject; | 124 | GLhandleARB mProgramObject; |
| 122 | std::vector<GLint> mAttribute; //lookup table of attribute enum to attribute channel | 125 | std::vector<GLint> mAttribute; //lookup table of attribute enum to attribute channel |
| 123 | std::vector<GLint> mUniform; //lookup table of uniform enum to uniform location | 126 | std::vector<GLint> mUniform; //lookup table of uniform enum to uniform location |