OSX was choking on transformfeedback shaders. Make failure to load such shaders non-critical to the shader loading process. Also clean up glColorMask state properly in wlsky.

2012-12-24 17:55:05 -06:00
parent 3750123e43
commit afaaba6b3c
3 changed files with 9 additions and 7 deletions
--- a/indra/newview/llviewershadermgr.cpp
+++ b/indra/newview/llviewershadermgr.cpp
@@ -470,6 +470,12 @@ void LLViewerShaderMgr::setShaders()
 			if (loaded)
 			{
 				loaded = loadTransformShaders();
+				if(!loaded)	//Failed to load. Just wipe all transformfeedback shaders and continue like nothing happened.
+				{
+					mVertexShaderLevel[SHADER_TRANSFORM] = 0;
+					unloadShaderClass(SHADER_TRANSFORM);
+					loaded = true;
+				}
 			}

 			if (loaded)