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

SH-2031 Fix for link error in llui_libtest

master
Dave Parks 2011-07-18 10:39:02 -05:00
parent 6469f1c2f2
commit 190ff3c346
4 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
indra/llrender/llglslshader.cpp
View File

@ -51,6 +51,10 @@ using std::string;
GLhandleARB LLGLSLShader::sCurBoundShader = 0;
bool LLGLSLShader::sNoFixedFunction = false;
//UI shader -- declared here so llui_libtest will link properly
LLGLSLShader gUIProgram;
LLGLSLShader gSolidColorProgram;
BOOL shouldChange(const LLVector4& v1, const LLVector4& v2)
{
return v1 != v2;

6
indra/llrender/llglslshader.h
View File

@ -142,4 +142,10 @@ public:
std::string mName;
};
//UI shader (declared here so llui_libtest will link properly)
extern LLGLSLShader gUIProgram;
//output vec4(color.rgb,color.a*tex0[tc0].a)
extern LLGLSLShader gSolidColorProgram;
#endif

2
indra/newview/llviewershadermgr.cpp
View File

@ -63,11 +63,9 @@ LLVector4 gShinyOrigin;
//utility shaders
LLGLSLShader gOcclusionProgram;
LLGLSLShader gUIProgram;
LLGLSLShader gCustomAlphaProgram;
LLGLSLShader gGlowCombineProgram;
LLGLSLShader gTwoTextureAddProgram;
LLGLSLShader gSolidColorProgram;
//object shaders
LLGLSLShader gObjectSimpleProgram;

4
indra/newview/llviewershadermgr.h
View File

@ -289,16 +289,12 @@ extern LLVector4 gShinyOrigin;
//utility shaders
extern LLGLSLShader gOcclusionProgram;
extern LLGLSLShader gUIProgram;
extern LLGLSLShader gCustomAlphaProgram;
extern LLGLSLShader gGlowCombineProgram;
//output tex0[tc0] + tex1[tc1]
extern LLGLSLShader gTwoTextureAddProgram;
//output vec4(color.rgb,color.a*tex0[tc0].a)
extern LLGLSLShader gSolidColorProgram;
//object shaders
extern LLGLSLShader gObjectSimpleProgram;
extern LLGLSLShader gObjectSimpleWaterProgram;