Batch indexing/no-fixed-function WIP.

indra/llrender/llgl.cpp

@@ -538,7 +538,7 @@ bool LLGLManager::initGL()
 	{
 		GLint num_tex_image_units;
 		glGetIntegerv(GL_MAX_TEXTURE_IMAGE_UNITS_ARB, &num_tex_image_units);
-		mNumTextureImageUnits = num_tex_image_units;
+		mNumTextureImageUnits = llmin(num_tex_image_units, 32);
 	}
 
 	initGLStates();
@@ -1299,6 +1299,7 @@ void LLGLState::checkStates(const std::string& msg)
 
 void LLGLState::checkTextureChannels(const std::string& msg)
 {
+#if 0
 	if (!gDebugGL)
 	{
 		return;
@@ -1458,6 +1459,7 @@ void LLGLState::checkTextureChannels(const std::string& msg)
 			LL_GL_ERRS << "GL texture state corruption detected.  " << msg << LL_ENDL;
 		}
 	}
+#endif
 }
 
 void LLGLState::checkClientArrays(const std::string& msg, U32 data_mask)
@@ -1574,7 +1576,7 @@ void LLGLState::checkClientArrays(const std::string& msg, U32 data_mask)
 		}
 	}
 
-	if (glIsEnabled(GL_TEXTURE_2D))
+	/*if (glIsEnabled(GL_TEXTURE_2D))
 	{
 		if (!(data_mask & 0x0008))
 		{
@@ -1597,7 +1599,7 @@ void LLGLState::checkClientArrays(const std::string& msg, U32 data_mask)
 				gFailLog << "GL does not have GL_TEXTURE_2D enabled on channel 1." << std::endl;
 			}
 		}
-	}
+	}*/
 
 	glClientActiveTextureARB(GL_TEXTURE0_ARB);
 	gGL.getTexUnit(0)->activate();

indra/llrender/llglslshader.cpp

@@ -54,6 +54,7 @@ using std::pair;
 using std::make_pair;
 using std::string;
 
+GLhandleARB LLGLSLShader::sCurBoundShader = 0;
 BOOL shouldChange(const LLVector4& v1, const LLVector4& v2)
 {
 	return v1 != v2;
@@ -63,6 +64,7 @@ LLShaderFeatures::LLShaderFeatures()
 : calculatesLighting(false), isShiny(false), isFullbright(false), hasWaterFog(false),
 hasTransport(false), hasSkinning(false), hasAtmospherics(false), isSpecular(false),
 hasGamma(false), hasLighting(false), calculatesAtmospherics(false)
+, mIndexedTextureChannels(0), disableTextureIndex(false)
 #if MESH_ENABLED
 , hasObjectSkinning(false)
 #endif //MESH_ENABLED
@@ -119,6 +121,27 @@ BOOL LLGLSLShader::createShader(vector<string> * attributes,
 		glDeleteObjectARB(mProgramObject);
 	// Create program
 	mProgramObject = glCreateProgramObjectARB();
+
+	if (gGLManager.mGLVersion < 3.1f)
+	{ //force indexed texture channels to 1 if GL version is old (performance improvement for drivers with poor branching shader model support)
+		mFeatures.mIndexedTextureChannels = llmin(mFeatures.mIndexedTextureChannels, 1);
+	}
+
+	//compile new source
+	vector< pair<string,GLenum> >::iterator fileIter = mShaderFiles.begin();
+	for ( ; fileIter != mShaderFiles.end(); fileIter++ )
+	{
+		GLhandleARB shaderhandle = LLShaderMgr::instance()->loadShaderFile((*fileIter).first, mShaderLevel, (*fileIter).second, mFeatures.mIndexedTextureChannels);
+		LL_DEBUGS("ShaderLoading") << "SHADER FILE: " << (*fileIter).first << " mShaderLevel=" << mShaderLevel << LL_ENDL;
+		if (shaderhandle > 0)
+		{
+			attachObject(shaderhandle);
+		}
+		else
+		{
+			success = FALSE;
+		}
+	}
 	
 	// Attach existing objects
 	if (!LLShaderMgr::instance()->attachShaderFeatures(this))
@@ -129,19 +152,9 @@ BOOL LLGLSLShader::createShader(vector<string> * attributes,
 		return FALSE;
 	}
 
-	vector< pair<string,GLenum> >::iterator fileIter = mShaderFiles.begin();
-	for ( ; fileIter != mShaderFiles.end(); fileIter++ )
-	{
-		GLhandleARB shaderhandle = LLShaderMgr::instance()->loadShaderFile((*fileIter).first, mShaderLevel, (*fileIter).second);
-		LL_DEBUGS("ShaderLoading") << "SHADER FILE: " << (*fileIter).first << " mShaderLevel=" << mShaderLevel << LL_ENDL;
-		if (mShaderLevel > 0)
-		{
-			attachObject(shaderhandle);
-		}
-		else
-		{
-			success = FALSE;
-		}
+	if (gGLManager.mGLVersion < 3.1f)
+	{ //attachShaderFeatures may have set the number of indexed texture channels, so set to 1 again
+		mFeatures.mIndexedTextureChannels = llmin(mFeatures.mIndexedTextureChannels, 1);
 	}
 
 	// Map attributes and uniforms
@@ -169,6 +182,28 @@ BOOL LLGLSLShader::createShader(vector<string> * attributes,
 			return createShader(attributes,uniforms);
 		}
 	}
+	else if (mFeatures.mIndexedTextureChannels > 0)
+	{ //override texture channels for indexed texture rendering
+		bind();
+		S32 channel_count = mFeatures.mIndexedTextureChannels;
+
+		for (S32 i = 0; i < channel_count; i++)
+		{
+			uniform1i(llformat("tex%d", i), i);
+		}
+
+		S32 cur_tex = channel_count; //adjust any texture channels that might have been overwritten
+		for (U32 i = 0; i < mTexture.size(); i++)
+		{
+			if (mTexture[i] > -1 && mTexture[i] < channel_count)
+			{
+				llassert(cur_tex < gGLManager.mNumTextureImageUnits);
+				uniform1i(i, cur_tex);
+				mTexture[i] = cur_tex++;
+			}
+		}
+		unbind();
+	}
 	return success;
 }
 
@@ -363,7 +398,7 @@ void LLGLSLShader::bind()
 	if (gGLManager.mHasShaderObjects)
 	{
 		glUseProgramObjectARB(mProgramObject);
-
+		sCurBoundShader = mProgramObject;
 		if (mUniformsDirty)
 		{
 			LLShaderMgr::instance()->updateShaderUniforms(this);
@@ -386,6 +421,7 @@ void LLGLSLShader::unbind()
 			}
 		}
 		glUseProgramObjectARB(0);
+		sCurBoundShader = 0;
 		stop_glerror();
 	}
 }
@@ -393,6 +429,7 @@ void LLGLSLShader::unbind()
 void LLGLSLShader::bindNoShader(void)
 {
 	glUseProgramObjectARB(0);
+	sCurBoundShader = 0;
 }
 
 S32 LLGLSLShader::enableTexture(S32 uniform, LLTexUnit::eTextureType mode)

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);

indra/llrender/llimagegl.cpp

