summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorGraham Madarasz <graham@lindenlab.com>2013-04-19 10:52:03 -0700
committerGraham Madarasz <graham@lindenlab.com>2013-04-19 10:52:03 -0700
commit2b3495ae5ef9947b1b779bec725fb45abc1a609a (patch)
treefd28fee6103421932f04d96e7a836fd6bb6b1a66 /indra/newview
parent6adc6d71a7147a7f53f266bb05cd0157e34f9f4b (diff)
Cleanup mac hack and add defs to deferred alpha shader so compiler won't complain about #if with undefined vars
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llviewershadermgr.cpp10
1 files changed, 4 insertions, 6 deletions
diff --git a/indra/newview/llviewershadermgr.cpp b/indra/newview/llviewershadermgr.cpp
index 062808fe53..6c94f81c3d 100644
--- a/indra/newview/llviewershadermgr.cpp
+++ b/indra/newview/llviewershadermgr.cpp
@@ -277,9 +277,6 @@ LLViewerShaderMgr::LLViewerShaderMgr() :
mShaderList.push_back(&gDeferredSoftenProgram);
mShaderList.push_back(&gDeferredAlphaProgram);
mShaderList.push_back(&gDeferredSkinnedAlphaProgram);
-#if LL_DARWIN
- mShaderList.push_back(&gDeferredSkinnedAlphaProgramMac);
-#endif
mShaderList.push_back(&gDeferredFullbrightProgram);
mShaderList.push_back(&gDeferredEmissiveProgram);
mShaderList.push_back(&gDeferredAvatarEyesProgram);
@@ -1086,9 +1083,6 @@ BOOL LLViewerShaderMgr::loadShadersDeferred()
gDeferredSkinnedDiffuseProgram.unload();
gDeferredSkinnedBumpProgram.unload();
gDeferredSkinnedAlphaProgram.unload();
-#if LL_DARWIN
- gDeferredSkinnedAlphaProgramMac.unload();
-#endif
gDeferredBumpProgram.unload();
gDeferredImpostorProgram.unload();
gDeferredTerrainProgram.unload();
@@ -1415,6 +1409,10 @@ BOOL LLViewerShaderMgr::loadShadersDeferred()
gDeferredAlphaProgram.mShaderFiles.clear();
gDeferredAlphaProgram.mShaderFiles.push_back(make_pair("deferred/alphaV.glsl", GL_VERTEX_SHADER_ARB));
gDeferredAlphaProgram.mShaderFiles.push_back(make_pair("deferred/alphaF.glsl", GL_FRAGMENT_SHADER_ARB));
+ gDeferredSkinnedAlphaProgram.addPermutation("INDEX_MODE","0");
+ gDeferredSkinnedAlphaProgram.addPermutation("HAS_SKIN","1");
+ gDeferredSkinnedAlphaProgram.addPermutation("IS_AVATAR_SKIN","0");
+
gDeferredAlphaProgram.mShaderLevel = mVertexShaderLevel[SHADER_DEFERRED];
success = gDeferredAlphaProgram.createShader(NULL, NULL);