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

Remove MSVC pragmas breaking OSX build.

meow-7.2.2
Graham Linden graham@lindenlab.com 2018-03-03 01:08:58 +00:00
parent 98862a53a7
commit 5517eb3f6f
3 changed files with 0 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/llinventory/llsettingssky.cpp
View File

@ -32,8 +32,6 @@
#include "llfasttimer.h"
#include "v3colorutil.h"
#pragma optimize("", off)
//=========================================================================
namespace
{

4
indra/llrender/llglslshader.cpp
View File

@ -374,8 +374,6 @@ void LLGLSLShader::unloadInternal()
stop_glerror();
}
#pragma optimize("", off)
BOOL LLGLSLShader::createShader(std::vector<LLStaticHashedString> * attributes,
std::vector<LLStaticHashedString> * uniforms,
U32 varying_count,
@ -492,8 +490,6 @@ BOOL LLGLSLShader::createShader(std::vector<LLStaticHashedString> * attributes,
return success;
}
#pragma optimize("", on)
BOOL LLGLSLShader::attachObject(std::string object)
{
if (LLShaderMgr::instance()->mShaderObjects.count(object) > 0)

5
indra/newview/llviewershadermgr.cpp
View File

@ -3288,8 +3288,6 @@ BOOL LLViewerShaderMgr::loadShadersInterface()
return TRUE;
}
#pragma optimize("", off)
BOOL LLViewerShaderMgr::loadShadersWindLight()
{
BOOL success = TRUE;
@ -3360,9 +3358,6 @@ BOOL LLViewerShaderMgr::loadShadersWindLight()
return success;
}
#pragma optimize("", on)
BOOL LLViewerShaderMgr::loadTransformShaders()
{
BOOL success = TRUE;