NORSPEC-314 rollback unified srgb shader code to see if we can get past Mac 10.6.8 nV driver issues

3 files changed, 5 insertions, 15 deletions

diff --git a/indra/llrender/llglslshader.cpp b/indra/llrender/llglslshader.cpp
index b854218e3d..40aff36dac 100755
--- a/indra/llrender/llglslshader.cpp
+++ b/indra/llrender/llglslshader.cpp
@@ -87,7 +87,6 @@ LLShaderFeatures::LLShaderFeatures()
 	, mIndexedTextureChannels(0)
 	, disableTextureIndex(false)
 	, hasAlphaMask(false)
-	, hasSRGB(false)
 {
 }
 
@@ -375,6 +374,11 @@ BOOL LLGLSLShader::createShader(vector<string> * attributes,
 
 	// Create program
 	mProgramObject = glCreateProgramObjectARB();
+
+#if LL_DARWIN
+    // work-around missing mix(vec3,vec3,bvec3)
+    mDefines["OLD_SELECT"] = "1";
+#endif
 	
 	//compile new source
 	vector< pair<string,GLenum> >::iterator fileIter = mShaderFiles.begin();
diff --git a/indra/llrender/llglslshader.h b/indra/llrender/llglslshader.h
index dadffeb6c4..eabdb9fc92 100755
--- a/indra/llrender/llglslshader.h
+++ b/indra/llrender/llglslshader.h
@@ -50,7 +50,6 @@ public:
 	S32 mIndexedTextureChannels;
 	bool disableTextureIndex;
 	bool hasAlphaMask;
-	bool hasSRGB;
 
 	// char numLights;
 	
diff --git a/indra/llrender/llshadermgr.cpp b/indra/llrender/llshadermgr.cpp
index 21b8322bf1..63404abeff 100755
--- a/indra/llrender/llshadermgr.cpp
+++ b/indra/llrender/llshadermgr.cpp
@@ -175,19 +175,6 @@ BOOL LLShaderMgr::attachShaderFeatures(LLGLSLShader * shader)
 	// Attach Fragment Shader Features Next
 	///////////////////////////////////////
 
-	if (features->hasSRGB)
-	{
-#if LL_DARWIN
-		if (!shader->attachObject("deferred/srgb_mac.glsl"))
-
-#else
-		if (!shader->attachObject("deferred/srgb.glsl"))
-#endif
-		{
-			return FALSE;
-		}
-	}
-
 	if(features->calculatesAtmospherics)
 	{
 		if (features->hasWaterFog)