projects
/
laserbrain_demo
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
- fixed bug in mirror matching
[laserbrain_demo]
/
src
/
sdr.c
diff --git
a/src/sdr.c
b/src/sdr.c
index
0152a6e
..
6b06991
100644
(file)
--- a/
src/sdr.c
+++ b/
src/sdr.c
@@
-5,6
+5,7
@@
#include <stdarg.h>
#include <assert.h>
#include "opengl.h"
#include <stdarg.h>
#include <assert.h>
#include "opengl.h"
+#include "logger.h"
#if defined(unix) || defined(__unix__)
#include <unistd.h>
#if defined(unix) || defined(__unix__)
#include <unistd.h>
@@
-93,9
+94,9
@@
unsigned int create_shader(const char *src, unsigned int sdr_type)
}
if(success) {
}
if(success) {
- fprintf(stderr, info_str ? "done: %s\n" : "done\n", info_str);
+ info_log(info_str ? "done: %s\n" : "done\n", info_str);
} else {
} else {
- fprintf(stderr, info_str ? "failed: %s\n" : "failed\n", info_str);
+ error_log(info_str ? "failed: %s\n" : "failed\n", info_str);
glDeleteShader(sdr);
sdr = 0;
}
glDeleteShader(sdr);
sdr = 0;
}
@@
-154,7
+155,7
@@
unsigned int load_shader(const char *fname, unsigned int sdr_type)
char *src;
if(!(fp = fopen(fname, "rb"))) {
char *src;
if(!(fp = fopen(fname, "rb"))) {
- fprintf(stderr, "failed to open shader %s: %s\n", fname, strerror(errno));
+ error_log("failed to open shader %s: %s\n", fname, strerror(errno));
return 0;
}
return 0;
}
@@
-170,7
+171,7
@@
unsigned int load_shader(const char *fname, unsigned int sdr_type)
src[filesize] = 0;
fclose(fp);
src[filesize] = 0;
fclose(fp);
- fprintf(stderr, "compiling %s shader: %s... ", sdrtypestr(sdr_type), fname);
+ info_log("compiling %s shader: %s... ", sdrtypestr(sdr_type), fname);
sdr = create_shader(src, sdr_type);
free(src);
sdr = create_shader(src, sdr_type);
free(src);
@@
-243,7
+244,7
@@
void attach_shader(unsigned int prog, unsigned int sdr)
assert(glGetError() == GL_NO_ERROR);
glAttachShader(prog, sdr);
if((err = glGetError()) != GL_NO_ERROR) {
assert(glGetError() == GL_NO_ERROR);
glAttachShader(prog, sdr);
if((err = glGetError()) != GL_NO_ERROR) {
- fprintf(stderr, "failed to attach shader %u to program %u (err: 0x%x)\n", sdr, prog, err);
+ error_log("failed to attach shader %u to program %u (err: 0x%x)\n", sdr, prog, err);
abort();
}
}
abort();
}
}
@@
-270,9
+271,9
@@
int link_program(unsigned int prog)
}
if(linked) {
}
if(linked) {
- fprintf(stderr, info_str ? "linking done: %s\n" : "linking done\n", info_str);
+ info_log(info_str ? "linking done: %s\n" : "linking done\n", info_str);
} else {
} else {
- fprintf(stderr, info_str ? "linking failed: %s\n" : "linking failed\n", info_str);
+ error_log(info_str ? "linking failed: %s\n" : "linking failed\n", info_str);
retval = -1;
}
retval = -1;
}
@@
-433,7
+434,7
@@
static void append_string(struct string *str, const char *s)
len = strlen(s);
newlen = str->len + len;
if(!(newstr = malloc(newlen + 2))) { /* leave space for a possible newline */
len = strlen(s);
newlen = str->len + len;
if(!(newstr = malloc(newlen + 2))) { /* leave space for a possible newline */
- fprintf(stderr, "shader composition: failed to append string of size %d\n", len);
+ error_log("shader composition: failed to append string of size %d\n", len);
abort();
}
abort();
}