diff options
author | Tomasz Kramkowski <tk@the-tk.com> | 2018-05-02 19:35:20 +0100 |
---|---|---|
committer | Tomasz Kramkowski <tk@the-tk.com> | 2018-05-02 19:35:20 +0100 |
commit | 3c1b90a736e3958a9f0545f04b1af7fc00b74b4e (patch) | |
tree | 7e65e1edcbf231710534c7a391e08a24b3cdfb76 /glprog.c | |
parent | 024a3b2dc8c600013b9b76c7f919594d533ba774 (diff) | |
download | faqe-3c1b90a736e3958a9f0545f04b1af7fc00b74b4e.tar.gz faqe-3c1b90a736e3958a9f0545f04b1af7fc00b74b4e.tar.xz faqe-3c1b90a736e3958a9f0545f04b1af7fc00b74b4e.zip |
Improve glprog_load to take sentinel terminated lists
Numerous times a new uniform has been added and the corresponding
increment of the nunis parameter was forgotten causing confusion. This
should not happen anymore.
Diffstat (limited to 'glprog.c')
-rw-r--r-- | glprog.c | 14 |
1 files changed, 7 insertions, 7 deletions
@@ -40,19 +40,17 @@ void detach_shaders(GLuint prog) gl_prog_detachshdr(prog, shdr); } -GLuint glprog_load(int nshdrs, const struct shdrdat *shdrs, int nunis, const struct unidat *unis) +GLuint glprog_load(const struct shdrdat *shdrs, const struct unidat *unis) { GLuint prog; GLint success; char log[LOGSIZE]; - assert(nshdrs > 0); assert(shdrs != NULL); - assert(nunis <= 0 || unis != NULL); prog = gl_prog_create(); - for (int i = 0; i < nshdrs; i++) { - GLuint shdr = load_shader(&shdrs[i]); + for (const struct shdrdat *s = shdrs; s->type != 0; s++) { + GLuint shdr = load_shader(s); gl_prog_attachshdr(prog, shdr); gl_shdr_del(shdr); } @@ -65,8 +63,10 @@ GLuint glprog_load(int nshdrs, const struct shdrdat *shdrs, int nunis, const str detach_shaders(prog); - for (int i = 0; i < nunis; i++) - *unis[i].loc = gl_uni_loc(prog, unis[i].name); + if (unis == NULL) return prog; + + for (const struct unidat *u = unis; u->name != NULL; u++) + *u->loc = gl_uni_loc(prog, u->name); return prog; } |