Minor formating fixes.
This commit is contained in:
parent
6f53b0c069
commit
4df668e68f
76 changed files with 121 additions and 121 deletions
|
|
@ -47,7 +47,7 @@ bool ShaderProgram::loadFromFile(const std::string& filename)
|
|||
std::string base_name = filename.substr(0, filename.length() - extension.length());
|
||||
|
||||
// vert and frag are not optional. they must exist.
|
||||
return loadFromFile(base_name + "vert.glsl", Shader::Type::Vertex) &&
|
||||
return loadFromFile(base_name + "vert.glsl", Shader::Type::Vertex) &&
|
||||
loadFromFile(base_name + "frag.glsl", Shader::Type::Fragment);
|
||||
|
||||
} else if (extension == "vert.glsl") {
|
||||
|
|
@ -117,7 +117,7 @@ void ShaderProgram::enable() const
|
|||
{
|
||||
glUseProgram(m_id);
|
||||
}
|
||||
|
||||
|
||||
void ShaderProgram::disable() const
|
||||
{
|
||||
glUseProgram(0);
|
||||
|
|
@ -194,4 +194,4 @@ std::string ShaderProgram::fetchErrorLog()
|
|||
return std::string(buf);
|
||||
}
|
||||
|
||||
} // namespace sp
|
||||
} // namespace sp
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue