livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SH-2510 Never use shaders if gl version < 2.0

meow-7.2.2
Dave Parks 2011-10-11 15:11:52 -05:00
parent 2322c57b4d
commit 9a0bb3d871
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
indra/newview/llviewershadermgr.cpp
View File

@ -357,6 +357,7 @@ void LLViewerShaderMgr::setShaders()
LLGLSLShader::sIndexedTextureChannels = llmax(llmin(gGLManager.mNumTextureImageUnits, (S32) gSavedSettings.getU32("RenderMaxTextureIndex")), 1);
reentrance = true;
if (LLRender::sGLCoreProfile || gGLManager.mGLVersion >= 2.f)
{ //ALWAYS use shaders where available
@ -364,19 +365,15 @@ void LLViewerShaderMgr::setShaders()
{ //vertex shaders MUST be enabled to use core profile
gSavedSettings.setBOOL("VertexShaderEnable", TRUE);
}
if (!gSavedSettings.getBOOL("RenderTransparentWater"))
{ //non-transparent water uses fixed function
gSavedSettings.setBOOL("RenderTransparentWater", TRUE);
}
}
else if (gGLManager.mGLVersion < 2.f)
{ //NEVER use shaders on a pre 2.0 context
gSavedSettings.setBOOL("VertexShaderEnable", FALSE);
}
//setup preprocessor definitions
LLShaderMgr::instance()->mDefinitions["NUM_TEX_UNITS"] = llformat("%d", gGLManager.mNumTextureImageUnits);
reentrance = true;
// Make sure the compiled shader map is cleared before we recompile shaders.
mShaderObjects.clear();