Use LLGLShader::sIndexTextureChannels instead of mNumTextureImageUnits directly.. also check that channel value isn't invalid. Also make super-sure shaders are disabled on pre opengl 2.0 hardware.

2011-10-20 13:37:09 -05:00
parent 22385c44c8
commit 73f2543a6f
5 changed files with 29 additions and 18 deletions
--- a/indra/llrender/llglslshader.h
+++ b/indra/llrender/llglslshader.h
@@ -77,6 +77,7 @@ public:

 	static GLhandleARB sCurBoundShader;
 	static LLGLSLShader* sCurBoundShaderPtr;
+	static S32 sIndexedTextureChannels;
 	static bool sNoFixedFunction;

 	void unload();