From eca17c8993aecfd8d69c1b1765f8ac841ad29119 Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Mon, 30 May 2011 01:25:55 -0500
Subject: SH-1682 Full integration if indexed texture rendering to improve
 batch size.

---
 indra/llrender/llglslshader.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'indra/llrender/llglslshader.h')

diff --git a/indra/llrender/llglslshader.h b/indra/llrender/llglslshader.h
index d46ddbbe18..392688bba3 100644
--- a/indra/llrender/llglslshader.h
+++ b/indra/llrender/llglslshader.h
@@ -45,6 +45,7 @@ public:
 	bool hasObjectSkinning;
 	bool hasAtmospherics;
 	bool hasGamma;
+	bool disableTextureIndex;
 
 	// char numLights;
 	
-- 
cgit v1.2.3


From ece32418e7c1828a65c88e526a5afcb635c5453a Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Tue, 31 May 2011 14:35:59 -0500
Subject: SH-1682 Dynamically adjust the number of texture channels to use for
 indexed texture rendering based on available hardware.

---
 indra/llrender/llglslshader.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'indra/llrender/llglslshader.h')

diff --git a/indra/llrender/llglslshader.h b/indra/llrender/llglslshader.h
index 392688bba3..51be56b295 100644
--- a/indra/llrender/llglslshader.h
+++ b/indra/llrender/llglslshader.h
@@ -45,6 +45,7 @@ public:
 	bool hasObjectSkinning;
 	bool hasAtmospherics;
 	bool hasGamma;
+	S32 mIndexedTextureChannels;
 	bool disableTextureIndex;
 
 	// char numLights;
-- 
cgit v1.2.3


From 6992dbc1e32e1d8b803291aa1b87862fd6640c2a Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Wed, 1 Jun 2011 23:46:04 -0500
Subject: SH-1682 Use GL_ARB_map_buffer_range to mitigate impact of mapping
 larger vertex buffer objects.  Limit number of textures per batch to 6
 (prevents frame stalls on NVIDIA).

---
 indra/llrender/llglslshader.h | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'indra/llrender/llglslshader.h')

diff --git a/indra/llrender/llglslshader.h b/indra/llrender/llglslshader.h
index 51be56b295..4922eb6d67 100644
--- a/indra/llrender/llglslshader.h
+++ b/indra/llrender/llglslshader.h
@@ -66,6 +66,8 @@ public:
 	
 	LLGLSLShader();
 
+	static GLhandleARB sCurBoundShader;
+
 	void unload();
 	BOOL createShader(std::vector<std::string> * attributes,
 						std::vector<std::string> * uniforms);
-- 
cgit v1.2.3