Browse Source

Fixed various superflous spaces and newlines in Shader error messages.

The debug classes are long overdue for total rework. This isn't usable.
pull/278/head
Vladimír Vondruš 13 years ago
parent
commit
63245ae457
  1. 14
      src/AbstractShaderProgram.cpp
  2. 7
      src/Shader.cpp

14
src/AbstractShaderProgram.cpp

@ -152,13 +152,19 @@ void AbstractShaderProgram::link() {
/* Show error log and delete shader */
if(status == GL_FALSE) {
Error() << "AbstractShaderProgram: linking failed with the following message:\n"
<< message;
Error out;
out.setFlag(Debug::NewLineAtTheEnd, false);
out.setFlag(Debug::SpaceAfterEachValue, false);
out << "AbstractShaderProgram: linking failed with the following message:\n"
<< message;
/* Or just warnings, if there are any */
} else if(message[0] != 0) {
Debug() << "AbstractShaderProgram: linking succeeded with the following message:\n"
<< message;
Debug out;
out.setFlag(Debug::NewLineAtTheEnd, false);
out.setFlag(Debug::SpaceAfterEachValue, false);
out << "AbstractShaderProgram: linking succeeded with the following message:\n"
<< message;
}
state = status == GL_FALSE ? Failed : Linked;

7
src/Shader.cpp

@ -149,14 +149,17 @@ GLuint Shader::compile() {
case Type::Fragment: err << "fragment"; break;
}
err.setFlag(Debug::NewLineAtTheEnd, false);
err.setFlag(Debug::SpaceAfterEachValue, false);
/* Show error log and delete shader */
if(status == GL_FALSE) {
err << "shader failed to compile with the following message:\n"
err << " shader failed to compile with the following message:\n"
<< message;
/* Or just warnings, if there are any */
} else if(message[0] != 0) {
err << "shader was successfully compiled with the following message:\n"
err << " shader was successfully compiled with the following message:\n"
<< message;
}
}

Loading…
Cancel
Save