Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed some diagnostic spam pertaining to shaders.

Browse Source
This commit is contained in:
Shyotl
2014-05-17 03:32:40 -05:00
parent 67c8ac2b04
commit a9c3e13e5e
1 changed files with 0 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
indra/newview/llviewershadermgr.cpp
View File

@@ -2026,25 +2026,16 @@ BOOL LLViewerShaderMgr::loadShadersObject()
if(no_index && !mask) if(no_index && !mask)
{ {
llinfos << "Skipping Simple" << name << llendl;
llinfos << "Skipping Fullbright" << name << llendl;
llinfos << "Skipping Emissive" << name << llendl;
continue; //all non-indexed shaders here have alphamasks; continue; //all non-indexed shaders here have alphamasks;
} }
if(skin && (!no_index || mVertexShaderLevel[SHADER_AVATAR] < 1)) if(skin && (!no_index || mVertexShaderLevel[SHADER_AVATAR] < 1))
{ {
llinfos << "Skipping Simple" << name << llendl;
llinfos << "Skipping Fullbright" << name << llendl;
llinfos << "Skipping Emissive" << name << llendl;
continue; //Skins are always non-indexed. continue; //Skins are always non-indexed.
} }
if(shiny && mask && !skin && !no_index) if(shiny && mask && !skin && !no_index)
{ {
llinfos << "Skipping Simple" << name << llendl;
llinfos << "Skipping Fullbright" << name << llendl;
llinfos << "Skipping Emissive" << name << llendl;
continue; //non-skinned indexed shiny does not support alphamasking continue; //non-skinned indexed shiny does not support alphamasking
} }
@@ -2063,8 +2054,6 @@ BOOL LLViewerShaderMgr::loadShadersObject()
features.hasObjectSkinning = skin; features.hasObjectSkinning = skin;
features.isShiny = shiny; features.isShiny = shiny;
llinfos << "Compiling Simple" << name << llendl;
gObjectSimpleProgram[i].mName = std::string("Simple") + name + " Shader"; gObjectSimpleProgram[i].mName = std::string("Simple") + name + " Shader";
gObjectSimpleProgram[i].mFeatures = features; gObjectSimpleProgram[i].mFeatures = features;
gObjectSimpleProgram[i].mShaderFiles.clear(); gObjectSimpleProgram[i].mShaderFiles.clear();
@@ -2091,8 +2080,6 @@ BOOL LLViewerShaderMgr::loadShadersObject()
features.isFullbright = true; features.isFullbright = true;
features.hasGamma |= (shiny && fog); features.hasGamma |= (shiny && fog);
llinfos << "Compiling Fullbright" << name << llendl;
gObjectFullbrightProgram[i].mName = std::string("Fullbright") + name + " Shader"; gObjectFullbrightProgram[i].mName = std::string("Fullbright") + name + " Shader";
gObjectFullbrightProgram[i].mFeatures = features; gObjectFullbrightProgram[i].mFeatures = features;
gObjectFullbrightProgram[i].mShaderFiles.clear(); gObjectFullbrightProgram[i].mShaderFiles.clear();
@@ -2114,8 +2101,6 @@ BOOL LLViewerShaderMgr::loadShadersObject()
if(!shiny) if(!shiny)
{ {
llinfos << "Compiling Emissive" << name << llendl;
gObjectEmissiveProgram[i].mName = std::string("Emissive") + name + " Shader"; gObjectEmissiveProgram[i].mName = std::string("Emissive") + name + " Shader";
gObjectEmissiveProgram[i].mFeatures = features; gObjectEmissiveProgram[i].mFeatures = features;
gObjectEmissiveProgram[i].mShaderFiles.clear(); gObjectEmissiveProgram[i].mShaderFiles.clear();
@@ -2127,10 +2112,6 @@ BOOL LLViewerShaderMgr::loadShadersObject()
if(!(success = gObjectEmissiveProgram[i].createShader(NULL, NULL))) if(!(success = gObjectEmissiveProgram[i].createShader(NULL, NULL)))
break; break;
} }
else
{
llinfos << "Skipping Emissive" << name << llendl;
}
} }
} }