@@ -1404,11 +1404,13 @@ void LLImageGL::deleteDeadTextures()
 	{
 		GLuint tex = sDeadTextureList.front();
 		sDeadTextureList.pop_front();
-		for (int i = 0; i < gGLManager.mNumTextureUnits; i++)
+		for (int i = 0; i < gGLManager.mNumTextureImageUnits; i++)
 		{
-			if (sCurrentBoundTextures[i] == tex)
+			LLTexUnit* tex_unit = gGL.getTexUnit(i);
+
+			if (tex_unit->getCurrTexture() == tex)
 			{
-				gGL.getTexUnit(i)->unbind(LLTexUnit::TT_TEXTURE);
+				tex_unit->unbind(tex_unit->getCurrType());
 				stop_glerror();
 			}
 		}

indra/llrender/llrender.cpp

@@ -49,7 +49,8 @@ F64 gGLLastProjection[16];
 F64 gGLProjection[16];
 S32	gGLViewport[4];
 
-static const U32 LL_NUM_TEXTURE_LAYERS = 8; 
+
+static const U32 LL_NUM_TEXTURE_LAYERS = 32; 
 static const U32 LL_NUM_LIGHT_UNITS = 8;
 
 static GLenum sGLTextureType[] =

indra/llrender/llshadermgr.cpp

@@ -217,17 +217,39 @@ BOOL LLShaderMgr::attachShaderFeatures(LLGLSLShader * shader)
 	
 		if (features->hasWaterFog)
 		{
-			if (!shader->attachObject("lighting/lightWaterF.glsl"))
+			if (features->disableTextureIndex)
 			{
-				return FALSE;
+				if (!shader->attachObject("lighting/lightWaterNonIndexedF.glsl"))
+				{
+					return FALSE;
+				}
+			}
+			else 
+			{
+				if (!shader->attachObject("lighting/lightWaterF.glsl"))
+				{
+					return FALSE;
+				}
+				shader->mFeatures.mIndexedTextureChannels = gGLManager.mNumTextureImageUnits-1;
 			}
 		}
 		
 		else
 		{
-			if (!shader->attachObject("lighting/lightF.glsl"))
+			if (features->disableTextureIndex)
 			{
-				return FALSE;
+				if (!shader->attachObject("lighting/lightNonIndexedF.glsl"))
+				{
+					return FALSE;
+				}
+			}
+			else 
+			{
+				if (!shader->attachObject("lighting/lightF.glsl"))
+				{
+					return FALSE;
+				}
+				shader->mFeatures.mIndexedTextureChannels = gGLManager.mNumTextureImageUnits-1;
 			}
 		}		
 	}
@@ -238,32 +260,76 @@ BOOL LLShaderMgr::attachShaderFeatures(LLGLSLShader * shader)
 	
 		if (features->isShiny && features->hasWaterFog)
 		{
-			if (!shader->attachObject("lighting/lightFullbrightShinyWaterF.glsl"))
+			if (features->disableTextureIndex)
 			{
-				return FALSE;
+				if (!shader->attachObject("lighting/lightFullbrightShinyWaterNonIndexedF.glsl"))
+				{
+					return FALSE;
+				}
+			}
+			else 
+			{
+				if (!shader->attachObject("lighting/lightFullbrightShinyWaterF.glsl"))
+				{
+					return FALSE;
+				}
+				shader->mFeatures.mIndexedTextureChannels = gGLManager.mNumTextureImageUnits-1;
 			}
 		}
 		else if (features->hasWaterFog)
 		{
-			if (!shader->attachObject("lighting/lightFullbrightWaterF.glsl"))
+			if (features->disableTextureIndex)
 			{
-				return FALSE;
+				if (!shader->attachObject("lighting/lightFullbrightWaterNonIndexedF.glsl"))
+				{
+					return FALSE;
+				}
+			}
+			else 
+			{
+				if (!shader->attachObject("lighting/lightFullbrightWaterF.glsl"))
+				{
+					return FALSE;
+				}
+				shader->mFeatures.mIndexedTextureChannels = gGLManager.mNumTextureImageUnits-1;
 			}
 		}
 		
 		else if (features->isShiny)
 		{
-			if (!shader->attachObject("lighting/lightFullbrightShinyF.glsl"))
+			if (features->disableTextureIndex)
 			{
-				return FALSE;
+				if (!shader->attachObject("lighting/lightFullbrightShinyNonIndexedF.glsl"))
+				{
+					return FALSE;
+				}
+			}
+			else 
+			{
+				if (!shader->attachObject("lighting/lightFullbrightShinyF.glsl"))
+				{
+					return FALSE;
+				}
+				shader->mFeatures.mIndexedTextureChannels = gGLManager.mNumTextureImageUnits-1;
 			}
 		}
 		
 		else
 		{
-			if (!shader->attachObject("lighting/lightFullbrightF.glsl"))
+			if (features->disableTextureIndex)
 			{
-				return FALSE;
+				if (!shader->attachObject("lighting/lightFullbrightNonIndexedF.glsl"))
+				{
+					return FALSE;
+				}
+			}
+			else 
+			{
+				if (!shader->attachObject("lighting/lightFullbrightF.glsl"))
+				{
+					return FALSE;
+				}
+				shader->mFeatures.mIndexedTextureChannels = gGLManager.mNumTextureImageUnits-1;
 			}
 		}
 	}
@@ -274,17 +340,39 @@ BOOL LLShaderMgr::attachShaderFeatures(LLGLSLShader * shader)
 	
 		if (features->hasWaterFog)
 		{
-			if (!shader->attachObject("lighting/lightShinyWaterF.glsl"))
+			if (features->disableTextureIndex)
 			{
-				return FALSE;
+				if (!shader->attachObject("lighting/lightShinyWaterNonIndexedF.glsl"))
+				{
+					return FALSE;
+				}
+			}
+			else 
+			{
+				if (!shader->attachObject("lighting/lightShinyWaterF.glsl"))
+				{
+					return FALSE;
+				}
+				shader->mFeatures.mIndexedTextureChannels = gGLManager.mNumTextureImageUnits-1;
 			}
 		}
 		
 		else 
 		{
-			if (!shader->attachObject("lighting/lightShinyF.glsl"))
+			if (features->disableTextureIndex)
 			{
-				return FALSE;
+				if (!shader->attachObject("lighting/lightShinyNonIndexedF.glsl"))
+				{
+					return FALSE;
+				}
+			}
+			else 
+			{
+				if (!shader->attachObject("lighting/lightShinyF.glsl"))
+				{
+					return FALSE;
+				}
+				shader->mFeatures.mIndexedTextureChannels = gGLManager.mNumTextureImageUnits-1;
 			}
 		}
 	}
@@ -328,13 +416,16 @@ void LLShaderMgr::dumpObjectLog(GLhandleARB ret, BOOL warns)
 	}
 }
 
