Batch indexing/no-fixed-function WIP.

2011-08-09 01:11:05 -05:00
parent 1e7415095c
commit 9bda97786f
225 changed files with 2120 additions and 729 deletions
--- a/indra/llrender/llglslshader.h
+++ b/indra/llrender/llglslshader.h
@@ -53,6 +53,8 @@ public:
 #endif //MESH_ENABLED
 	bool hasAtmospherics;
 	bool hasGamma;
+	S32 mIndexedTextureChannels;
+	bool disableTextureIndex;

 	// char numLights;
 	
@@ -72,6 +74,8 @@ public:
 	
 	LLGLSLShader(S32 shader_class);

+	static GLhandleARB sCurBoundShader;
+
 	void unload();
 	BOOL createShader(std::vector<std::string> * attributes,
 						std::vector<std::string> * uniforms);