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

Including these changes to llglshader might've been a good thing to do a few commits ago. Eups.

Browse Source
This commit is contained in:
Shyotl
2012-09-12 23:54:28 -05:00
committed by Siana Gearz
parent afc7c2b449
commit 435b9cd1bb
1 changed files with 22 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
indra/llrender/llglslshader.cpp
View File

@@ -244,14 +244,16 @@ BOOL LLGLSLShader::createShader(vector<string> * attributes,
BOOL LLGLSLShader::attachObject(std::string object) BOOL LLGLSLShader::attachObject(std::string object)
{ {
if (LLShaderMgr::instance()->mShaderObjects.count(object) > 0) std::multimap<std::string, LLShaderMgr::CachedObjectInfo>::iterator it = LLShaderMgr::instance()->mShaderObjects.begin();
for(it;it!=LLShaderMgr::instance()->mShaderObjects.end();it++)
{ {
stop_glerror(); if((*it).first == object)
glAttachObjectARB(mProgramObject, LLShaderMgr::instance()->mShaderObjects[object]); {
stop_glerror(); glAttachObjectARB(mProgramObject, (*it).second.mHandle);
return TRUE; stop_glerror();
return TRUE;
}
} }
else
{ {
LL_WARNS("ShaderLoading") << "Attempting to attach shader object that hasn't been compiled: " << object << LL_ENDL; LL_WARNS("ShaderLoading") << "Attempting to attach shader object that hasn't been compiled: " << object << LL_ENDL;
return FALSE; return FALSE;
@@ -262,6 +264,20 @@ void LLGLSLShader::attachObject(GLhandleARB object)
{ {
if (object != 0) if (object != 0)
{ {
std::multimap<std::string, LLShaderMgr::CachedObjectInfo>::iterator it = LLShaderMgr::instance()->mShaderObjects.begin();
for(it;it!=LLShaderMgr::instance()->mShaderObjects.end();it++)
{
if((*it).second.mHandle == object)
{
LL_DEBUGS("ShaderLoading") << "Attached: " << (*it).first << llendl;
break;
}
}
if(it == LLShaderMgr::instance()->mShaderObjects.end())
{
LL_WARNS("ShaderLoading") << "Attached unknown shader!" << llendl;
}
stop_glerror(); stop_glerror();
glAttachObjectARB(mProgramObject, object); glAttachObjectARB(mProgramObject, object);
stop_glerror(); stop_glerror();