summaryrefslogtreecommitdiff
path: root/indra/newview/llviewershadermgr.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/llviewershadermgr.cpp')
-rw-r--r--indra/newview/llviewershadermgr.cpp47
1 files changed, 4 insertions, 43 deletions
diff --git a/indra/newview/llviewershadermgr.cpp b/indra/newview/llviewershadermgr.cpp
index 0fd37a4090..c7e422139d 100644
--- a/indra/newview/llviewershadermgr.cpp
+++ b/indra/newview/llviewershadermgr.cpp
@@ -1224,8 +1224,6 @@ BOOL LLViewerShaderMgr::loadShadersDeferred()
gDeferredSkinnedAlphaProgram.addPermutation("INDEX_MODE", "2");
gDeferredSkinnedAlphaProgram.addPermutation("HAS_SKIN", "1");
gDeferredSkinnedAlphaProgram.addPermutation("IS_AVATAR_SKIN", "0");
- gDeferredSkinnedAlphaProgram.addPermutation("MAC_GEFORCE_HACK","0");
-
success = gDeferredSkinnedAlphaProgram.createShader(NULL, NULL);
// Hack to include uniforms for lighting without linking in lighting file
@@ -1233,36 +1231,6 @@ BOOL LLViewerShaderMgr::loadShadersDeferred()
gDeferredSkinnedAlphaProgram.mFeatures.hasLighting = true;
}
-#if LL_DARWIN
- if (success)
- {
- gDeferredSkinnedAlphaProgramMac.mName = "Deferred Skinned Alpha Shader";
- gDeferredSkinnedAlphaProgramMac.mFeatures.atmosphericHelpers = true;
- gDeferredSkinnedAlphaProgramMac.mFeatures.hasObjectSkinning = true;
- gDeferredSkinnedAlphaProgramMac.mFeatures.calculatesAtmospherics = true;
- gDeferredSkinnedAlphaProgramMac.mFeatures.hasGamma = true;
- gDeferredSkinnedAlphaProgramMac.mFeatures.hasAtmospherics = true;
- gDeferredSkinnedAlphaProgramMac.mFeatures.calculatesLighting = false;
- gDeferredSkinnedAlphaProgramMac.mFeatures.hasLighting = false;
- gDeferredSkinnedAlphaProgramMac.mFeatures.isAlphaLighting = true;
- gDeferredSkinnedAlphaProgramMac.mFeatures.disableTextureIndex = true;
- gDeferredSkinnedAlphaProgramMac.mShaderFiles.clear();
- gDeferredSkinnedAlphaProgramMac.mShaderFiles.push_back(make_pair("deferred/alphaV.glsl", GL_VERTEX_SHADER_ARB));
- gDeferredSkinnedAlphaProgramMac.mShaderFiles.push_back(make_pair("deferred/alphaF.glsl", GL_FRAGMENT_SHADER_ARB));
- gDeferredSkinnedAlphaProgramMac.mShaderLevel = mVertexShaderLevel[SHADER_DEFERRED];
- gDeferredSkinnedAlphaProgramMac.addPermutation("INDEX_MODE", "2");
- gDeferredSkinnedAlphaProgramMac.addPermutation("HAS_SKIN", "1");
- gDeferredSkinnedAlphaProgramMac.addPermutation("IS_AVATAR_SKIN", "0");
- gDeferredSkinnedAlphaProgramMac.addPermutation("MAC_GEFORCE_HACK","1");
-
- success = gDeferredSkinnedAlphaProgramMac.createShader(NULL, NULL);
-
- // Hack to include uniforms for lighting without linking in lighting file
- gDeferredSkinnedAlphaProgramMac.mFeatures.calculatesLighting = true;
- gDeferredSkinnedAlphaProgramMac.mFeatures.hasLighting = true;
- }
-#endif
-
if (success)
{
gDeferredBumpProgram.mName = "Deferred Bump Shader";
@@ -1432,10 +1400,7 @@ BOOL LLViewerShaderMgr::loadShadersDeferred()
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));
gDeferredAlphaProgram.mShaderLevel = mVertexShaderLevel[SHADER_DEFERRED];
- gDeferredAlphaProgram.addPermutation("INDEX_MODE", "1");
- gDeferredAlphaProgram.addPermutation("HAS_SKIN", "0");
- gDeferredAlphaProgram.addPermutation("IS_AVATAR_SKIN", "0");
- gDeferredAlphaProgram.addPermutation("MAC_GEFORCE_HACK","0");
+
success = gDeferredAlphaProgram.createShader(NULL, NULL);
// Hack
@@ -1608,14 +1573,10 @@ BOOL LLViewerShaderMgr::loadShadersDeferred()
gDeferredAvatarAlphaProgram.mFeatures.isAlphaLighting = true;
gDeferredAvatarAlphaProgram.mFeatures.disableTextureIndex = true;
gDeferredAvatarAlphaProgram.mShaderFiles.clear();
- gDeferredAvatarAlphaProgram.mShaderFiles.push_back(make_pair("deferred/alphaV.glsl", GL_VERTEX_SHADER_ARB));
- gDeferredAvatarAlphaProgram.mShaderFiles.push_back(make_pair("deferred/alphaF.glsl", GL_FRAGMENT_SHADER_ARB));
+ gDeferredAvatarAlphaProgram.mShaderFiles.push_back(make_pair("deferred/avatarAlphaNoColorV.glsl", GL_VERTEX_SHADER_ARB));
+ gDeferredAvatarAlphaProgram.mShaderFiles.push_back(make_pair("deferred/alphaNonIndexedNoColorF.glsl", GL_FRAGMENT_SHADER_ARB));
gDeferredAvatarAlphaProgram.mShaderLevel = mVertexShaderLevel[SHADER_DEFERRED];
- gDeferredAvatarAlphaProgram.addPermutation("INDEX_MODE", "3");
- gDeferredAvatarAlphaProgram.addPermutation("HAS_SKIN", "0");
- gDeferredAvatarAlphaProgram.addPermutation("IS_AVATAR_SKIN", "1");
- gDeferredAvatarAlphaProgram.addPermutation("MAC_GEFORCE_HACK","0");
-
+
success = gDeferredAvatarAlphaProgram.createShader(NULL, &mAvatarUniforms);
gDeferredAvatarAlphaProgram.mFeatures.calculatesLighting = true;