-GLhandleARB LLShaderMgr::loadShaderFile(const std::string& filename, S32 & shader_level, GLenum type)
+GLhandleARB LLShaderMgr::loadShaderFile(const std::string& filename, S32 & shader_level, GLenum type, S32 texture_index_channels)
 {
-	GLenum error;
-	error = glGetError();
-	if (error != GL_NO_ERROR)
+	GLenum error = GL_NO_ERROR;
+	if (gDebugGL)
 	{
-		LL_WARNS("ShaderLoading") << "GL ERROR entering loadShaderFile(): " << error << LL_ENDL;
+		error = glGetError();
+		if (error != GL_NO_ERROR)
+		{
+			LL_WARNS("ShaderLoading") << "GL ERROR entering loadShaderFile(): " << error << LL_ENDL;
+		}
 	}
 	
 	LL_DEBUGS("ShaderLoading") << "Loading shader file: " << filename << " class " << shader_level << LL_ENDL;
@@ -375,11 +466,121 @@ GLhandleARB LLShaderMgr::loadShaderFile(const std::string& filename, S32 & shade
 
 	//we can't have any lines longer than 1024 characters 
 	//or any shaders longer than 1024 lines... deal - DaveP
-	GLcharARB buff[1024];
-	GLcharARB* text[1024];
+	GLcharARB buff[1024] = {0};
+	GLcharARB* text[1024] = {0};
 	GLuint count = 0;
 
+	if (gGLManager.mGLVersion < 2.1f)
+	{
+		text[count++] = strdup("#version 110\n");
+	}
+	else if (gGLManager.mGLVersion < 3.f)
+	{
+		//set version to 1.20
+		text[count++] = strdup("#version 120\n");
+	}
+	else
+	{  //set version to 1.30
+		text[count++] = strdup("#version 130\n");
+	}
 
+	//copy preprocessor definitions into buffer
+	for (std::map<std::string,std::string>::iterator iter = mDefinitions.begin(); iter != mDefinitions.end(); ++iter)
+	{
+		std::string define = "#define " + iter->first + " " + iter->second + "\n";
+		text[count++] = (GLcharARB *) strdup(define.c_str());
+	}
+
+	if (texture_index_channels > 0 && type == GL_FRAGMENT_SHADER_ARB)
+	{
+		//use specified number of texture channels for indexed texture rendering
+
+		/* prepend shader code that looks like this:
+
+		uniform sampler2D tex0;
+		uniform sampler2D tex1;
+		uniform sampler2D tex2;
+		.
+		.
+		.
+		uniform sampler2D texN;
+		
+		varying float vary_texture_index;
+
+		vec4 diffuseLookup(vec2 texcoord)
+		{
+			switch (int(vary_texture_index+0.25))
+			{
+				case 0: return texture2D(tex0, texcoord);
+				case 1: return texture2D(tex1, texcoord);
+				case 2: return texture2D(tex2, texcoord);
+				.
+				.
+				.
+				case N: return texture2D(texN, texcoord);
+			}
+
+			return vec4(0,0,0,0);
+		}
+		*/
+
+		//uniform declartion
+		for (S32 i = 0; i < texture_index_channels; ++i)
+		{
+			std::string decl = llformat("uniform sampler2D tex%d;\n", i);
+			text[count++] = strdup(decl.c_str());
+		}
+
+		text[count++] = strdup("varying float vary_texture_index;\n");
+		text[count++] = strdup("vec4 diffuseLookup(vec2 texcoord)\n");
+		text[count++] = strdup("{\n");
+		
+		
+		if (texture_index_channels == 1)
+		{ //don't use flow control, that's silly
+			text[count++] = strdup("return texture2D(tex0, texcoord);\n");
+			text[count++] = strdup("}\n");
+		}
+		else if (gGLManager.mGLVersion >= 3.f)
+		{ 
+			text[count++] = strdup("\tswitch (int(vary_texture_index+0.25))\n");
+			text[count++] = strdup("\t{\n");
+		
+			//switch body
+			for (S32 i = 0; i < texture_index_channels; ++i)
+			{
+				std::string case_str = llformat("\t\tcase %d: return texture2D(tex%d, texcoord);\n", i, i);
+				text[count++] = strdup(case_str.c_str());
+			}
+
+			text[count++] = strdup("\t}\n");
+			text[count++] = strdup("\treturn vec4(0,0,0,0);\n");
+			text[count++] = strdup("}\n");
+		}
+		else
+		{
+			//switches aren't supported, make block that looks like:
+			/*
+				int ti = int(vary_texture_index+0.25);
+				if (ti == 0) return texture2D(tex0, texcoord);
+				if (ti == 1) return texture2D(tex1, texcoord);
+				.
+				.
+				.
+				if (ti == N) return texture2D(texN, texcoord);
+			*/
+				
+			text[count++] = strdup("int ti = int(vary_texture_index+0.25);\n");
+			for (S32 i = 0; i < texture_index_channels; ++i)
+			{
+				std::string if_str = llformat("if (ti == %d) return texture2D(tex%d, texcoord);\n", i, i);
+				text[count++] = strdup(if_str.c_str());
+			}
+
+			text[count++] = strdup("\treturn vec4(0,0,0,0);\n");
+			text[count++] = strdup("}\n");
+		}			
+	}
 	//copy file into memory
 	while( fgets((char *)buff, 1024, file) != NULL && count < LL_ARRAY_SIZE(buff) ) 
 	{
@@ -389,51 +590,67 @@ GLhandleARB LLShaderMgr::loadShaderFile(const std::string& filename, S32 & shade
 
 	//create shader object
 	GLhandleARB ret = glCreateShaderObjectARB(type);
-	error = glGetError();
-	if (error != GL_NO_ERROR)
+	if (gDebugGL)
 	{
-		LL_WARNS("ShaderLoading") << "GL ERROR in glCreateShaderObjectARB: " << error << LL_ENDL;
+		error = glGetError();
+		if (error != GL_NO_ERROR)
+		{
+			LL_WARNS("ShaderLoading") << "GL ERROR in glCreateShaderObjectARB: " << error << LL_ENDL;
+			glDeleteObjectARB(ret); //no longer need handle
+		}
 	}
-	else
+	
+	//load source
+	glShaderSourceARB(ret, count, (const GLcharARB**) text, NULL);
+
+	if (gDebugGL)
 	{
-		//load source
-		glShaderSourceARB(ret, count, (const GLcharARB**) text, NULL);
 		error = glGetError();
 		if (error != GL_NO_ERROR)
 		{
 			LL_WARNS("ShaderLoading") << "GL ERROR in glShaderSourceARB: " << error << LL_ENDL;
 			glDeleteObjectARB(ret); //no longer need handle
 		}
-		else
+	}
+
+	//compile source
+	glCompileShaderARB(ret);
+
+	if (gDebugGL)
+	{
+		error = glGetError();
+		if (error != GL_NO_ERROR)
 		{
-			//compile source
-			glCompileShaderARB(ret);
-			error = glGetError();
-			if (error != GL_NO_ERROR)
-			{
-				LL_WARNS("ShaderLoading") << "GL ERROR in glCompileShaderARB: " << error << LL_ENDL;
-				glDeleteObjectARB(ret); //no longer need handle
-			}
+			LL_WARNS("ShaderLoading") << "GL ERROR in glCompileShaderARB: " << error << LL_ENDL;
+			glDeleteObjectARB(ret); //no longer need handle
 		}
 	}
-	//free memory
-	for (GLuint i = 0; i < count; i++)
-	{
-		free(text[i]);
-	}
+
 	if (error == GL_NO_ERROR)
 	{
 		//check for errors
 		GLint success = GL_TRUE;
 		glGetObjectParameterivARB(ret, GL_OBJECT_COMPILE_STATUS_ARB, &success);
-		error = glGetError();
-		if (error != GL_NO_ERROR || success == GL_FALSE) 
+		if (gDebugGL || success == GL_FALSE)
 		{
-			//an error occured, print log
-			LL_WARNS("ShaderLoading") << "GLSL Compilation Error: (" << error << ") in " << filename << LL_ENDL;
-			dumpObjectLog(ret);
-			glDeleteObjectARB(ret); //no longer need handle
-			ret = 0;
+			error = glGetError();
+			if (error != GL_NO_ERROR || success == GL_FALSE) 
+			{
+				//an error occured, print log
+				LL_WARNS("ShaderLoading") << "GLSL Compilation Error: (" << error << ") in " << filename << LL_ENDL;
+				dumpObjectLog(ret);
+
+				std::stringstream ostr;
+				//dump shader source for debugging
+				for (GLuint i = 0; i < count; i++)
+				{
+					ostr << i << ": " << text[i];
+				}
+
+				LL_WARNS("ShaderLoading") << "\n" << ostr.str() << llendl;
+				glDeleteObjectARB(ret); //no longer need handle
+				ret = 0;
+			}	
 		}
 	}
 	else
@@ -442,6 +659,12 @@ GLhandleARB LLShaderMgr::loadShaderFile(const std::string& filename, S32 & shade
 	}
 	stop_glerror();
 
+	//free memory
+	for (GLuint i = 0; i < count; i++)
+	{
+		free(text[i]);
+	}
+
 	//successfully loaded, save results
 	if (ret)
 	{
@@ -454,7 +677,7 @@ GLhandleARB LLShaderMgr::loadShaderFile(const std::string& filename, S32 & shade
 		if (shader_level > 1)
 		{
 			shader_level--;
-			return loadShaderFile(filename,shader_level,type);
+			return loadShaderFile(filename,shader_level,type,texture_index_channels);
 		}
 		LL_WARNS("ShaderLoading") << "Failed to load " << filename << LL_ENDL;	
 	}

indra/llrender/llshadermgr.h

@@ -49,7 +49,7 @@ public:
 	void dumpObjectLog(GLhandleARB ret, BOOL warns = TRUE);
 	BOOL	linkProgramObject(GLhandleARB obj, BOOL suppress_errors = FALSE);
 	BOOL	validateProgramObject(GLhandleARB obj);
-	GLhandleARB loadShaderFile(const std::string& filename, S32 & shader_level, GLenum type);
+	GLhandleARB loadShaderFile(const std::string& filename, S32 & shader_level, GLenum type, S32 texture_index_channels = -1);
 
 	// Implemented in the application to actually point to the shader directory.
 	virtual std::string getShaderDirPrefix(void) = 0; // Pure Virtual
@@ -66,6 +66,9 @@ public:
 
 	std::vector<std::string> mReservedUniforms;
 
+	//preprocessor definitions (name/value)
+	std::map<std::string, std::string> mDefinitions;
+
 protected:
 
 	// our parameter manager singleton instance

indra/llrender/llvertexbuffer.cpp

@@ -1152,7 +1152,7 @@ volatile U8* LLVertexBuffer::mapIndexBuffer(S32 index)
 void LLVertexBuffer::unmapBuffer(S32 type)
 {
 	LLMemType mt(LLMemType::MTYPE_VERTEX_DATA);
-	if (!useVBOs())
+	if (!useVBOs() || type == -2)
 	{
 		return ; //nothing to unmap
 	}
@@ -1605,7 +1605,14 @@ void LLVertexBuffer::setupVertexBuffer(U32 data_mask) const
 	}
 	if (data_mask & MAP_VERTEX)
 	{
-		glVertexPointer(3,GL_FLOAT, getStride(TYPE_VERTEX), (void*)(base + 0));
+		if (data_mask & MAP_TEXTURE_INDEX)
+		{
+			glVertexPointer(4,GL_FLOAT, getStride(TYPE_VERTEX), (void*)(base + 0));
+		}
+		else
+		{
+			glVertexPointer(3,GL_FLOAT, getStride(TYPE_VERTEX), (void*)(base + 0));
+		}
 	}
 
 	llglassertok();

indra/llrender/llvertexbuffer.h

@@ -127,6 +127,9 @@ public:
 		TYPE_CLOTHWEIGHT,
 		TYPE_MAX,
 		TYPE_INDEX,
+		
+		//no actual additional data, but indicates position.w is texture index
+		TYPE_TEXTURE_INDEX,
 	};
 	enum {
 		MAP_VERTEX = (1<<TYPE_VERTEX),
@@ -141,6 +144,7 @@ public:
 		MAP_WEIGHT = (1<<TYPE_WEIGHT),
 		MAP_WEIGHT4 = (1<<TYPE_WEIGHT4),
 		MAP_CLOTHWEIGHT = (1<<TYPE_CLOTHWEIGHT),
+		MAP_TEXTURE_INDEX = (1<<TYPE_TEXTURE_INDEX),
 	};
 	
 protected:

indra/newview/app_settings/settings.xml

@@ -9546,17 +9546,28 @@
       <key>Value</key>
       <integer>0</integer>
     </map>
-    <key>RenderDebugPipeline</key>
+  <key>RenderDebugPipeline</key>
     <map>
       <key>Comment</key>
       <string>Enable strict pipeline debugging.</string>
       <key>Persist</key>
       <integer>1</integer>
       <key>Type</key>
-      <string>Boolean</string>
+      <string>Boolean</string> 
       <key>Value</key>
       <integer>0</integer>
     </map>
+  <key>RenderMaxTextureIndex</key>
+  <map>
+    <key>Comment</key>
+    <string>Maximum texture index to use for indexed texture rendering.</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>U32</string>
+    <key>Value</key>
+    <integer>6</integer>
+  </map>
     <key>RenderDebugTextureBind</key>
     <map>
       <key>Comment</key>
@@ -9859,6 +9870,18 @@
     <key>Value</key>
     <real>0</real>
   </map>
+
+  <key>RenderDepthOfField</key>
+  <map>
+    <key>Comment</key>
+    <string>Whether to use depth of field effect when lighting and shadows are enabled</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>Boolean</string>
+    <key>Value</key>
+    <integer>0</integer>
+  </map>
   
   <key>RenderSpotLightsInNondeferred</key>
   <map>
@@ -9881,7 +9904,7 @@
     <key>Type</key>
     <string>F32</string>
     <key>Value</key>
-    <real>0.0</real>
+    <real>-0.001</real>
   </map>
   <key>RenderSpotShadowOffset</key>
   <map>

indra/newview/app_settings/shaders/class1/avatar/avatarF.glsl

@@ -5,7 +5,6 @@
  * $License$
  */
  
-#version 120
 
 void default_lighting();
 

indra/newview/app_settings/shaders/class1/avatar/avatarSkinV.glsl

@@ -5,7 +5,7 @@
  * $License$
  */
  
-#version 120
+
 
 attribute vec4 weight;  //1
 

indra/newview/app_settings/shaders/class1/avatar/avatarV.glsl

@@ -5,7 +5,6 @@
  * $License$
  */
  
-#version 120
 
 vec4 calcLighting(vec3 pos, vec3 norm, vec4 color, vec4 baseCol);
 mat4 getSkinnedTransform();

indra/newview/app_settings/shaders/class1/avatar/eyeballF.glsl

@@ -5,7 +5,6 @@
  * $License$
  */
  
-#version 120
 
 void default_lighting();
 

indra/newview/app_settings/shaders/class1/avatar/eyeballV.glsl

@@ -5,7 +5,7 @@
  * $License$
  */
  
-#version 120
+
 
 vec4 calcLightingSpecular(vec3 pos, vec3 norm, vec4 color, inout vec4 specularColor, vec4 baseCol);
 void calcAtmospherics(vec3 inPositionEye);

indra/newview/app_settings/shaders/class1/avatar/objectSkinV.glsl

@@ -5,7 +5,7 @@
  * $License$
  */
 
-#version 120
+
 
 attribute vec4 object_weight;  
 

indra/newview/app_settings/shaders/class1/avatar/pickAvatarF.glsl

@@ -5,7 +5,7 @@
  * $License$
  */
  
-#version 120
+
 
 uniform sampler2D diffuseMap;
 

indra/newview/app_settings/shaders/class1/avatar/pickAvatarV.glsl

@@ -5,7 +5,7 @@
  * $License$
  */
  
-#version 120
+
 
 mat4 getSkinnedTransform();
 

indra/newview/app_settings/shaders/class1/deferred/alphaF.glsl

@@ -1,17 +1,18 @@
 /** 
  * @file alphaF.glsl
  *
- * Copyright (c) 2007-$CurrentYear$, Linden Research, Inc.
- * $License$
+ * $LicenseInfo:firstyear=2007&license=viewerlgpl$
+ * $/LicenseInfo$
  */
  
-#version 120
+
 
 #extension GL_ARB_texture_rectangle : enable
 
-uniform sampler2D diffuseMap;
 uniform sampler2DRect depthMap;
 
+vec4 diffuseLookup(vec2 texcoord);
+
 uniform mat4 shadow_matrix[6];
 uniform vec4 shadow_clip;
 uniform vec2 screen_res;
@@ -47,7 +48,7 @@ void main()
 	
 	vec4 pos = vec4(vary_position, 1.0);
 	
-	vec4 diff= texture2D(diffuseMap, gl_TexCoord[0].xy);
+	vec4 diff= diffuseLookup(gl_TexCoord[0].xy);
 	
 	vec4 col = vec4(vary_ambient + vary_directional.rgb, gl_Color.a);
 	vec4 color = diff * col;

indra/newview/app_settings/shaders/class1/deferred/alphaNonIndexedF.glsl

@@ -0,0 +1,67 @@
+/** 
+ * @file alphaF.glsl
+ *
+ * $LicenseInfo:firstyear=2007&license=viewerlgpl$
+ * $/LicenseInfo$
+ */
+ 
+
+
+#extension GL_ARB_texture_rectangle : enable
+
+uniform sampler2DRect depthMap;
+uniform sampler2D diffuseMap;
+
+
+uniform mat4 shadow_matrix[6];
+uniform vec4 shadow_clip;
+uniform vec2 screen_res;
+
+vec3 atmosLighting(vec3 light);
+vec3 scaleSoftClip(vec3 light);
+
+varying vec3 vary_ambient;
+varying vec3 vary_directional;
+varying vec3 vary_fragcoord;
+varying vec3 vary_position;
+varying vec3 vary_pointlight_col;
+
+uniform mat4 inv_proj;
+
+vec4 getPosition(vec2 pos_screen)
+{
+	float depth = texture2DRect(depthMap, pos_screen.xy).a;
+	vec2 sc = pos_screen.xy*2.0;
+	sc /= screen_res;
+	sc -= vec2(1.0,1.0);
+	vec4 ndc = vec4(sc.x, sc.y, 2.0*depth-1.0, 1.0);
+	vec4 pos = inv_proj * ndc;
+	pos /= pos.w;
+	pos.w = 1.0;
+	return pos;
+}
+
+void main() 
+{
+	vec2 frag = vary_fragcoord.xy/vary_fragcoord.z*0.5+0.5;
+	frag *= screen_res;
+	
+	vec4 pos = vec4(vary_position, 1.0);
+	
+	vec4 diff= texture2D(diffuseMap,gl_TexCoord[0].xy);
+
+	vec4 col = vec4(vary_ambient + vary_directional.rgb, gl_Color.a);
+	vec4 color = diff * col;
+	
+	color.rgb = atmosLighting(color.rgb);
+
+	color.rgb = scaleSoftClip(color.rgb);
+
+	color.rgb += diff.rgb * vary_pointlight_col.rgb;
+
+	gl_FragColor = color;
+	//gl_FragColor = vec4(1,0,1,1);
+	//gl_FragColor = vec4(1,0,1,1)*shadow;
+	
+}
+

indra/newview/app_settings/shaders/class1/deferred/alphaSkinnedV.glsl

@@ -5,7 +5,7 @@
  * $License$
  */
  
-#version 120
+
 
 vec4 calcLighting(vec3 pos, vec3 norm, vec4 color, vec4 baseCol);
 mat4 getObjectSkinnedTransform();

indra/newview/app_settings/shaders/class1/deferred/alphaV.glsl

@@ -5,7 +5,7 @@
  * $License$
  */
 
-#version 120
+
 
 vec4 calcLighting(vec3 pos, vec3 norm, vec4 color, vec4 baseCol);
 void calcAtmospherics(vec3 inPositionEye);
@@ -23,6 +23,7 @@ varying vec3 vary_fragcoord;
 varying vec3 vary_position;
 varying vec3 vary_light;
 varying vec3 vary_pointlight_col;
+varying float vary_texture_index;
 
 uniform float near_clip;
 uniform float shadow_offset;
@@ -35,20 +36,25 @@ float calcPointLightOrSpotLight(vec3 v, vec3 n, vec4 lp, vec3 ln, float la, floa
 
 	//get distance
 	float d = length(lv);
-
-	//normalize light vector
-	lv *= 1.0/d;
-
-	//distance attenuation
-	float dist2 = d*d/(la*la);
-	float da = clamp(1.0-(dist2-1.0*(1.0-fa))/fa, 0.0, 1.0);
-
-	// spotlight coefficient.
-	float spot = max(dot(-ln, lv), is_pointlight);
-	da *= spot*spot; // GL_SPOT_EXPONENT=2
 	
-	//angular attenuation
-	da *= calcDirectionalLight(n, lv);
+	float da = 0.0;
+
+	if (d > 0.0 && la > 0.0 && fa > 0.0)
+	{
+		//normalize light vector
+		lv *= 1.0/d;
+	
+		//distance attenuation
+		float dist2 = d*d/(la*la);
+		da = clamp(1.0-(dist2-1.0*(1.0-fa))/fa, 0.0, 1.0);
+
+		// spotlight coefficient.
+		float spot = max(dot(-ln, lv), is_pointlight);
+		da *= spot*spot; // GL_SPOT_EXPONENT=2
+
+		//angular attenuation
+		da *= calcDirectionalLight(n, lv);
+	}
 
 	return da;
 }
@@ -56,34 +62,35 @@ float calcPointLightOrSpotLight(vec3 v, vec3 n, vec4 lp, vec3 ln, float la, floa
 void main()
 {
 	//transform vertex
-	gl_Position = ftransform(); 
+	vec4 vert = vec4(gl_Vertex.xyz, 1.0);
+	vary_texture_index = gl_Vertex.w;
+	gl_Position = gl_ModelViewProjectionMatrix * vert; 
 	
 	gl_TexCoord[0] = gl_TextureMatrix[0] * gl_MultiTexCoord0;
 	
-	vec4 pos = (gl_ModelViewMatrix * gl_Vertex);
+	vec4 pos = (gl_ModelViewMatrix * vert);
 	vec3 norm = normalize(gl_NormalMatrix * gl_Normal);
 	
 	float dp_directional_light = max(0.0, dot(norm, gl_LightSource[0].position.xyz));
 	vary_position = pos.xyz + gl_LightSource[0].position.xyz * (1.0-dp_directional_light)*shadow_offset;
-	
+		
 	calcAtmospherics(pos.xyz);
 
 	//vec4 color = calcLighting(pos.xyz, norm, gl_Color, vec4(0.));
-
 	vec4 col = vec4(0.0, 0.0, 0.0, gl_Color.a);
 
 	// Collect normal lights
 	col.rgb += gl_LightSource[2].diffuse.rgb*calcPointLightOrSpotLight(pos.xyz, norm, gl_LightSource[2].position, gl_LightSource[2].spotDirection.xyz, gl_LightSource[2].linearAttenuation, gl_LightSource[2].quadraticAttenuation, gl_LightSource[2].specular.a);
-	col.rgb += gl_LightSource[3].diffuse.rgb*calcPointLightOrSpotLight(pos.xyz, norm, gl_LightSource[3].position, gl_LightSource[3].spotDirection.xyz, gl_LightSource[3].linearAttenuation, gl_LightSource[3].quadraticAttenuation, gl_LightSource[3].specular.a);
+	col.rgb += gl_LightSource[3].diffuse.rgb*calcPointLightOrSpotLight(pos.xyz, norm, gl_LightSource[3].position, gl_LightSource[3].spotDirection.xyz, gl_LightSource[3].linearAttenuation, gl_LightSource[3].quadraticAttenuation ,gl_LightSource[3].specular.a);
 	col.rgb += gl_LightSource[4].diffuse.rgb*calcPointLightOrSpotLight(pos.xyz, norm, gl_LightSource[4].position, gl_LightSource[4].spotDirection.xyz, gl_LightSource[4].linearAttenuation, gl_LightSource[4].quadraticAttenuation, gl_LightSource[4].specular.a);
 	col.rgb += gl_LightSource[5].diffuse.rgb*calcPointLightOrSpotLight(pos.xyz, norm, gl_LightSource[5].position, gl_LightSource[5].spotDirection.xyz, gl_LightSource[5].linearAttenuation, gl_LightSource[5].quadraticAttenuation, gl_LightSource[5].specular.a);
 	col.rgb += gl_LightSource[6].diffuse.rgb*calcPointLightOrSpotLight(pos.xyz, norm, gl_LightSource[6].position, gl_LightSource[6].spotDirection.xyz, gl_LightSource[6].linearAttenuation, gl_LightSource[6].quadraticAttenuation, gl_LightSource[6].specular.a);
 	col.rgb += gl_LightSource[7].diffuse.rgb*calcPointLightOrSpotLight(pos.xyz, norm, gl_LightSource[7].position, gl_LightSource[7].spotDirection.xyz, gl_LightSource[7].linearAttenuation, gl_LightSource[7].quadraticAttenuation, gl_LightSource[7].specular.a);
-
+	
 	vary_pointlight_col = col.rgb*gl_Color.rgb;
-	
+
 	col.rgb = vec3(0,0,0);
-	
+
 	// Add windlight lights
 	col.rgb = atmosAmbient(vec3(0.));
 	
@@ -98,7 +105,7 @@ void main()
 
 	gl_FogFragCoord = pos.z;
 	
-	pos = gl_ModelViewProjectionMatrix * gl_Vertex;
+	pos = gl_ModelViewProjectionMatrix * vert;
 	vary_fragcoord.xyz = pos.xyz + vec3(0,0,near_clip);
 	
 }

indra/newview/app_settings/shaders/class1/deferred/attachmentShadowF.glsl

@@ -5,7 +5,7 @@
  * $License$
  */
 
-#version 120
+
 
 uniform sampler2D diffuseMap;
 

indra/newview/app_settings/shaders/class1/deferred/attachmentShadowV.glsl

@@ -5,7 +5,7 @@
  * $License$
  */
 
-#version 120
+
 
 mat4 getObjectSkinnedTransform();
 

indra/newview/app_settings/shaders/class1/deferred/avatarAlphaV.glsl

@@ -5,7 +5,7 @@
  * $License$
  */
  
-#version 120
+
 
 vec4 calcLighting(vec3 pos, vec3 norm, vec4 color, vec4 baseCol);
 mat4 getSkinnedTransform();

indra/newview/app_settings/shaders/class1/deferred/avatarF.glsl

@@ -5,7 +5,7 @@
  * $License$
  */
  
-#version 120
+
 
 uniform sampler2D diffuseMap;
 

indra/newview/app_settings/shaders/class1/deferred/avatarShadowF.glsl

@@ -5,7 +5,7 @@
  * $License$
  */
  
-#version 120
+
 
 uniform sampler2D diffuseMap;
 

indra/newview/app_settings/shaders/class1/deferred/avatarShadowV.glsl

@@ -5,7 +5,7 @@
  * $License$
  */
  
-#version 120
+
 
 mat4 getSkinnedTransform();
 

indra/newview/app_settings/shaders/class1/deferred/avatarV.glsl

@@ -5,7 +5,7 @@
  * $License$
  */
  
-#version 120
+
 
 mat4 getSkinnedTransform();
 

indra/newview/app_settings/shaders/class1/deferred/blurLightF.glsl

@@ -5,7 +5,7 @@
  * $License$
  */
  
-#version 120
+
 
 #extension GL_ARB_texture_rectangle : enable
 

indra/newview/app_settings/shaders/class1/deferred/blurLightV.glsl

@@ -5,7 +5,7 @@
  * $License$
  */
  
-#version 120
+
 
 varying vec2 vary_fragcoord;
 uniform vec2 screen_res;

indra/newview/app_settings/shaders/class1/deferred/bumpF.glsl

@@ -5,7 +5,7 @@
  * $License$
  */
  
-#version 120
+
 
 uniform sampler2D diffuseMap;
 uniform sampler2D bumpMap;

indra/newview/app_settings/shaders/class1/deferred/bumpSkinnedV.glsl

@@ -5,7 +5,7 @@
  * $License$
  */
 
-#version 120
+
 
 varying vec3 vary_mat0;
 varying vec3 vary_mat1;

indra/newview/app_settings/shaders/class1/deferred/bumpV.glsl

@@ -5,7 +5,7 @@
  * $License$
  */
  
-#version 120
+
 
 varying vec3 vary_mat0;
 varying vec3 vary_mat1;

indra/newview/app_settings/shaders/class1/deferred/diffuseF.glsl

@@ -5,7 +5,7 @@
  * $License$
  */
  
-#version 120
+
 
 uniform sampler2D diffuseMap;
 

indra/newview/app_settings/shaders/class1/deferred/diffuseIndexedF.glsl

@@ -0,0 +1,19 @@
+/** 
+ * @file diffuseIndexedF.glsl
+ *
+ * $LicenseInfo:firstyear=2007&license=viewerlgpl$
+ * $/LicenseInfo$
+ */
+ 
+varying vec3 vary_normal;
+
+void main() 
+{
+	vec3 col = gl_Color.rgb * diffuseLookup(gl_TexCoord[0].xy).rgb;
+
+	gl_FragData[0] = vec4(col, 0.0);
+	gl_FragData[1] = gl_Color.aaaa; // spec
+	//gl_FragData[1] = vec4(vec3(gl_Color.a), gl_Color.a+(1.0-gl_Color.a)*gl_Color.a); // spec - from former class3 - maybe better, but not so well tested
+	vec3 nvn = normalize(vary_normal);
+	gl_FragData[2] = vec4(nvn.xy * 0.5 + 0.5, nvn.z, 0.0);
+}

indra/newview/app_settings/shaders/class1/deferred/diffuseSkinnedV.glsl

@@ -5,7 +5,7 @@
  * $License$
  */
 
-#version 120
+
 
 varying vec3 vary_normal;
 

indra/newview/app_settings/shaders/class1/deferred/diffuseV.glsl

@@ -5,16 +5,18 @@
  * $/LicenseInfo$
  */
  
-#version 120
+
 
 varying vec3 vary_normal;
+varying float vary_texture_index;
 
 void main()
 {
 	//transform vertex
-	gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; 
+	gl_Position = gl_ModelViewProjectionMatrix * vec4(gl_Vertex.xyz, 1.0); 
 	gl_TexCoord[0] = gl_TextureMatrix[0] * gl_MultiTexCoord0;
 	
+	vary_texture_index = gl_Vertex.w;
 	vary_normal = normalize(gl_NormalMatrix * gl_Normal);
 
 	gl_FrontColor = gl_Color;

indra/newview/app_settings/shaders/class1/deferred/fullbrightF.glsl

@@ -5,60 +5,24 @@
  * $/LicenseInfo$
  */
  
-#version 120
+
 
 #extension GL_ARB_texture_rectangle : enable
 
-uniform sampler2D diffuseMap;
-uniform sampler2DRect depthMap;
-uniform sampler2D noiseMap;
-
-uniform vec4 shadow_clip;
-uniform vec2 screen_res;
-
 vec3 fullbrightAtmosTransport(vec3 light);
 vec3 fullbrightScaleSoftClip(vec3 light);
 
-varying vec3 vary_ambient;
-varying vec3 vary_directional;
-varying vec4 vary_position;
-varying vec3 vary_normal;
-varying vec3 vary_fragcoord;
-
-uniform mat4 inv_proj;
-
-vec4 getPosition(vec2 pos_screen)
-{
-	float depth = texture2DRect(depthMap, pos_screen.xy).a;
-	vec2 sc = pos_screen.xy*2.0;
-	sc /= screen_res;
-	sc -= vec2(1.0,1.0);
-	vec4 ndc = vec4(sc.x, sc.y, 2.0*depth-1.0, 1.0);
-	vec4 pos = inv_proj * ndc;
-	pos /= pos.w;
-	pos.w = 1.0;
-	return pos;
-}
 
 void main() 
 {
-	vec2 frag = vary_fragcoord.xy/vary_fragcoord.z*0.5+0.5;
-	frag *= screen_res;
-	
-	vec3 samp_pos = getPosition(frag).xyz; 
-	
 	float shadow = 1.0;
-	vec4 pos = vary_position;
 
-	vec4 color = texture2D(diffuseMap, gl_TexCoord[0].xy)*gl_Color;
+	vec4 color = diffuseLookup(gl_TexCoord[0].xy)*gl_Color;
 	
 	color.rgb = fullbrightAtmosTransport(color.rgb);
 
 	color.rgb = fullbrightScaleSoftClip(color.rgb);
 
-	//gl_FragColor = gl_Color;
 	gl_FragColor = color;
-	//gl_FragColor = vec4(1,0,1,1);
-	
 }
 

indra/newview/app_settings/shaders/class1/deferred/fullbrightV.glsl

@@ -5,7 +5,7 @@
  * $License$
  */
  
-#version 120
+
 
 void calcAtmospherics(vec3 inPositionEye);
 
@@ -14,30 +14,23 @@ vec3 atmosAffectDirectionalLight(float lightIntensity);
 vec3 scaleDownLight(vec3 light);
 vec3 scaleUpLight(vec3 light);
 
-varying vec3 vary_ambient;
-varying vec3 vary_directional;
-varying vec3 vary_normal;
-varying vec3 vary_fragcoord;
-uniform float near_clip;
-varying vec4 vary_position;
+varying float vary_texture_index;
 
 void main()
 {
 	//transform vertex
-	gl_Position = ftransform(); 
+	vec4 vert = vec4(gl_Vertex.xyz, 1.0);
+	vary_texture_index = gl_Vertex.w;
+
+	gl_Position = gl_ModelViewProjectionMatrix*vert; 
 	
 	gl_TexCoord[0] = gl_TextureMatrix[0] * gl_MultiTexCoord0;
 	
-	vec4 pos = (gl_ModelViewMatrix * gl_Vertex);
-	vary_position = pos;
-		
+	vec4 pos = (gl_ModelViewMatrix * vert);
+				
 	calcAtmospherics(pos.xyz);
 	
 	gl_FrontColor = gl_Color;
 
 	gl_FogFragCoord = pos.z;
-	
-	pos = gl_ModelViewProjectionMatrix * gl_Vertex;
-	vary_fragcoord.xyz = pos.xyz + vec3(0,0,near_clip);
-	
 }

indra/newview/app_settings/shaders/class1/deferred/giF.glsl

@@ -5,7 +5,7 @@
  * $/LicenseInfo$
  */
  
-#version 120
+
 
 #extension GL_ARB_texture_rectangle : enable
 

indra/newview/app_settings/shaders/class1/deferred/giV.glsl

@@ -5,7 +5,7 @@
  * $/LicenseInfo$
  */
  
-#version 120
+
 
 varying vec2 vary_fragcoord;
 

indra/newview/app_settings/shaders/class1/deferred/impostorF.glsl

@@ -5,7 +5,7 @@
  * $License$
  */
  
-#version 120
+
 
 uniform sampler2D diffuseMap;
 uniform sampler2D normalMap;

indra/newview/app_settings/shaders/class1/deferred/impostorV.glsl

@@ -5,7 +5,7 @@
  * $License$
  */
  
-#version 120
+
 
 void main()
 {

indra/newview/app_settings/shaders/class1/deferred/luminanceF.glsl

@@ -5,7 +5,7 @@
  * $/LicenseInfo$
  */
 
-#version 120
+
 
 uniform sampler2DRect diffuseMap;
 

indra/newview/app_settings/shaders/class1/deferred/luminanceV.glsl

@@ -5,7 +5,7 @@
  * $/LicenseInfo$
  */
 
-#version 120
+
 
 
 varying vec2 vary_fragcoord;

indra/newview/app_settings/shaders/class1/deferred/multiPointLightF.glsl

@@ -5,7 +5,7 @@
  * $License$
  */
 
-#version 120
+
 
 #extension GL_ARB_texture_rectangle : enable
 

indra/newview/app_settings/shaders/class1/deferred/multiPointLightV.glsl

@@ -5,7 +5,7 @@
  * $/LicenseInfo$
  */
 
-#version 120
+
 
 varying vec4 vary_fragcoord;
 

indra/newview/app_settings/shaders/class1/deferred/multiSpotLightF.glsl

@@ -5,7 +5,7 @@
  * $/LicenseInfo$
  */
 
-#version 120
+
 
 //class 1 -- no shadows
 

indra/newview/app_settings/shaders/class1/deferred/pointLightF.glsl

@@ -5,7 +5,7 @@
  * $/LicenseInfo$
  */
  
- #version 120
+ 
 
 #extension GL_ARB_texture_rectangle : enable
 

indra/newview/app_settings/shaders/class1/deferred/pointLightV.glsl

@@ -5,19 +5,14 @@
  * $License$
  */
 
-#version 120
+
 
 varying vec4 vary_light;
 varying vec4 vary_fragcoord;
 
-uniform vec2 screen_res;
-uniform float near_clip;
-
 void main()
 {
 	//transform vertex
-	gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; 
-
 	vec4 pos = gl_ModelViewProjectionMatrix * gl_Vertex;
 	vary_fragcoord = pos;
 		
@@ -25,6 +20,8 @@ void main()
 	tex.w = 1.0;
 	
 	vary_light = gl_MultiTexCoord0;
+	
+	gl_Position = pos;
 		
 	gl_FrontColor = gl_Color;
 }

indra/newview/app_settings/shaders/class1/deferred/postDeferredF.glsl

@@ -5,7 +5,7 @@
  * $/LicenseInfo$
  */
  
-#version 120
+
 
 #extension GL_ARB_texture_rectangle : enable
 

indra/newview/app_settings/shaders/class1/deferred/postDeferredNoDoFF.glsl

@@ -5,7 +5,7 @@
  * $/LicenseInfo$
  */
  
-#version 120
+
 
 #extension GL_ARB_texture_rectangle : enable
 

indra/newview/app_settings/shaders/class1/deferred/postDeferredV.glsl

@@ -5,7 +5,7 @@
  * $/LicenseInfo$
  */
  
-#version 120
+
 
 varying vec2 vary_fragcoord;
 uniform vec2 screen_res;

indra/newview/app_settings/shaders/class1/deferred/postgiF.glsl

@@ -5,7 +5,7 @@
  * $/LicenseInfo$
  */
  
-#version 120
+
 
 uniform sampler2DRect depthMap;
 uniform sampler2DRect normalMap;

indra/newview/app_settings/shaders/class1/deferred/postgiV.glsl

@@ -5,7 +5,7 @@
  * $/LicenseInfo$
  */
  
-#version 120
+
 
 varying vec2 vary_fragcoord;
 uniform vec2 screen_res;

indra/newview/app_settings/shaders/class1/deferred/shadowF.glsl

@@ -5,7 +5,7 @@
  * $License$
  */
  
-#version 120
+
 
 uniform sampler2D diffuseMap;
 

indra/newview/app_settings/shaders/class1/deferred/shadowV.glsl

@@ -5,7 +5,7 @@
  * $License$
  */
  
-#version 120
+
 
 varying vec4 post_pos;
 

indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl

@@ -5,7 +5,7 @@
  * $License$
  */
  
-#version 120
+
 
 #extension GL_ARB_texture_rectangle : enable
 

indra/newview/app_settings/shaders/class1/deferred/softenLightNoSSAOF.glsl

@@ -5,7 +5,6 @@
  * $License$
  */
  
-#version 120
 
 #extension GL_ARB_texture_rectangle : enable
 

indra/newview/app_settings/shaders/class1/deferred/softenLightV.glsl

@@ -5,7 +5,7 @@
  * $License$
  */
  
-#version 120
+
 
 uniform vec2 screen_res;
 

indra/newview/app_settings/shaders/class1/deferred/spotLightF.glsl

@@ -5,7 +5,7 @@
  * $/LicenseInfo$
  */
 
-#version 120
+
 
 #extension GL_ARB_texture_rectangle : enable
 

indra/newview/app_settings/shaders/class1/deferred/sunLightF.glsl

@@ -5,7 +5,7 @@
  * $License$
  */
  
-#version 120
+
 
 //class 1, no shadow, no SSAO, should never be called
 

indra/newview/app_settings/shaders/class1/deferred/sunLightSSAOF.glsl

@@ -5,7 +5,7 @@
  * $License$
  */
  
-#version 120
+
 
 #extension GL_ARB_texture_rectangle : enable
 
@@ -35,7 +35,7 @@ uniform float shadow_offset;
 
 vec4 getPosition(vec2 pos_screen)
 {
-	float depth = texture2DRect(depthMap, pos_screen.xy).a;
+	float depth = texture2DRect(depthMap, pos_screen.xy).r;
 	vec2 sc = pos_screen.xy*2.0;
 	sc /= screen_res;
 	sc -= vec2(1.0,1.0);

indra/newview/app_settings/shaders/class1/deferred/sunLightV.glsl

@@ -5,7 +5,7 @@
  * $License$
  */
  
-#version 120
+
 
 varying vec4 vary_light;
 varying vec2 vary_fragcoord;

indra/newview/app_settings/shaders/class1/deferred/terrainF.glsl

@@ -5,7 +5,7 @@
  * $License$
  */
  
-#version 120
+
 
 uniform sampler2D detail_0;
 uniform sampler2D detail_1;

indra/newview/app_settings/shaders/class1/deferred/terrainV.glsl

@@ -5,7 +5,7 @@
  * $License$
  */
  
-#version 120
+
 
 varying vec3 vary_normal;
 

indra/newview/app_settings/shaders/class1/deferred/treeF.glsl

@@ -5,7 +5,7 @@
  * $License$
  */
  
-#version 120
+
 
 uniform sampler2D diffuseMap;
 

indra/newview/app_settings/shaders/class1/deferred/treeV.glsl

@@ -5,7 +5,7 @@
  * $License$
  */
  
-#version 120
+
 
 varying vec3 vary_normal;
 

indra/newview/app_settings/shaders/class1/deferred/waterF.glsl

@@ -5,7 +5,7 @@
  * $License$
  */
  
-#version 120
+
 
 #extension GL_ARB_texture_rectangle : enable
 

indra/newview/app_settings/shaders/class1/deferred/waterV.glsl

@@ -5,7 +5,7 @@
  * $License$
  */
  
-#version 120
+
 
 void calcAtmospherics(vec3 inPositionEye);
 

indra/newview/app_settings/shaders/class1/effects/glowExtractF.glsl

@@ -5,7 +5,7 @@
  * $License$
  */
  
-#version 120
+
 
 #extension GL_ARB_texture_rectangle : enable
 

indra/newview/app_settings/shaders/class1/effects/glowExtractV.glsl

@@ -5,7 +5,7 @@
  * $License$
  */
 
-#version 120
+
 
 void main() 
 {

indra/newview/app_settings/shaders/class1/effects/glowF.glsl

@@ -5,7 +5,7 @@
  * $License$
  */
 
-#version 120
+
 
 uniform sampler2D diffuseMap;
 uniform float glowStrength;

indra/newview/app_settings/shaders/class1/effects/glowV.glsl

@@ -5,7 +5,7 @@
  * $License$
  */
  
-#version 120
+
 
 uniform vec2 glowDelta;
 

indra/newview/app_settings/shaders/class1/environment/terrainF.glsl

@@ -5,7 +5,7 @@
  * $License$
  */
  
-#version 120
+
 
 uniform sampler2D detail0;
 uniform sampler2D detail1;

indra/newview/app_settings/shaders/class1/environment/terrainV.glsl

@@ -5,7 +5,7 @@
  * $License$
  */
  
-#version 120
+
 
 vec4 calcLighting(vec3 pos, vec3 norm, vec4 color, vec4 baseCol);
 

indra/newview/app_settings/shaders/class1/environment/terrainWaterF.glsl

@@ -5,7 +5,7 @@
  * $License$
  */
  
-#version 120
+
 
 // this class1 shader is just a copy of terrainF
 

indra/newview/app_settings/shaders/class1/environment/underWaterF.glsl

@@ -5,7 +5,7 @@
  * $License$
  */
  
-#version 120
+
 
 uniform sampler2D diffuseMap;
 uniform sampler2D bumpMap;   

indra/newview/app_settings/shaders/class1/environment/waterF.glsl

@@ -5,7 +5,7 @@
  * $License$
  */
  
-#version 120
+
 
 vec3 scaleSoftClip(vec3 inColor);
 vec3 atmosTransport(vec3 inColor);

indra/newview/app_settings/shaders/class1/environment/waterFogF.glsl

@@ -5,7 +5,7 @@
  * $License$
  */
  
-#version 120
+
 
 vec4 applyWaterFog(vec4 color)
 {

indra/newview/app_settings/shaders/class1/environment/waterV.glsl

@@ -5,7 +5,7 @@
  * $License$
  */
  
-#version 120
+
 
 void calcAtmospherics(vec3 inPositionEye);
 

indra/newview/app_settings/shaders/class1/interface/highlightF.glsl

@@ -5,7 +5,7 @@
  * $License$
  */
  
-#version 120
+
 
 uniform sampler2D diffuseMap;
 

indra/newview/app_settings/shaders/class1/interface/highlightV.glsl

@@ -5,7 +5,7 @@
  * $License$
  */
  
-#version 120
+
 
 void main()
 {

indra/newview/app_settings/shaders/class1/lighting/lightF.glsl

@@ -5,7 +5,7 @@
  * $License$
  */
  
-#version 120
+
 
 uniform sampler2D diffuseMap;
 

indra/newview/app_settings/shaders/class1/lighting/lightFullbrightF.glsl

@@ -5,7 +5,7 @@
  * $License$
  */
  
-#version 120
+
 
 
 uniform sampler2D diffuseMap;

indra/newview/app_settings/shaders/class1/lighting/lightFullbrightShinyF.glsl

@@ -5,7 +5,7 @@
  * $License$
  */
  
-#version 120
+
 
 
 uniform sampler2D diffuseMap;

indra/newview/app_settings/shaders/class1/lighting/lightFullbrightShinyWaterF.glsl

@@ -6,7 +6,7 @@
  */
 
  
-#version 120
+
 
 uniform sampler2D diffuseMap;
 uniform samplerCube environmentMap;

indra/newview/app_settings/shaders/class1/lighting/lightFullbrightWaterF.glsl

@@ -6,7 +6,7 @@
  */
 
  
-#version 120
+
 
 uniform sampler2D diffuseMap;
 

indra/newview/app_settings/shaders/class1/lighting/lightFuncSpecularV.glsl

@@ -5,7 +5,7 @@
  * $License$
  */
  
-#version 120
+
 
 float calcDirectionalLight(vec3 n, vec3 l)
 {

indra/newview/app_settings/shaders/class1/lighting/lightFuncV.glsl

@@ -5,7 +5,7 @@
  * $License$
  */
  
-#version 120
+
 
 
 float calcDirectionalLight(vec3 n, vec3 l)

indra/newview/app_settings/shaders/class1/lighting/lightShinyF.glsl

@@ -5,7 +5,7 @@
  * $License$
  */
  
-#version 120
+
 
 
 uniform sampler2D diffuseMap;

indra/newview/app_settings/shaders/class1/lighting/lightShinyWaterF.glsl

@@ -5,7 +5,7 @@
  * $License$
  */
  
-#version 120
+
 
 
 uniform sampler2D diffuseMap;

indra/newview/app_settings/shaders/class1/lighting/lightSpecularV.glsl

@@ -5,7 +5,7 @@
  * $License$
  */
  
-#version 120
+
 
 float calcDirectionalLight(vec3 n, vec3 l);
 

indra/newview/app_settings/shaders/class1/lighting/lightV.glsl

@@ -5,7 +5,7 @@
  * $License$
  */
  
-#version 120
+
 
 float calcDirectionalLight(vec3 n, vec3 l);
 

indra/newview/app_settings/shaders/class1/lighting/lightWaterF.glsl

@@ -5,7 +5,7 @@
  * $License$
  */
  
-#version 120
+
 
 uniform sampler2D diffuseMap;
 

indra/newview/app_settings/shaders/class1/lighting/sumLightsSpecularV.glsl

@@ -5,7 +5,7 @@
  * $License$
  */
   
-#version 120
+
 
 float calcDirectionalLightSpecular(inout vec4 specular, vec3 view, vec3 n, vec3 l, vec3 lightCol, float da);
 vec3 atmosAmbient(vec3 light);

indra/newview/app_settings/shaders/class1/lighting/sumLightsV.glsl

@@ -5,7 +5,7 @@
  * $License$
  */
  
-#version 120
+
 
 float calcDirectionalLight(vec3 n, vec3 l);
 

indra/newview/app_settings/shaders/class1/objects/fullbrightF.glsl

@@ -5,7 +5,7 @@
  * $License$
  */
  
-#version 120
+
 
 void fullbright_lighting();
 

indra/newview/app_settings/shaders/class1/objects/fullbrightShinyF.glsl

@@ -5,7 +5,7 @@
  * $License$
  */
  
-#version 120
+
 
 void fullbright_shiny_lighting();