projects
/
opengl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
First pass at blendshapes
[opengl.git]
/
program.cpp
diff --git
a/program.cpp
b/program.cpp
index d6adf0630cd2b3d22f7f775a8fd1ee3d5811bbb9..2275dcb416bed7740725f0a170a7a16610f795a1 100644
(file)
--- a/
program.cpp
+++ b/
program.cpp
@@
-10,7
+10,7
@@
void attachShader(GLuint progId, string filePath, GLenum type) {
if (!shader) {
cerr << "error creating shader" << endl;
if (!shader) {
cerr << "error creating shader" << endl;
-
exit(1
);
+
abort(
);
}
ifstream file(filePath);
}
ifstream file(filePath);
@@
-26,7
+26,7
@@
void attachShader(GLuint progId, string filePath, GLenum type) {
if (!success) {
GLchar log[1024];
glGetShaderInfoLog(shader, 1024, NULL, log);
if (!success) {
GLchar log[1024];
glGetShaderInfoLog(shader, 1024, NULL, log);
- fprintf(stderr, "
error: %s\n"
, log);
+ fprintf(stderr, "
Error compiling %s\n%s\n", filePath.c_str()
, log);
exit(1);
}
glAttachShader(progId, shader);
exit(1);
}
glAttachShader(progId, shader);
@@
-44,7
+44,7
@@
Program::Program(const string vertexShader, const string fragmentShader) {
if (!success) {
GLchar log[1024];
glGetProgramInfoLog(progId, sizeof(log), NULL, log);
if (!success) {
GLchar log[1024];
glGetProgramInfoLog(progId, sizeof(log), NULL, log);
- fprintf(stderr, "error linking
: %s\n"
, log);
+ fprintf(stderr, "error linking
%s and %s\n%s\n", vertexShader.c_str(), fragmentShader.c_str()
, log);
exit(1);
}
}
exit(1);
}
}
@@
-57,7
+57,7
@@
void Program::validate() const {
if (!success) {
GLchar log[1024];
glGetProgramInfoLog(progId, sizeof(log), NULL, log);
if (!success) {
GLchar log[1024];
glGetProgramInfoLog(progId, sizeof(log), NULL, log);
- fprintf(stderr, "
error
: %s\n", log);
+ fprintf(stderr, "
Error validating
: %s\n", log);
exit(1);
}
}
exit(1);
}
}