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

Linux Build Foxes

Browse Source
This commit is contained in:
Inusaito Sayori
2015-06-19 19:55:56 -04:00
parent 8f2c92d198
commit 990b5f9bb4
5 changed files with 26 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
indra/llrender/llglslshader.h
View File

@@ -108,7 +108,7 @@ public:
{
if (uniform >= 0)
{
std::vector<std::pair<GLint, T> >::iterator iter = std::find_if(cache.begin(), cache.end(), boost::bind(&std::pair<GLint, T>::first, _1) == uniform);
typename std::vector<std::pair<GLint, T> >::iterator iter = std::find_if(cache.begin(), cache.end(), boost::bind(&std::pair<GLint, T>::first, _1) == uniform);
if (iter == cache.end())
{
T tmp;
@@ -166,7 +166,7 @@ public:
}
void uniform1iv(U32 index, U32 count, const GLint* v)
{
F32 val[] = { v[0] };
F32 val[] = { static_cast<const F32>(v[0]) };
if (updateUniform<LLVector4, 1>(mValueVec4, getUniformFromIndex(index), val) || count > 1)
{
glUniform1ivARB(mUniform[index], count, v);