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

Merge branch 'future' of https://github.com/Shyotl/SingularityViewer into renderer32

Browse Source
This commit is contained in:
Siana Gearz
2011-11-24 04:43:47 +01:00
parent b8eb3076ce bf6e1d6c75
commit ab14f1908c
2 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
indra/llrender/llshadermgr.cpp
View File

@@ -768,8 +768,8 @@ GLhandleARB LLShaderMgr::loadShaderFile(const std::string& filename, S32 & shade
file.write(ostr.str().c_str(),ostr.str().length());
if(!error_str.empty())
{
LLAPRFile file2(maindir + shader_name + "_ERROR" + ".txt", LL_APR_W);
file.write(error_str.c_str(),error_str.length());
LLAPRFile file2(maindir + shader_name + "_ERROR.txt", LL_APR_W);
file2.write(error_str.c_str(),error_str.length());
}
}
stop_glerror();

15
indra/newview/llviewershadermgr.cpp
View File

@@ -354,7 +354,14 @@ void LLViewerShaderMgr::setShaders()
{
const std::string dumpdir = gDirUtilp->getExpandedFilename(LL_PATH_LOGS,"shader_dump")+gDirUtilp->getDirDelimiter();
boost::filesystem::remove_all(dumpdir);
try
{
boost::filesystem::remove_all(dumpdir);
}
catch(const boost::filesystem::filesystem_error& e)
{
llinfos << "boost::filesystem::remove_all(\""+dumpdir+"\") failed: '" + e.code().message() + "'" << llendl;
}
}
LLGLSLShader::sIndexedTextureChannels = llmax(llmin(gGLManager.mNumTextureImageUnits, (S32) gSavedSettings.getU32("RenderMaxTextureIndex")), 1);
@@ -379,9 +386,9 @@ void LLViewerShaderMgr::setShaders()
LLShaderMgr::instance()->mDefinitions["textureCube"] = "texture";
LLShaderMgr::instance()->mDefinitions["texture2DLod"] = "textureLod";
LLShaderMgr::instance()->mDefinitions["texture2DRect"] = "texture";
LLShaderMgr::instance()->mDefinitions["shadow2D"] = "texture";
LLShaderMgr::instance()->mDefinitions["shadow2DRect"] = "texture";
LLShaderMgr::instance()->mDefinitions["shadow2DProj"] = "textureProj";
LLShaderMgr::instance()->mDefinitions["shadow2D(a,b)"] = "vec2(texture(a,b))"; //Shadow lookups only return a single float.
LLShaderMgr::instance()->mDefinitions["shadow2DRect(a,b)"] = "vec2(texture(a,b))";
LLShaderMgr::instance()->mDefinitions["shadow2DProj(a,b)"] = "vec2(textureProj(a,b))";
LLShaderMgr::instance()->mDefinitions["ftransform()"] = "gl_ModelViewProjectionMatrix * gl_Vertex";
}