sid
/
NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Shaders no longer warn when location is invalid 

Former-commit-id: ca6318b765f18f7ffadcc747465fde6cc76155f4
This commit is contained in:
Lynix 2013-06-09 11:30:19 +02:00
parent c76c419867
commit 8897531618
1 changed files with 14 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
src/Nazara/Renderer/Shader.cpp
View File

@ -332,13 +332,10 @@ bool NzShader::SendBoolean(int location, bool value) const
NazaraError("Shader not created");
return false;
}
#endif
if (location == -1)
{
NazaraError("Invalid location");
return false;
}
#endif
return m_impl->SendBoolean(location, value);
}
@ -351,13 +348,10 @@ bool NzShader::SendColor(int location, const NzColor& color) const
NazaraError("Shader not created");
return false;
}
#endif
if (location == -1)
{
NazaraError("Invalid location");
return false;
}
#endif
return m_impl->SendColor(location, color);
}
@ -376,13 +370,10 @@ bool NzShader::SendDouble(int location, double value) const
NazaraError("Shader not created");
return false;
}
#endif
if (location == -1)
{
NazaraError("Invalid location");
return false;
}
#endif
return m_impl->SendDouble(location, value);
}
@ -395,13 +386,10 @@ bool NzShader::SendFloat(int location, float value) const
NazaraError("Shader not created");
return false;
}
#endif
if (location == -1)
{
NazaraError("Invalid location");
return false;
}
#endif
return m_impl->SendFloat(location, value);
}
@ -414,13 +402,10 @@ bool NzShader::SendInteger(int location, int value) const
NazaraError("Shader not created");
return false;
}
#endif
if (location == -1)
{
NazaraError("Invalid location");
return false;
}
#endif
return m_impl->SendInteger(location, value);
}
@ -439,13 +424,10 @@ bool NzShader::SendMatrix(int location, const NzMatrix4d& matrix) const
NazaraError("Shader not created");
return false;
}
#endif
if (location == -1)
{
NazaraError("Invalid location");
return false;
}
#endif
return m_impl->SendMatrix(location, matrix);
}
@ -458,13 +440,10 @@ bool NzShader::SendMatrix(int location, const NzMatrix4f& matrix) const
NazaraError("Shader not created");
return false;
}
#endif
if (location == -1)
{
NazaraError("Invalid location");
return false;
}
#endif
return m_impl->SendMatrix(location, matrix);
}
@ -477,13 +456,10 @@ bool NzShader::SendTexture(int location, const NzTexture* texture, nzUInt8* text
NazaraError("Shader not created");
return false;
}
#endif
if (location == -1)
{
NazaraError("Invalid location");
return false;
}
#endif
return m_impl->SendTexture(location, texture, textureUnit);
}
@ -502,13 +478,10 @@ bool NzShader::SendVector(int location, const NzVector2d& vector) const
NazaraError("Shader not created");
return false;
}
#endif
if (location == -1)
{
NazaraError("Invalid location");
return false;
}
#endif
return m_impl->SendVector(location, vector);
}
@ -521,13 +494,10 @@ bool NzShader::SendVector(int location, const NzVector2f& vector) const
NazaraError("Shader not created");
return false;
}
#endif
if (location == -1)
{
NazaraError("Invalid location");
return false;
}
#endif
return m_impl->SendVector(location, vector);
}
@ -546,13 +516,10 @@ bool NzShader::SendVector(int location, const NzVector3d& vector) const
NazaraError("Shader not created");
return false;
}
#endif
if (location == -1)
{
NazaraError("Invalid location");
return false;
}
#endif
return m_impl->SendVector(location, vector);
}
@ -565,13 +532,10 @@ bool NzShader::SendVector(int location, const NzVector3f& vector) const
NazaraError("Shader not created");
return false;
}
#endif
if (location == -1)
{
NazaraError("Invalid location");
return false;
}
#endif
return m_impl->SendVector(location, vector);
}
@ -590,13 +554,10 @@ bool NzShader::SendVector(int location, const NzVector4d& vector) const
NazaraError("Shader not created");
return false;
}
#endif
if (location == -1)
{
NazaraError("Invalid location");
return false;
}
#endif
return m_impl->SendVector(location, vector);
}
@ -609,13 +570,10 @@ bool NzShader::SendVector(int location, const NzVector4f& vector) const
NazaraError("Shader not created");
return false;
}
#endif
if (location == -1)
{
NazaraError("Invalid location");
return false;
}
#endif
return m_impl->SendVector(location, vector);
}